commit: e4c1809a146836fd3483f12dfae124e8a13ba59e Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Mon May 28 14:21:32 2018 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Mon May 28 14:55:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c1809a
app-i18n/uim: drop unicode USE flag Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-i18n/uim/uim-1.8.6-r1.ebuild | 19 ++++--------------- app-i18n/uim/uim-1.8.6-r2.ebuild | 19 ++++--------------- 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild index e0afd85576e..8f11f1958d1 100644 --- a/app-i18n/uim/uim-1.8.6-r1.ebuild +++ b/app-i18n/uim/uim-1.8.6-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"; LICENSE="BSD GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~arm hppa ppc ppc64 x86" -IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs unicode xft" +IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft" RESTRICT="test" REQUIRED_USE="gtk? ( X ) gtk3? ( X ) @@ -29,10 +29,7 @@ CDEPEND="!dev-scheme/sigscheme x11-libs/libXrender x11-libs/libXt ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) + anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) @@ -98,6 +95,7 @@ src_prepare() { src_configure() { local myconf=( $(use_with X x) + $(use_with anthy anthy-utf8) $(use_with canna) $(use_with curl) $(use_with eb) @@ -119,6 +117,7 @@ src_configure() { $(use_enable ssl openssl) $(use_enable static-libs static) $(use_with xft) + --without-anthy --disable-gnome-applet --disable-gnome3-applet --disable-kde-applet @@ -127,16 +126,6 @@ src_configure() { --without-prime ) - if use anthy; then - if use unicode; then - myconf+=( --with-anthy-utf8 ) - else - myconf+=( --with-anthy ) - fi - else - myconf+=( --without-anthy ) - fi - if (use gtk || use gtk3) && (use anthy || use canna); then myconf+=( --enable-dict ) else diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild index faf0515534a..92b6abc0c68 100644 --- a/app-i18n/uim/uim-1.8.6-r2.ebuild +++ b/app-i18n/uim/uim-1.8.6-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"; LICENSE="BSD GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs unicode xft" +IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft" RESTRICT="test" REQUIRED_USE="gtk? ( X ) gtk3? ( X ) @@ -29,10 +29,7 @@ CDEPEND="!dev-scheme/sigscheme x11-libs/libXrender x11-libs/libXt ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) + anthy? ( app-i18n/anthy ) canna? ( app-i18n/canna ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) @@ -102,6 +99,7 @@ src_prepare() { src_configure() { local myconf=( $(use_with X x) + $(use_with anthy anthy-utf8) $(use_with canna) $(use_with curl) $(use_with eb) @@ -123,6 +121,7 @@ src_configure() { $(use_enable ssl openssl) $(use_enable static-libs static) $(use_with xft) + --without-anthy --disable-gnome-applet --disable-gnome3-applet --disable-kde-applet @@ -131,16 +130,6 @@ src_configure() { --without-prime ) - if use anthy; then - if use unicode; then - myconf+=( --with-anthy-utf8 ) - else - myconf+=( --with-anthy ) - fi - else - myconf+=( --without-anthy ) - fi - if (use gtk || use gtk3) && (use anthy || use canna); then myconf+=( --enable-dict ) else
