1 |
commit: f24b69fc5a937c4a2df16391c5481fa69d3be462 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 28 14:27:47 2018 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 28 14:55:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24b69fc |
7 |
|
8 |
app-i18n/uim: switch to gtk2 USE flag |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
app-i18n/uim/metadata.xml | 2 +- |
13 |
app-i18n/uim/uim-1.8.6-r1.ebuild | 24 ++++++++++++------------ |
14 |
app-i18n/uim/uim-1.8.6-r2.ebuild | 24 ++++++++++++------------ |
15 |
3 files changed, 25 insertions(+), 25 deletions(-) |
16 |
|
17 |
diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml |
18 |
index a509c6471ec..5954a1c59d1 100644 |
19 |
--- a/app-i18n/uim/metadata.xml |
20 |
+++ b/app-i18n/uim/metadata.xml |
21 |
@@ -15,7 +15,7 @@ |
22 |
<use> |
23 |
<flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg></flag> |
24 |
<flag name="eb">Enable support for <pkg>dev-libs/eb</pkg></flag> |
25 |
- <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag> |
26 |
+ <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag> |
27 |
<flag name="skk">Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag> |
28 |
</use> |
29 |
<upstream> |
30 |
|
31 |
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild |
32 |
index 8f11f1958d1..98d789b88b7 100644 |
33 |
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild |
34 |
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild |
35 |
@@ -12,10 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" |
36 |
LICENSE="BSD GPL-2 LGPL-2.1" |
37 |
SLOT="0" |
38 |
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86" |
39 |
-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" |
40 |
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft" |
41 |
RESTRICT="test" |
42 |
REQUIRED_USE="gtk? ( X ) |
43 |
- gtk3? ( X ) |
44 |
+ gtk2? ( X ) |
45 |
qt4? ( X ) |
46 |
xft? ( X )" |
47 |
|
48 |
@@ -36,8 +36,8 @@ CDEPEND="!dev-scheme/sigscheme |
49 |
emacs? ( virtual/emacs ) |
50 |
expat? ( dev-libs/expat ) |
51 |
libffi? ( virtual/libffi ) |
52 |
- gtk? ( x11-libs/gtk+:2 ) |
53 |
- gtk3? ( x11-libs/gtk+:3 ) |
54 |
+ gtk? ( x11-libs/gtk+:3 ) |
55 |
+ gtk2? ( x11-libs/gtk+:2 ) |
56 |
libedit? ( dev-libs/libedit ) |
57 |
libnotify? ( x11-libs/libnotify ) |
58 |
m17n-lib? ( dev-libs/m17n-lib ) |
59 |
@@ -104,8 +104,8 @@ src_configure() { |
60 |
$(use_with expat) |
61 |
$(use_with libedit) |
62 |
$(use_with libffi ffi) |
63 |
- $(use_with gtk gtk2) |
64 |
- $(use_with gtk3) |
65 |
+ $(use_with gtk gtk3) |
66 |
+ $(use_with gtk2) |
67 |
$(use_with m17n-lib m17nlib) |
68 |
$(use_enable ncurses fep) |
69 |
$(use_enable nls) |
70 |
@@ -126,7 +126,7 @@ src_configure() { |
71 |
--without-prime |
72 |
) |
73 |
|
74 |
- if (use gtk || use gtk3) && (use anthy || use canna); then |
75 |
+ if (use gtk || use gtk2) && (use anthy || use canna); then |
76 |
myconf+=( --enable-dict ) |
77 |
else |
78 |
myconf+=( --disable-dict ) |
79 |
@@ -136,7 +136,7 @@ src_configure() { |
80 |
myconf+=( --enable-notify=libnotify ) |
81 |
fi |
82 |
|
83 |
- if use gtk || use gtk3 || use qt4; then |
84 |
+ if use gtk || use gtk2 || use qt4; then |
85 |
myconf+=( --enable-pref ) |
86 |
else |
87 |
myconf+=( --disable-pref ) |
88 |
@@ -197,12 +197,12 @@ pkg_postinst() { |
89 |
elog "Integration with LEIM is not done with this ebuild, please have" |
90 |
elog "a look at the documentation how to achieve this." |
91 |
fi |
92 |
- use gtk && gnome2_query_immodules_gtk2 |
93 |
- use gtk3 && gnome2_query_immodules_gtk3 |
94 |
+ use gtk && gnome2_query_immodules_gtk3 |
95 |
+ use gtk2 && gnome2_query_immodules_gtk2 |
96 |
} |
97 |
|
98 |
pkg_postrm() { |
99 |
use emacs && elisp-site-regen |
100 |
- use gtk && gnome2_query_immodules_gtk2 |
101 |
- use gtk3 && gnome2_query_immodules_gtk3 |
102 |
+ use gtk && gnome2_query_immodules_gtk3 |
103 |
+ use gtk2 && gnome2_query_immodules_gtk2 |
104 |
} |
105 |
|
106 |
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild |
107 |
index 92b6abc0c68..d17f38959ea 100644 |
108 |
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild |
109 |
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild |
110 |
@@ -12,10 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" |
111 |
LICENSE="BSD GPL-2 LGPL-2.1" |
112 |
SLOT="0" |
113 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
114 |
-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" |
115 |
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft" |
116 |
RESTRICT="test" |
117 |
REQUIRED_USE="gtk? ( X ) |
118 |
- gtk3? ( X ) |
119 |
+ gtk2? ( X ) |
120 |
qt4? ( X ) |
121 |
xft? ( X )" |
122 |
|
123 |
@@ -36,8 +36,8 @@ CDEPEND="!dev-scheme/sigscheme |
124 |
emacs? ( virtual/emacs ) |
125 |
expat? ( dev-libs/expat ) |
126 |
libffi? ( virtual/libffi ) |
127 |
- gtk? ( x11-libs/gtk+:2 ) |
128 |
- gtk3? ( x11-libs/gtk+:3 ) |
129 |
+ gtk? ( x11-libs/gtk+:3 ) |
130 |
+ gtk2? ( x11-libs/gtk+:2 ) |
131 |
libedit? ( dev-libs/libedit ) |
132 |
libnotify? ( x11-libs/libnotify ) |
133 |
m17n-lib? ( dev-libs/m17n-lib ) |
134 |
@@ -108,8 +108,8 @@ src_configure() { |
135 |
$(use_with expat) |
136 |
$(use_with libedit) |
137 |
$(use_with libffi ffi) |
138 |
- $(use_with gtk gtk2) |
139 |
- $(use_with gtk3) |
140 |
+ $(use_with gtk gtk3) |
141 |
+ $(use_with gtk2) |
142 |
$(use_with m17n-lib m17nlib) |
143 |
$(use_enable ncurses fep) |
144 |
$(use_enable nls) |
145 |
@@ -130,7 +130,7 @@ src_configure() { |
146 |
--without-prime |
147 |
) |
148 |
|
149 |
- if (use gtk || use gtk3) && (use anthy || use canna); then |
150 |
+ if (use gtk || use gtk2) && (use anthy || use canna); then |
151 |
myconf+=( --enable-dict ) |
152 |
else |
153 |
myconf+=( --disable-dict ) |
154 |
@@ -140,7 +140,7 @@ src_configure() { |
155 |
myconf+=( --enable-notify=libnotify ) |
156 |
fi |
157 |
|
158 |
- if use gtk || use gtk3 || use qt4; then |
159 |
+ if use gtk || use gtk2 || use qt4; then |
160 |
myconf+=( --enable-pref ) |
161 |
else |
162 |
myconf+=( --disable-pref ) |
163 |
@@ -201,12 +201,12 @@ pkg_postinst() { |
164 |
elog "Integration with LEIM is not done with this ebuild, please have" |
165 |
elog "a look at the documentation how to achieve this." |
166 |
fi |
167 |
- use gtk && gnome2_query_immodules_gtk2 |
168 |
- use gtk3 && gnome2_query_immodules_gtk3 |
169 |
+ use gtk && gnome2_query_immodules_gtk3 |
170 |
+ use gtk2 && gnome2_query_immodules_gtk2 |
171 |
} |
172 |
|
173 |
pkg_postrm() { |
174 |
use emacs && elisp-site-regen |
175 |
- use gtk && gnome2_query_immodules_gtk2 |
176 |
- use gtk3 && gnome2_query_immodules_gtk3 |
177 |
+ use gtk && gnome2_query_immodules_gtk3 |
178 |
+ use gtk2 && gnome2_query_immodules_gtk2 |
179 |
} |