[gentoo-commits] repo/gentoo:master commit in: dev-libs/libowfat/

[Thomas Deutschmann]

commit:     e8640288c58316fd8062caf4ce3ec546dc5da690
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 18:46:29 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 18:46:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8640288

dev-libs/libowfat: fix header location

...and improve Gentoo prefix support.

Closes: https://bugs.gentoo.org/672342
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../{libowfat-0.32.ebuild => libowfat-0.32-r1.ebuild}   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/dev-libs/libowfat/libowfat-0.32.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
similarity index 68%
rename from dev-libs/libowfat/libowfat-0.32.ebuild
rename to dev-libs/libowfat/libowfat-0.32-r1.ebuild
index daee3d50445..116551cefe1 100644
--- a/dev-libs/libowfat/libowfat-0.32.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -27,20 +27,19 @@ src_compile() {
 	emake \
 		CC=$(tc-getCC) \
 		CFLAGS="-I. ${CFLAGS}" \
-		DIET="/usr/bin/diet -Os" \
-		prefix=/usr \
-		INCLUDEDIR=/usr/include/libowfat \
+		DIET="${EPREFIX%/}/usr/bin/diet -Os" \
+		prefix="${EPREFIX%/}/usr" \
+		INCLUDEDIR="${EPREFIX%/}/usr/include" \
 		$( use diet || echo 'DIET=' )
 }
 
 src_install() {
 	emake \
-		DESTDIR="${D}" \
-		LIBDIR="/usr/$(get_libdir)" \
-		MAN3DIR="/usr/share/man/man3" \
-		INCLUDEDIR="/usr/include/libowfat" \
+		DESTDIR="${D%/}" \
+		LIBDIR="${EPREFIX%/}/usr/$(get_libdir)" \
+		MAN3DIR="${EPREFIX%/}/usr/share/man/man3" \
+		INCLUDEDIR="${EPREFIX%/}/usr/include" \
 		install
 
-	cd "${D}"/usr/share/man
-	mv man3/buffer.3 man3/owfat-buffer.3
+	mv "${ED%/}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
 }