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

["Akinori Hattori" <hattya@gentoo.org>]

commit:     effdb8f9e9b543481fe69f471719ee794b26c470
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 12:45:16 2022 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 12:51:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=effdb8f9

dev-libs/libutf8proc: tidy

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
index eac516b92568..9341fa9d0187 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
 		cp "${WORKDIR}"/${PN}-EastAsianWidth-14.0.0 ${PN#lib}_data.c || die
 	fi
 
+	sed -i "/^libdir/s:/lib:/$(get_libdir):" Makefile
 	default
 }
 
@@ -38,21 +39,19 @@ src_compile() {
 	emake \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
-		prefix="/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+}
+
+src_test() {
+	cp "${BROOT}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die
+
+	emake CC="$(tc-getCC)" check
 }
 
 src_install() {
 	emake \
-		DESTDIR="${ED}" \
-		prefix="/usr" \
-		libdir="/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		prefix="${EPREFIX}/usr" \
 		install
 	use static-libs || find "${ED}" -name '*.a' -delete || die
 }
-
-src_test() {
-	cp "${EPREFIX}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die
-
-	emake CC="$(tc-getCC)" check
-}