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[@]}"
