From e8640288c58316fd8062caf4ce3ec546dc5da690 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sat, 1 Dec 2018 19:46:29 +0100
Subject: 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@gentoo.org>
---
 dev-libs/libowfat/libowfat-0.32-r1.ebuild | 45 ++++++++++++++++++++++++++++++
 dev-libs/libowfat/libowfat-0.32.ebuild    | 46 -------------------------------
 2 files changed, 45 insertions(+), 46 deletions(-)
 create mode 100644 dev-libs/libowfat/libowfat-0.32-r1.ebuild
 delete mode 100644 dev-libs/libowfat/libowfat-0.32.ebuild

(limited to 'dev-libs/libowfat')

diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
new file mode 100644
index 000000000000..116551cefe17
--- /dev/null
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
+SRC_URI="https://www.fefe.de/${PN}/${P}.tar.xz"
+HOMEPAGE="https://www.fefe.de/libowfat/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="diet"
+
+RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	# Required for mult/umult64.c to be usable
+	append-flags -fomit-frame-pointer
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="-I. ${CFLAGS}" \
+		DIET="${EPREFIX%/}/usr/bin/diet -Os" \
+		prefix="${EPREFIX%/}/usr" \
+		INCLUDEDIR="${EPREFIX%/}/usr/include" \
+		$( use diet || echo 'DIET=' )
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D%/}" \
+		LIBDIR="${EPREFIX%/}/usr/$(get_libdir)" \
+		MAN3DIR="${EPREFIX%/}/usr/share/man/man3" \
+		INCLUDEDIR="${EPREFIX%/}/usr/include" \
+		install
+
+	mv "${ED%/}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
+}
diff --git a/dev-libs/libowfat/libowfat-0.32.ebuild b/dev-libs/libowfat/libowfat-0.32.ebuild
deleted file mode 100644
index daee3d504455..000000000000
--- a/dev-libs/libowfat/libowfat-0.32.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
-SRC_URI="https://www.fefe.de/${PN}/${P}.tar.xz"
-HOMEPAGE="https://www.fefe.de/libowfat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="diet"
-
-RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	# Required for mult/umult64.c to be usable
-	append-flags -fomit-frame-pointer
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="-I. ${CFLAGS}" \
-		DIET="/usr/bin/diet -Os" \
-		prefix=/usr \
-		INCLUDEDIR=/usr/include/libowfat \
-		$( use diet || echo 'DIET=' )
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="/usr/$(get_libdir)" \
-		MAN3DIR="/usr/share/man/man3" \
-		INCLUDEDIR="/usr/include/libowfat" \
-		install
-
-	cd "${D}"/usr/share/man
-	mv man3/buffer.3 man3/owfat-buffer.3
-}
-- 
cgit v1.2.3-65-gdbad