1 |
commit: 92ddd1e3ded7a9fed5f7b5ea2b3bbc0fa910b886 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 14 14:45:07 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 14 14:45:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ddd1e3 |
7 |
|
8 |
app-i18n/ibus: add missing REQUIRED_USE |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
app-i18n/ibus/ibus-1.5.12.ebuild | 18 ++++++++---------- |
13 |
app-i18n/ibus/ibus-1.5.15.ebuild | 18 ++++++++---------- |
14 |
app-i18n/ibus/ibus-1.5.16.ebuild | 16 +++++++--------- |
15 |
3 files changed, 23 insertions(+), 29 deletions(-) |
16 |
|
17 |
diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild |
18 |
index ebad2ff67aa..a8413c59fff 100644 |
19 |
--- a/app-i18n/ibus/ibus-1.5.12.ebuild |
20 |
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild |
21 |
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
22 |
LICENSE="LGPL-2.1" |
23 |
SLOT="0" |
24 |
KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
25 |
-IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X" |
26 |
-REQUIRED_USE="libnotify? ( gtk ) |
27 |
+IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland" |
28 |
+REQUIRED_USE="gtk2? ( gtk ) |
29 |
+ libnotify? ( gtk ) |
30 |
python? ( |
31 |
${PYTHON_REQUIRED_USE} |
32 |
gtk |
33 |
@@ -29,6 +30,10 @@ CDEPEND="app-text/iso-codes |
34 |
gnome-base/dconf |
35 |
gnome-base/librsvg:2 |
36 |
sys-apps/dbus[X?] |
37 |
+ X? ( |
38 |
+ x11-libs/libX11 |
39 |
+ !gtk? ( x11-libs/gtk+:2 ) |
40 |
+ ) |
41 |
gconf? ( gnome-base/gconf:2 ) |
42 |
gtk? ( |
43 |
x11-libs/gtk+:3 |
44 |
@@ -46,13 +51,6 @@ CDEPEND="app-text/iso-codes |
45 |
wayland? ( |
46 |
dev-libs/wayland |
47 |
x11-libs/libxkbcommon |
48 |
- ) |
49 |
- X? ( |
50 |
- || ( |
51 |
- x11-libs/gtk+:3 |
52 |
- x11-libs/gtk+:2 |
53 |
- ) |
54 |
- x11-libs/libX11 |
55 |
)" |
56 |
RDEPEND="${CDEPEND} |
57 |
python? ( |
58 |
@@ -104,6 +102,7 @@ src_configure() { |
59 |
fi |
60 |
|
61 |
econf \ |
62 |
+ $(use_enable X xim) \ |
63 |
$(use_enable gconf) \ |
64 |
$(use_enable gtk gtk3) \ |
65 |
$(use_enable gtk ui) \ |
66 |
@@ -114,7 +113,6 @@ src_configure() { |
67 |
$(use_enable test tests) \ |
68 |
$(use_enable vala) \ |
69 |
$(use_enable wayland) \ |
70 |
- $(use_enable X xim) \ |
71 |
"${python_conf[@]}" |
72 |
} |
73 |
|
74 |
|
75 |
diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild |
76 |
index 439ccca56b0..d98586b8db2 100644 |
77 |
--- a/app-i18n/ibus/ibus-1.5.15.ebuild |
78 |
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild |
79 |
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
80 |
LICENSE="LGPL-2.1" |
81 |
SLOT="0" |
82 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
83 |
-IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X" |
84 |
-REQUIRED_USE="libnotify? ( gtk ) |
85 |
+IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland" |
86 |
+REQUIRED_USE="gtk2? ( gtk ) |
87 |
+ libnotify? ( gtk ) |
88 |
python? ( |
89 |
${PYTHON_REQUIRED_USE} |
90 |
gtk |
91 |
@@ -29,6 +30,10 @@ CDEPEND="app-text/iso-codes |
92 |
gnome-base/dconf |
93 |
gnome-base/librsvg:2 |
94 |
sys-apps/dbus[X?] |
95 |
+ X? ( |
96 |
+ x11-libs/libX11 |
97 |
+ !gtk? ( x11-libs/gtk+:2 ) |
98 |
+ ) |
99 |
gconf? ( gnome-base/gconf:2 ) |
100 |
gtk? ( |
101 |
x11-libs/gtk+:3 |
102 |
@@ -46,13 +51,6 @@ CDEPEND="app-text/iso-codes |
103 |
wayland? ( |
104 |
dev-libs/wayland |
105 |
x11-libs/libxkbcommon |
106 |
- ) |
107 |
- X? ( |
108 |
- || ( |
109 |
- x11-libs/gtk+:3 |
110 |
- x11-libs/gtk+:2 |
111 |
- ) |
112 |
- x11-libs/libX11 |
113 |
)" |
114 |
RDEPEND="${CDEPEND} |
115 |
python? ( |
116 |
@@ -104,6 +102,7 @@ src_configure() { |
117 |
fi |
118 |
|
119 |
econf \ |
120 |
+ $(use_enable X xim) \ |
121 |
$(use_enable gconf) \ |
122 |
$(use_enable gtk gtk3) \ |
123 |
$(use_enable gtk ui) \ |
124 |
@@ -114,7 +113,6 @@ src_configure() { |
125 |
$(use_enable test tests) \ |
126 |
$(use_enable vala) \ |
127 |
$(use_enable wayland) \ |
128 |
- $(use_enable X xim) \ |
129 |
--disable-emoji-dict \ |
130 |
"${python_conf[@]}" |
131 |
} |
132 |
|
133 |
diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild |
134 |
index e948253cdf5..a54a1d332c2 100644 |
135 |
--- a/app-i18n/ibus/ibus-1.5.16.ebuild |
136 |
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild |
137 |
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
138 |
LICENSE="LGPL-2.1" |
139 |
SLOT="0" |
140 |
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" |
141 |
-IUSE="+emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland +X" |
142 |
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland" |
143 |
REQUIRED_USE="emoji? ( gtk ) |
144 |
+ gtk2? ( gtk ) |
145 |
kde? ( gtk ) |
146 |
libnotify? ( gtk ) |
147 |
python? ( |
148 |
@@ -31,6 +32,10 @@ CDEPEND="app-text/iso-codes |
149 |
gnome-base/dconf |
150 |
gnome-base/librsvg:2 |
151 |
sys-apps/dbus[X?] |
152 |
+ X? ( |
153 |
+ x11-libs/libX11 |
154 |
+ !gtk? ( x11-libs/gtk+:2 ) |
155 |
+ ) |
156 |
gconf? ( gnome-base/gconf:2 ) |
157 |
gtk? ( |
158 |
x11-libs/gtk+:3 |
159 |
@@ -49,13 +54,6 @@ CDEPEND="app-text/iso-codes |
160 |
wayland? ( |
161 |
dev-libs/wayland |
162 |
x11-libs/libxkbcommon |
163 |
- ) |
164 |
- X? ( |
165 |
- || ( |
166 |
- x11-libs/gtk+:3 |
167 |
- x11-libs/gtk+:2 |
168 |
- ) |
169 |
- x11-libs/libX11 |
170 |
)" |
171 |
RDEPEND="${CDEPEND} |
172 |
python? ( |
173 |
@@ -116,6 +114,7 @@ src_configure() { |
174 |
fi |
175 |
|
176 |
econf \ |
177 |
+ $(use_enable X xim) \ |
178 |
$(use_enable emoji emoji-dict) \ |
179 |
$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \ |
180 |
$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \ |
181 |
@@ -130,7 +129,6 @@ src_configure() { |
182 |
$(use_enable test tests) \ |
183 |
$(use_enable vala) \ |
184 |
$(use_enable wayland) \ |
185 |
- $(use_enable X xim) \ |
186 |
"${python_conf[@]}" |
187 |
} |