app-i18n/ibus: 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@gentoo.org>

4 files changed, 38 insertions, 6 deletions

diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild
index 27e19d610f9f..3fecbfced783 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -102,6 +102,14 @@ 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
@@ -126,7 +134,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_with unicode ucd-dir "${ucddir}") \
 		$(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 d53729503b59..c1770f770aa2 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -111,6 +111,14 @@ 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
@@ -135,7 +143,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_with unicode ucd-dir "${ucddir}") \
 		$(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 ec02e75cce09..2130464553de 100644
--- a/app-i18n/ibus/ibus-1.5.24.ebuild
+++ b/app-i18n/ibus/ibus-1.5.24.ebuild
@@ -112,6 +112,14 @@ 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
@@ -136,7 +144,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_with unicode ucd-dir "${ucddir}") \
 		$(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 9dc461da301e..91604ca0e0a1 100644
--- a/app-i18n/ibus/ibus-1.5.25.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild
@@ -113,6 +113,14 @@ 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
@@ -137,7 +145,7 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable test tests) \
 		$(use_enable unicode unicode-dict) \
-		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_with unicode ucd-dir "${ucddir}") \
 		$(use_enable vala) \
 		$(use_enable wayland) \
 		"${python_conf[@]}"