From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1324399-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 B046A158016
	for <garchives@archives.gentoo.org>; Sat, 25 Sep 2021 22:57:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id EFD9DE096C;
	Sat, 25 Sep 2021 22:57:19 +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 C9641E096C
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 22:57:19 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id E5A51342EF8
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 22:57:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 56AB6116
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 22:57:16 +0000 (UTC)
From: "Vadim Misbakh-Soloviov" <mva@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, "Vadim Misbakh-Soloviov" <mva@gentoo.org>
Message-ID: <1632610606.72b9db2b3011cbeecaf804b31f973201bfd8e60c.mva@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: mva
X-VCS-Committer-Name: Vadim Misbakh-Soloviov
X-VCS-Revision: 72b9db2b3011cbeecaf804b31f973201bfd8e60c
X-VCS-Branch: master
Date: Sat, 25 Sep 2021 22:57:16 +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: ee781eb8-d67e-433a-8b5f-0d82dcd69c39
X-Archives-Hash: 43e3938ad9a85fb5990bef424c7e9b06

commit:     72b9db2b3011cbeecaf804b31f973201bfd8e60c
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 22:21:05 2021 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 22:56:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72b9db2b

media-fonts/dejavu: 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>

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

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