From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1324400-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 091BE158013
	for <garchives@archives.gentoo.org>; Sat, 25 Sep 2021 22:57:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 40D8DE0971;
	Sat, 25 Sep 2021 22:57:20 +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 26FFBE0971
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 22:57:20 +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 0ABF3342EFE
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 22:57:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 42123114
	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: <1632610605.3538e7f797505382af591d9b6cc39866bfef6c65.mva@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gucharmap/
X-VCS-Repository: repo/gentoo
X-VCS-Files: gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
X-VCS-Directories: gnome-extra/gucharmap/
X-VCS-Committer: mva
X-VCS-Committer-Name: Vadim Misbakh-Soloviov
X-VCS-Revision: 3538e7f797505382af591d9b6cc39866bfef6c65
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: fc58e761-e409-4618-a738-a601f19b2713
X-Archives-Hash: 701dde7367c6f9013991e01bfd7066fc

commit:     3538e7f797505382af591d9b6cc39866bfef6c65
Author:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 22:20:01 2021 +0000
Commit:     Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 22:56:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3538e7f7

gnome-extra/gucharmap: 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>

 gnome-extra/gucharmap/gucharmap-13.0.8.ebuild | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
index c5ddaa9831f..2ba14ea53a6 100644
--- a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
@@ -43,8 +43,17 @@ src_prepare() {
 }
 
 src_configure() {
+	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
+
 	local emesonargs=(
-		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
+		-Ducd_path="${ucddir}"
 		$(meson_use debug dbg)
 		$(meson_use gtk-doc docs)
 		$(meson_use introspection gir)