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

[Sam James]

commit:     15fda022aae5b57c4422a5cc28d980c4b7ea3265
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 23:24:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 23:24:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15fda022

Revert "dev-libs/libutf8proc: reflect new data path of app-i18n/unicode-data"

This reverts commit 0b234b03472b19154e4a2893909cc85c02c557a2.

Bug: https://bugs.gentoo.org/814860
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild | 11 +----------
 dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild | 11 +----------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
index 0e8e2c250e3..5a659f96fa5 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
@@ -46,16 +46,7 @@ src_install() {
 }
 
 src_test() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local ucddir
-
-	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
-		ucddir="${unicodedir}-data"
-	else
-		ucddir=${unicodedir}
-	fi
-
-	cp "${ucddir}"/{Normalization,auxiliary/GraphemeBreak}Test.txt data || die
+	cp "${EPREFIX}"/usr/share/unicode-data/{Normalization,auxiliary/GraphemeBreak}Test.txt data || die
 
 	emake CC="$(tc-getCC)" check
 }

diff --git a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
index 96a3fc9a1fb..4790df370ef 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
@@ -50,16 +50,7 @@ src_install() {
 }
 
 src_test() {
-	local unicodedir="${EPREFIX}"/usr/share/unicode
-	local ucddir
-
-	if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then
-		ucddir="${unicodedir}-data"
-	else
-		ucddir=${unicodedir}
-	fi
-
-	cp "${ucddir}"/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die
+	cp "${EPREFIX}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die
 
 	emake CC="$(tc-getCC)" check
 }