[gentoo-commits] repo/gentoo:master commit in: media-fonts/dejavu/

[Sam James]

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

Revert "media-fonts/dejavu: reflect new data path of app-i18n/unicode-data"

This reverts commit 72b9db2b3011cbeecaf804b31f973201bfd8e60c.

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

 media-fonts/dejavu/dejavu-2.37.ebuild | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index 871e75a1dcf..3ed26ced409 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -67,20 +67,11 @@ src_prepare() {
 }
 
 src_compile() {
-	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
-
 	if use fontforge; then
 		emake \
 			BUILDDIR=ttf \
-			BLOCKS=${ucddir}/Blocks.txt \
-			UNICODEDATA=${ucddir}/UnicodeData.txt \
+			BLOCKS=/usr/share/unicode-data/Blocks.txt \
+			UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \
 			FC-LANG=/usr/share/fc-lang \
 			full sans
 	fi