gentoo auto-resync : 16:11:2022 - 18:55:17

3 files changed, 22 insertions, 22 deletions

diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 95adb8f9726b..f5aa21f7ebfb 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,5 +1,7 @@
 DIST libutf8proc-2.7.0.tar.gz 187906 BLAKE2B b2b3dc86ffa38f1d75293455cca22d3c0a0c51c529f154bbeaf40bb8b91bcedbf3955cfa459323db8b00566ce42857391875dac6fd677e36f700e8614767ac25 SHA512 29f7883de13302d609e8755872ed43174e70076e9681b4ac3f9b03e50295c45d9972c193bc81f94ad7e11e2d33a46cad5a30a80873173e6e1ae242101ebb3bed
+DIST libutf8proc-2.8.0.tar.gz 190310 BLAKE2B 61b5af770ad65f959136eb9f5c03862f8d6edab32dc66fa663f6f76009c7481200fcba632d41efdf116f0f56f62fc237cd65e1038ab058fc127358d31ed3ee6d SHA512 4b9853fc95db38bee1d7435bef219907e25b249e0c2ec26f7096b8506ab2a139a8d4b71f7133b7550bff59d8f997fe01c2957d362cad18d890ad82bcf158aa06
 DIST libutf8proc-EastAsianWidth-14.0.0.xz 70420 BLAKE2B c2fa8ec34ae3cccb532d8ba82dc7ef40d82da2ed2f4bf187ef0df28cecd2e91320e25287e7bc6e7f22ffa6730af7b910b73d69172664235f3236c16a5ffe990f SHA512 5bd11dc8c30d12692d3cbca932c1bda5e19d9b5e99fc9f1a3ff8864e4f0e577769c4e1f91338cad10a468c38b904cf16b99ba44f44b80695cac23fe436f1e24a
-EBUILD libutf8proc-2.7.0-r1.ebuild 1484 BLAKE2B d4bcf35c2896de29170f2f6e772f633aae44e881ec39a0b26e6f8af4725f689dfa700bdbb7e565d0b2b7e44383f610dad7c5840f6febf46ec4c2774c4390b8fe SHA512 1c8391a5747aa714c55a3a609330a117af0be1d0dfc4cc68aab1a7d2a1efd6bddcdc0ed2d49fcf5709fba4e5acf3af1798b1e2854db62a6691c1373bc124510e
-EBUILD libutf8proc-2.7.0.ebuild 1456 BLAKE2B ef13c6975061df3b1f76f3900ce4a3dfcbb7ba42b83104414fbd7645452106e64dcd3f2fbeacd6458593c53d2f6d91329a8e936ce0124732c00881e5352214ad SHA512 92c99005775c5d2029ad9a7864bd10ba03d52f6c8cb678075132221d167e7d17a144c771368d62ad4f6bccc1d455a2b53fef2a423a279927d950ee8773bf6c06
+DIST libutf8proc-EastAsianWidth-15.0.0.xz 71296 BLAKE2B 701451cd6576d62ad4bc9c2d140ba78743b3fa5b062b40c2aaf47c02f5c3dc520a89fd51de4b46718c319c0ff2520e09cb39719cf73c044a14aa882b704cba12 SHA512 8b7a3b6cf56a98147ff5f64066a17c71247ae829bbdc10f758991aadf13b38a242a7f72ce13fdd4816117a0db98c084f0f9f32228817c9c2f31599955bb1e8fc
+EBUILD libutf8proc-2.7.0.ebuild 1450 BLAKE2B 74c3278788049a23eac8ea932992273768b6bb39f33350698268fbad74f432d140147357c9143ba5f9bf7d339357e4f296578f726a214825efc4af463f482799 SHA512 3d86dd1fa4982aa4311396bdb24d7c7c50e07c15eb2ce839cc950d62598e1476cdde47205258bbd7190aab67e24ab430852f07a298ad9f72c2601d255f59933d
+EBUILD libutf8proc-2.8.0.ebuild 1457 BLAKE2B ef32dadb4811f2a957c0f6671ffdf710124ff187ffac5b9d35ba1e280e82ee44ab70b8a54e0160012146714e11dc60a077b0baaade1ac13ca027b3d437fbefd4 SHA512 929e08b2c40cbd12beb27d84c6243c9f0446ccebed85fbd48eb007710f60ec1c61986dfbaf01eaaab5ee5d2962b31879fd6ed432e252e2ee9c811dd77700810f
 MISC metadata.xml 335 BLAKE2B ff350963fd5107b123b5d00bbd247a04b1339fff79e264540fe73b2365055b33f0da742de01d3b7b8dce0811dbcd2cbc329a5985c6c5953587cedfc43e9bb3ac SHA512 ce032d933cbfe1254988d065206fc4940840484a2b6b044d7a0e8130d5ea5df61cab7f3a73b47c56d2f82bc975e7adfad43e0f248f4939589aa9975083b72eb8
diff --git a/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
index eac516b92568..480d46539ce0 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 inherit ruby-single toolchain-funcs
 
@@ -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
-}
diff --git a/dev-libs/libutf8proc/libutf8proc-2.7.0-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.8.0.ebuild
index 65c0146e8585..b17e66b4e2d9 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.7.0-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.8.0.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 inherit ruby-single toolchain-funcs
 
 DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
 HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
 SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-14.0.0.xz )"
+	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-15.0.0.xz )"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
@@ -18,19 +18,20 @@ IUSE="cjk static-libs test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? (
-		=app-i18n/unicode-data-14.0*
+		=app-i18n/unicode-data-15.0*
 		${RUBY_DEPS}
 	)"
 S="${WORKDIR}/${P#lib}"
 
-QA_PKGCONFIG_VERSION="$(ver_cut 1).5.0"
+QA_PKGCONFIG_VERSION="$(ver_cut 1).6.0"
 
 src_prepare() {
 	if use cjk; then
 		einfo "Modifying East Asian Ambiguous (A) as wide ..."
-		cp "${WORKDIR}"/${PN}-EastAsianWidth-14.0.0 ${PN#lib}_data.c || die
+		cp "${WORKDIR}"/${PN}-EastAsianWidth-15.0.0 ${PN#lib}_data.c || die
 	fi
 
+	sed -i "/^libdir/s:/lib:/$(get_libdir):" Makefile
 	default
 }
 
@@ -38,8 +39,7 @@ src_compile() {
 	emake \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
-		prefix="${EPREFIX}/usr" \
-		libdir='$(prefix)'"/$(get_libdir)"
+		prefix="${EPREFIX}/usr"
 }
 
 src_test() {
@@ -52,7 +52,6 @@ src_install() {
 	emake \
 		DESTDIR="${D}" \
 		prefix="${EPREFIX}/usr" \
-		libdir='$(prefix)'"/$(get_libdir)" \
 		install
 	use static-libs || find "${ED}" -name '*.a' -delete || die
 }