| 1 |
commit: 734c98e2aea8d8b92e09a623c44ff0eafad719e8 |
| 2 |
Author: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 25 22:17:33 2021 +0000 |
| 4 |
Commit: Vadim Misbakh-Soloviov <mva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 25 22:56:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=734c98e2 |
| 7 |
|
| 8 |
app-i18n/ibus: reflect new data path of app-i18n/unicode-data |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.23, Repoman-3.0.1 |
| 11 |
Signed-off-by: Vadim Misbakh-Soloviov <mva <AT> gentoo.org> |
| 12 |
|
| 13 |
app-i18n/ibus/ibus-1.5.22.ebuild | 12 ++++++++++-- |
| 14 |
app-i18n/ibus/ibus-1.5.23.ebuild | 12 ++++++++++-- |
| 15 |
app-i18n/ibus/ibus-1.5.24.ebuild | 10 +++++++++- |
| 16 |
app-i18n/ibus/ibus-1.5.25.ebuild | 10 +++++++++- |
| 17 |
4 files changed, 38 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild |
| 20 |
index 27e19d610f9..3fecbfced78 100644 |
| 21 |
--- a/app-i18n/ibus/ibus-1.5.22.ebuild |
| 22 |
+++ b/app-i18n/ibus/ibus-1.5.22.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2020 Gentoo Authors |
| 25 |
+# Copyright 1999-2021 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
@@ -102,6 +102,14 @@ src_prepare() { |
| 30 |
|
| 31 |
src_configure() { |
| 32 |
local unicodedir="${EPREFIX}"/usr/share/unicode |
| 33 |
+ local ucddir |
| 34 |
+ |
| 35 |
+ if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then |
| 36 |
+ ucddir="${unicodedir}-data" |
| 37 |
+ else |
| 38 |
+ ucddir=${unicodedir} |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
local python_conf=() |
| 42 |
if use python; then |
| 43 |
python_setup |
| 44 |
@@ -126,7 +134,7 @@ src_configure() { |
| 45 |
$(use_enable nls) \ |
| 46 |
$(use_enable test tests) \ |
| 47 |
$(use_enable unicode unicode-dict) \ |
| 48 |
- $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \ |
| 49 |
+ $(use_with unicode ucd-dir "${ucddir}") \ |
| 50 |
$(use_enable vala) \ |
| 51 |
$(use_enable wayland) \ |
| 52 |
"${python_conf[@]}" |
| 53 |
|
| 54 |
diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild |
| 55 |
index d53729503b5..c1770f770aa 100644 |
| 56 |
--- a/app-i18n/ibus/ibus-1.5.23.ebuild |
| 57 |
+++ b/app-i18n/ibus/ibus-1.5.23.ebuild |
| 58 |
@@ -1,4 +1,4 @@ |
| 59 |
-# Copyright 1999-2020 Gentoo Authors |
| 60 |
+# Copyright 1999-2021 Gentoo Authors |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
EAPI=7 |
| 64 |
@@ -111,6 +111,14 @@ src_prepare() { |
| 65 |
|
| 66 |
src_configure() { |
| 67 |
local unicodedir="${EPREFIX}"/usr/share/unicode |
| 68 |
+ local ucddir |
| 69 |
+ |
| 70 |
+ if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then |
| 71 |
+ ucddir="${unicodedir}-data" |
| 72 |
+ else |
| 73 |
+ ucddir=${unicodedir} |
| 74 |
+ fi |
| 75 |
+ |
| 76 |
local python_conf=() |
| 77 |
if use python; then |
| 78 |
python_setup |
| 79 |
@@ -135,7 +143,7 @@ src_configure() { |
| 80 |
$(use_enable nls) \ |
| 81 |
$(use_enable test tests) \ |
| 82 |
$(use_enable unicode unicode-dict) \ |
| 83 |
- $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \ |
| 84 |
+ $(use_with unicode ucd-dir "${ucddir}") \ |
| 85 |
$(use_enable vala) \ |
| 86 |
$(use_enable wayland) \ |
| 87 |
"${python_conf[@]}" |
| 88 |
|
| 89 |
diff --git a/app-i18n/ibus/ibus-1.5.24.ebuild b/app-i18n/ibus/ibus-1.5.24.ebuild |
| 90 |
index ec02e75cce0..2130464553d 100644 |
| 91 |
--- a/app-i18n/ibus/ibus-1.5.24.ebuild |
| 92 |
+++ b/app-i18n/ibus/ibus-1.5.24.ebuild |
| 93 |
@@ -112,6 +112,14 @@ src_prepare() { |
| 94 |
|
| 95 |
src_configure() { |
| 96 |
local unicodedir="${EPREFIX}"/usr/share/unicode |
| 97 |
+ local ucddir |
| 98 |
+ |
| 99 |
+ if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then |
| 100 |
+ ucddir="${unicodedir}-data" |
| 101 |
+ else |
| 102 |
+ ucddir=${unicodedir} |
| 103 |
+ fi |
| 104 |
+ |
| 105 |
local python_conf=() |
| 106 |
if use python; then |
| 107 |
python_setup |
| 108 |
@@ -136,7 +144,7 @@ src_configure() { |
| 109 |
$(use_enable nls) \ |
| 110 |
$(use_enable test tests) \ |
| 111 |
$(use_enable unicode unicode-dict) \ |
| 112 |
- $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \ |
| 113 |
+ $(use_with unicode ucd-dir "${ucddir}") \ |
| 114 |
$(use_enable vala) \ |
| 115 |
$(use_enable wayland) \ |
| 116 |
"${python_conf[@]}" |
| 117 |
|
| 118 |
diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild |
| 119 |
index 9dc461da301..91604ca0e0a 100644 |
| 120 |
--- a/app-i18n/ibus/ibus-1.5.25.ebuild |
| 121 |
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild |
| 122 |
@@ -113,6 +113,14 @@ src_prepare() { |
| 123 |
|
| 124 |
src_configure() { |
| 125 |
local unicodedir="${EPREFIX}"/usr/share/unicode |
| 126 |
+ local ucddir |
| 127 |
+ |
| 128 |
+ if has_verson '<app-i18n/unicode-data-14.0.0-r1'; then |
| 129 |
+ ucddir="${unicodedir}-data" |
| 130 |
+ else |
| 131 |
+ ucddir=${unicodedir} |
| 132 |
+ fi |
| 133 |
+ |
| 134 |
local python_conf=() |
| 135 |
if use python; then |
| 136 |
python_setup |
| 137 |
@@ -137,7 +145,7 @@ src_configure() { |
| 138 |
$(use_enable nls) \ |
| 139 |
$(use_enable test tests) \ |
| 140 |
$(use_enable unicode unicode-dict) \ |
| 141 |
- $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \ |
| 142 |
+ $(use_with unicode ucd-dir "${ucddir}") \ |
| 143 |
$(use_enable vala) \ |
| 144 |
$(use_enable wayland) \ |
| 145 |
"${python_conf[@]}" |
Archives