| 1 |
commit: e4c1809a146836fd3483f12dfae124e8a13ba59e |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 14:21:32 2018 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 28 14:55:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c1809a |
| 7 |
|
| 8 |
app-i18n/uim: drop unicode USE flag |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
app-i18n/uim/uim-1.8.6-r1.ebuild | 19 ++++--------------- |
| 13 |
app-i18n/uim/uim-1.8.6-r2.ebuild | 19 ++++--------------- |
| 14 |
2 files changed, 8 insertions(+), 30 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild |
| 17 |
index e0afd85576e..8f11f1958d1 100644 |
| 18 |
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild |
| 19 |
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild |
| 20 |
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" |
| 21 |
LICENSE="BSD GPL-2 LGPL-2.1" |
| 22 |
SLOT="0" |
| 23 |
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86" |
| 24 |
-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" |
| 25 |
+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" |
| 26 |
RESTRICT="test" |
| 27 |
REQUIRED_USE="gtk? ( X ) |
| 28 |
gtk3? ( X ) |
| 29 |
@@ -29,10 +29,7 @@ CDEPEND="!dev-scheme/sigscheme |
| 30 |
x11-libs/libXrender |
| 31 |
x11-libs/libXt |
| 32 |
) |
| 33 |
- anthy? ( |
| 34 |
- unicode? ( >=app-i18n/anthy-8622 ) |
| 35 |
- !unicode? ( app-i18n/anthy ) |
| 36 |
- ) |
| 37 |
+ anthy? ( app-i18n/anthy ) |
| 38 |
canna? ( app-i18n/canna ) |
| 39 |
curl? ( net-misc/curl ) |
| 40 |
eb? ( dev-libs/eb ) |
| 41 |
@@ -98,6 +95,7 @@ src_prepare() { |
| 42 |
src_configure() { |
| 43 |
local myconf=( |
| 44 |
$(use_with X x) |
| 45 |
+ $(use_with anthy anthy-utf8) |
| 46 |
$(use_with canna) |
| 47 |
$(use_with curl) |
| 48 |
$(use_with eb) |
| 49 |
@@ -119,6 +117,7 @@ src_configure() { |
| 50 |
$(use_enable ssl openssl) |
| 51 |
$(use_enable static-libs static) |
| 52 |
$(use_with xft) |
| 53 |
+ --without-anthy |
| 54 |
--disable-gnome-applet |
| 55 |
--disable-gnome3-applet |
| 56 |
--disable-kde-applet |
| 57 |
@@ -127,16 +126,6 @@ src_configure() { |
| 58 |
--without-prime |
| 59 |
) |
| 60 |
|
| 61 |
- if use anthy; then |
| 62 |
- if use unicode; then |
| 63 |
- myconf+=( --with-anthy-utf8 ) |
| 64 |
- else |
| 65 |
- myconf+=( --with-anthy ) |
| 66 |
- fi |
| 67 |
- else |
| 68 |
- myconf+=( --without-anthy ) |
| 69 |
- fi |
| 70 |
- |
| 71 |
if (use gtk || use gtk3) && (use anthy || use canna); then |
| 72 |
myconf+=( --enable-dict ) |
| 73 |
else |
| 74 |
|
| 75 |
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild |
| 76 |
index faf0515534a..92b6abc0c68 100644 |
| 77 |
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild |
| 78 |
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild |
| 79 |
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" |
| 80 |
LICENSE="BSD GPL-2 LGPL-2.1" |
| 81 |
SLOT="0" |
| 82 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
| 83 |
-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" |
| 84 |
+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" |
| 85 |
RESTRICT="test" |
| 86 |
REQUIRED_USE="gtk? ( X ) |
| 87 |
gtk3? ( X ) |
| 88 |
@@ -29,10 +29,7 @@ CDEPEND="!dev-scheme/sigscheme |
| 89 |
x11-libs/libXrender |
| 90 |
x11-libs/libXt |
| 91 |
) |
| 92 |
- anthy? ( |
| 93 |
- unicode? ( >=app-i18n/anthy-8622 ) |
| 94 |
- !unicode? ( app-i18n/anthy ) |
| 95 |
- ) |
| 96 |
+ anthy? ( app-i18n/anthy ) |
| 97 |
canna? ( app-i18n/canna ) |
| 98 |
curl? ( net-misc/curl ) |
| 99 |
eb? ( dev-libs/eb ) |
| 100 |
@@ -102,6 +99,7 @@ src_prepare() { |
| 101 |
src_configure() { |
| 102 |
local myconf=( |
| 103 |
$(use_with X x) |
| 104 |
+ $(use_with anthy anthy-utf8) |
| 105 |
$(use_with canna) |
| 106 |
$(use_with curl) |
| 107 |
$(use_with eb) |
| 108 |
@@ -123,6 +121,7 @@ src_configure() { |
| 109 |
$(use_enable ssl openssl) |
| 110 |
$(use_enable static-libs static) |
| 111 |
$(use_with xft) |
| 112 |
+ --without-anthy |
| 113 |
--disable-gnome-applet |
| 114 |
--disable-gnome3-applet |
| 115 |
--disable-kde-applet |
| 116 |
@@ -131,16 +130,6 @@ src_configure() { |
| 117 |
--without-prime |
| 118 |
) |
| 119 |
|
| 120 |
- if use anthy; then |
| 121 |
- if use unicode; then |
| 122 |
- myconf+=( --with-anthy-utf8 ) |
| 123 |
- else |
| 124 |
- myconf+=( --with-anthy ) |
| 125 |
- fi |
| 126 |
- else |
| 127 |
- myconf+=( --without-anthy ) |
| 128 |
- fi |
| 129 |
- |
| 130 |
if (use gtk || use gtk3) && (use anthy || use canna); then |
| 131 |
myconf+=( --enable-dict ) |
| 132 |
else |
Archives