From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1324410-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 41B11158016
	for <garchives@archives.gentoo.org>; Sat, 25 Sep 2021 23:25:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 46FFAE096F;
	Sat, 25 Sep 2021 23:25:06 +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 E8DBCE096F
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 23:25:05 +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 E28F5342B7E
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 23:25:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 24322114
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Sep 2021 23:25:02 +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: <1632612271.3e6f49373e7d18363dce85dac239a7971ee77bf0.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-i18n/ibus/ibus-1.5.22.ebuild app-i18n/ibus/ibus-1.5.23.ebuild app-i18n/ibus/ibus-1.5.24.ebuild app-i18n/ibus/ibus-1.5.25.ebuild
X-VCS-Directories: app-i18n/ibus/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 3e6f49373e7d18363dce85dac239a7971ee77bf0
X-VCS-Branch: master
Date: Sat, 25 Sep 2021 23:25:02 +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: 8d0b9033-6c2d-4717-957c-d87cf024a92f
X-Archives-Hash: 259375b815d51ea28f31d493512330c5

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

Revert "app-i18n/ibus: reflect new data path of app-i18n/unicode-data"

This reverts commit 734c98e2aea8d8b92e09a623c44ff0eafad719e8.

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

 app-i18n/ibus/ibus-1.5.22.ebuild | 12 ++----------
 app-i18n/ibus/ibus-1.5.23.ebuild | 12 ++----------
 app-i18n/ibus/ibus-1.5.24.ebuild | 10 +---------
 app-i18n/ibus/ibus-1.5.25.ebuild | 10 +---------
 4 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 3fecbfced78..27e19d610f9 100644
--- a/app-i18n/ibus/ibus-1.5.22.ebuild
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -102,14 +102,6 @@ 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 python_conf=()
 	if use python; then
 		python_setup
@@ -134,7 +126,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${ucddir}") \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild
index c1770f770aa..d53729503b5 100644
--- a/app-i18n/ibus/ibus-1.5.23.ebuild
+++ b/app-i18n/ibus/ibus-1.5.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -111,14 +111,6 @@ 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 python_conf=()
 	if use python; then
 		python_setup
@@ -143,7 +135,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${ucddir}") \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

diff --git a/app-i18n/ibus/ibus-1.5.24.ebuild b/app-i18n/ibus/ibus-1.5.24.ebuild
index 2130464553d..ec02e75cce0 100644
--- a/app-i18n/ibus/ibus-1.5.24.ebuild
+++ b/app-i18n/ibus/ibus-1.5.24.ebuild
@@ -112,14 +112,6 @@ 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 python_conf=()
 	if use python; then
 		python_setup
@@ -144,7 +136,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${ucddir}") \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"

diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild
index 91604ca0e0a..9dc461da301 100644
--- a/app-i18n/ibus/ibus-1.5.25.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild
@@ -113,14 +113,6 @@ 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 python_conf=()
 	if use python; then
 		python_setup
@@ -145,7 +137,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${ucddir}") \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"