From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1324407-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 58F6E158017
	for <garchives@archives.gentoo.org>; Sat, 25 Sep 2021 23:25:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5F92FE0957;
	Sat, 25 Sep 2021 23:25:05 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 4356AE0957
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 23:25:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 66C8D342EFA
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 23:25:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id D1F3310C
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 23:25:01 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1632612259.86b9001b06f6700a791ce9f0509e7dd5b72717da.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-fonts/dejavu/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-fonts/dejavu/dejavu-2.37.ebuild
X-VCS-Directories: media-fonts/dejavu/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 86b9001b06f6700a791ce9f0509e7dd5b72717da
X-VCS-Branch: master
Date: Sat, 25 Sep 2021 23:25:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 844dd1c7-9e32-438c-94dd-3d96ea967321
X-Archives-Hash: 39f939551d7bb8b4675c58a3c8a06631

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