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

[Vadim Misbakh-Soloviov]

commit:     0b234b03472b19154e4a2893909cc85c02c557a2
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 22:19:08 2021 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 22:56:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b234b03

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

Package-Manager: Portage-3.0.23, Repoman-3.0.1
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org>

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

diff --git a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
index 5a659f96fa5..0e8e2c250e3 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
@@ -46,7 +46,16 @@ src_install() {
 }
 
 src_test() {
-	cp "${EPREFIX}"/usr/share/unicode-data/{Normalization,auxiliary/GraphemeBreak}Test.txt data || die
+	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
 
 	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 4790df370ef..96a3fc9a1fb 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
@@ -50,7 +50,16 @@ src_install() {
 }
 
 src_test() {
-	cp "${EPREFIX}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die
+	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
 
 	emake CC="$(tc-getCC)" check
 }