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