1 |
commit: dbbd730dd7b0737f667a0488176eba9780014dfb |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 1 13:50:11 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 1 14:23:12 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbbd730d |
7 |
|
8 |
app-i18n/ibus: update to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
app-i18n/ibus/ibus-1.5.12.ebuild | 155 ++++++++++++++------------------------ |
13 |
app-i18n/ibus/ibus-1.5.15.ebuild | 157 ++++++++++++++------------------------- |
14 |
app-i18n/ibus/metadata.xml | 12 +-- |
15 |
3 files changed, 117 insertions(+), 207 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 2cfa0156fa2..12aa72a0cdd 100644 |
19 |
--- a/app-i18n/ibus/ibus-1.5.12.ebuild |
20 |
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild |
21 |
@@ -1,188 +1,143 @@ |
22 |
# Copyright 1999-2017 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI=5 |
26 |
- |
27 |
+EAPI="6" |
28 |
PYTHON_COMPAT=( python2_7 ) |
29 |
VALA_USE_DEPEND="vapigen" |
30 |
-# Vapigen is needed for the vala binding |
31 |
-# Valac is needed when building from git for the engine |
32 |
-UPSTREAM_VER= |
33 |
|
34 |
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx |
35 |
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-single-r1 vala virtualx |
36 |
|
37 |
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" |
38 |
HOMEPAGE="https://github.com/ibus/ibus/wiki" |
39 |
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
40 |
|
41 |
LICENSE="LGPL-2.1" |
42 |
SLOT="0" |
43 |
KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
44 |
IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" |
45 |
-REQUIRED_USE=" |
46 |
- || ( gtk gtk3 X ) |
47 |
+RESTRICT="test" |
48 |
+REQUIRED_USE="|| ( gtk gtk3 X ) |
49 |
deprecated? ( python ) |
50 |
vala? ( introspection ) |
51 |
python? ( |
52 |
${PYTHON_REQUIRED_USE} |
53 |
|| ( deprecated ( gtk3 introspection ) ) )" #342903 |
54 |
|
55 |
-[[ -n ${UPSTREAM_VER} ]] && \ |
56 |
- UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
57 |
- |
58 |
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz |
59 |
- ${UPSTRAM_PATCHSET_URI}" |
60 |
- |
61 |
-COMMON_DEPEND=" |
62 |
- >=dev-libs/glib-2.26:2 |
63 |
+CDEPEND="app-text/iso-codes |
64 |
+ dev-libs/glib:2 |
65 |
+ gnome-base/dconf |
66 |
gnome-base/librsvg:2 |
67 |
sys-apps/dbus[X?] |
68 |
- app-text/iso-codes |
69 |
- >=gnome-base/dconf-0.13.4 |
70 |
x11-libs/libnotify |
71 |
- gconf? ( >=gnome-base/gconf-2.12:2 ) |
72 |
+ gconf? ( gnome-base/gconf:2 ) |
73 |
gtk? ( x11-libs/gtk+:2 ) |
74 |
gtk3? ( x11-libs/gtk+:3 ) |
75 |
- python? ( ${PYTHON_DEPS} ) |
76 |
+ introspection? ( dev-libs/gobject-introspection ) |
77 |
+ nls? ( virtual/libintl ) |
78 |
+ python? ( |
79 |
+ ${PYTHON_DEPS} |
80 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
81 |
+ ) |
82 |
+ wayland? ( |
83 |
+ dev-libs/wayland |
84 |
+ x11-libs/libxkbcommon |
85 |
+ ) |
86 |
X? ( |
87 |
+ || ( |
88 |
+ x11-libs/gtk+:3 |
89 |
+ x11-libs/gtk+:2 |
90 |
+ ) |
91 |
x11-libs/libX11 |
92 |
- x11-libs/gtk+:2 ) |
93 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) |
94 |
- nls? ( virtual/libintl ) |
95 |
- wayland? ( dev-libs/wayland )" |
96 |
-RDEPEND="${COMMON_DEPEND} |
97 |
- x11-apps/setxkbmap |
98 |
+ )" |
99 |
+RDEPEND="${CDEPEND} |
100 |
python? ( |
101 |
- dev-python/pyxdg |
102 |
deprecated? ( |
103 |
- >=dev-python/dbus-python-0.83 |
104 |
- dev-python/pygobject:2 |
105 |
- dev-python/pygtk:2 ) |
106 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
107 |
+ dev-python/pygtk:2[${PYTHON_USEDEP}] |
108 |
+ ) |
109 |
gtk3? ( |
110 |
- dev-python/pygobject:3 |
111 |
- x11-libs/gdk-pixbuf:2[introspection] |
112 |
- x11-libs/pango[introspection] |
113 |
- x11-libs/gtk+:3[introspection] ) |
114 |
+ x11-libs/gtk+:3[introspection] |
115 |
+ ) |
116 |
)" |
117 |
-DEPEND="${COMMON_DEPEND} |
118 |
- >=dev-lang/perl-5.8.1 |
119 |
- dev-util/gtk-doc-am |
120 |
+DEPEND="${CDEPEND} |
121 |
dev-util/intltool |
122 |
virtual/pkgconfig |
123 |
- nls? ( >=sys-devel/gettext-0.16.1 ) |
124 |
+ nls? ( sys-devel/gettext ) |
125 |
vala? ( $(vala_depend) )" |
126 |
|
127 |
-# stress test in bus/ fails |
128 |
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed |
129 |
-RESTRICT="test" |
130 |
- |
131 |
-DOCS="AUTHORS ChangeLog NEWS README" |
132 |
- |
133 |
-DISABLE_AUTOFORMATTING="yes" |
134 |
-DOC_CONTENTS="To use ibus, you should: |
135 |
-1. Get input engines from sunrise overlay. |
136 |
-Run \"emerge -s ibus-\" in your favorite terminal |
137 |
-for a list of packages we already have. |
138 |
- |
139 |
-2. Setup ibus: |
140 |
-$ ibus-setup |
141 |
- |
142 |
-3. Set the following in your user startup scripts |
143 |
-such as .xinitrc, .xsession or .xprofile: |
144 |
- |
145 |
-export XMODIFIERS=\"@im=ibus\" |
146 |
-export GTK_IM_MODULE=\"ibus\" |
147 |
-export QT_IM_MODULE=\"xim\" |
148 |
-ibus-daemon -d -x |
149 |
-" |
150 |
- |
151 |
pkg_setup() { |
152 |
use python && python-single-r1_pkg_setup |
153 |
} |
154 |
|
155 |
src_prepare() { |
156 |
- # Upstream's patchset |
157 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
158 |
- EPATCH_SUFFIX="patch" \ |
159 |
- EPATCH_FORCE="yes" \ |
160 |
- EPATCH_OPTS="-p1" \ |
161 |
- epatch "${WORKDIR}"/patches-upstream |
162 |
- fi |
163 |
- |
164 |
- # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations |
165 |
- sed -e 's/dconf update/:/' \ |
166 |
- -i data/dconf/Makefile.{am,in} || die |
167 |
use vala && vala_src_prepare |
168 |
|
169 |
+ sed -i "/^bash_completion/d" tools/Makefile.am |
170 |
+ |
171 |
+ default |
172 |
eautoreconf |
173 |
} |
174 |
|
175 |
src_configure() { |
176 |
- local python_conf |
177 |
+ local python_conf=() |
178 |
if use python; then |
179 |
- python_conf="PYTHON=${PYTHON} |
180 |
+ python_conf+=( |
181 |
$(use_enable deprecated python-library) |
182 |
- $(use_enable gtk3 setup)" |
183 |
+ $(use_enable gtk3 setup) |
184 |
+ --with-python=${EPYTHON} |
185 |
+ ) |
186 |
else |
187 |
- python_conf="--disable-python-library --disable-setup" |
188 |
+ python_conf+=( --disable-setup ) |
189 |
fi |
190 |
+ |
191 |
econf \ |
192 |
- --enable-dconf \ |
193 |
- $(use_enable introspection) \ |
194 |
$(use_enable gconf) \ |
195 |
$(use_enable gtk gtk2) \ |
196 |
- $(use_enable gtk xim) \ |
197 |
- $(use_enable gtk3) \ |
198 |
$(use_enable gtk3 ui) \ |
199 |
+ $(use_enable gtk3) \ |
200 |
+ $(use_enable introspection) \ |
201 |
$(use_enable nls) \ |
202 |
$(use_enable test tests) \ |
203 |
- $(use_enable X xim) \ |
204 |
$(use_enable vala) \ |
205 |
$(use_enable wayland) \ |
206 |
- ${python_conf} |
207 |
+ $(use_enable X xim) \ |
208 |
+ "${python_conf[@]}" |
209 |
} |
210 |
|
211 |
src_test() { |
212 |
unset DBUS_SESSION_BUS_ADDRESS |
213 |
- Xemake check || die |
214 |
+ virtx emake -j1 check |
215 |
} |
216 |
|
217 |
src_install() { |
218 |
default |
219 |
+ prune_libtool_files --modules |
220 |
|
221 |
- prune_libtool_files --all |
222 |
+ keepdir /usr/share/ibus/engine |
223 |
|
224 |
- mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}" |
225 |
- rm -rf "${ED}"/usr/share/bash-completion || die |
226 |
- newbashcomp "${T}"/ibus.bash ${PN} |
227 |
- insinto /etc/X11/xinit/xinput.d |
228 |
- newins xinput-ibus ibus.conf |
229 |
+ newbashcomp tools/${PN}.bash ${PN} |
230 |
|
231 |
- keepdir /usr/share/ibus/{engine,icons} #289547 |
232 |
- |
233 |
- use deprecated && python_optimize |
234 |
- use python && use gtk3 && python_optimize |
235 |
- |
236 |
- readme.gentoo_create_doc |
237 |
+ insinto /etc/X11/xinit/xinput.d |
238 |
+ newins xinput-${PN} ${PN}.conf |
239 |
} |
240 |
|
241 |
pkg_preinst() { |
242 |
use gconf && gnome2_gconf_savelist |
243 |
- gnome2_schemas_savelist |
244 |
gnome2_icon_savelist |
245 |
+ gnome2_schemas_savelist |
246 |
} |
247 |
|
248 |
pkg_postinst() { |
249 |
use gconf && gnome2_gconf_install |
250 |
use gtk && gnome2_query_immodules_gtk2 |
251 |
use gtk3 && gnome2_query_immodules_gtk3 |
252 |
- gnome2_schemas_update |
253 |
gnome2_icon_cache_update |
254 |
- readme.gentoo_print_elog |
255 |
+ gnome2_schemas_update |
256 |
} |
257 |
|
258 |
pkg_postrm() { |
259 |
use gtk && gnome2_query_immodules_gtk2 |
260 |
use gtk3 && gnome2_query_immodules_gtk3 |
261 |
- use gconf && gnome2_schemas_update |
262 |
gnome2_icon_cache_update |
263 |
+ gnome2_schemas_update |
264 |
} |
265 |
|
266 |
diff --git a/app-i18n/ibus/ibus-1.5.15.ebuild b/app-i18n/ibus/ibus-1.5.15.ebuild |
267 |
index 33b9e5be6dc..8900ff31aae 100644 |
268 |
--- a/app-i18n/ibus/ibus-1.5.15.ebuild |
269 |
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild |
270 |
@@ -1,189 +1,144 @@ |
271 |
# Copyright 1999-2017 Gentoo Foundation |
272 |
# Distributed under the terms of the GNU General Public License v2 |
273 |
|
274 |
-EAPI=5 |
275 |
- |
276 |
+EAPI="6" |
277 |
PYTHON_COMPAT=( python2_7 ) |
278 |
VALA_USE_DEPEND="vapigen" |
279 |
-# Vapigen is needed for the vala binding |
280 |
-# Valac is needed when building from git for the engine |
281 |
-UPSTREAM_VER= |
282 |
|
283 |
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx |
284 |
+inherit autotools bash-completion-r1 gnome2-utils ltprune python-single-r1 vala virtualx |
285 |
|
286 |
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" |
287 |
HOMEPAGE="https://github.com/ibus/ibus/wiki" |
288 |
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
289 |
|
290 |
LICENSE="LGPL-2.1" |
291 |
SLOT="0" |
292 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
293 |
IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" |
294 |
-REQUIRED_USE=" |
295 |
- || ( gtk gtk3 X ) |
296 |
+RESTRICT="test" |
297 |
+REQUIRED_USE="|| ( gtk gtk3 X ) |
298 |
deprecated? ( python ) |
299 |
vala? ( introspection ) |
300 |
python? ( |
301 |
${PYTHON_REQUIRED_USE} |
302 |
|| ( deprecated ( gtk3 introspection ) ) )" #342903 |
303 |
|
304 |
-[[ -n ${UPSTREAM_VER} ]] && \ |
305 |
- UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
306 |
- |
307 |
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz |
308 |
- ${UPSTRAM_PATCHSET_URI}" |
309 |
- |
310 |
-COMMON_DEPEND=" |
311 |
- >=dev-libs/glib-2.26:2 |
312 |
+CDEPEND="app-text/iso-codes |
313 |
+ dev-libs/glib:2 |
314 |
+ gnome-base/dconf |
315 |
gnome-base/librsvg:2 |
316 |
sys-apps/dbus[X?] |
317 |
- app-text/iso-codes |
318 |
- >=gnome-base/dconf-0.13.4 |
319 |
x11-libs/libnotify |
320 |
- gconf? ( >=gnome-base/gconf-2.12:2 ) |
321 |
+ gconf? ( gnome-base/gconf:2 ) |
322 |
gtk? ( x11-libs/gtk+:2 ) |
323 |
gtk3? ( x11-libs/gtk+:3 ) |
324 |
- python? ( ${PYTHON_DEPS} ) |
325 |
+ introspection? ( dev-libs/gobject-introspection ) |
326 |
+ nls? ( virtual/libintl ) |
327 |
+ python? ( |
328 |
+ ${PYTHON_DEPS} |
329 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
330 |
+ ) |
331 |
+ wayland? ( |
332 |
+ dev-libs/wayland |
333 |
+ x11-libs/libxkbcommon |
334 |
+ ) |
335 |
X? ( |
336 |
+ || ( |
337 |
+ x11-libs/gtk+:3 |
338 |
+ x11-libs/gtk+:2 |
339 |
+ ) |
340 |
x11-libs/libX11 |
341 |
- x11-libs/gtk+:2 ) |
342 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) |
343 |
- nls? ( virtual/libintl ) |
344 |
- wayland? ( dev-libs/wayland )" |
345 |
-RDEPEND="${COMMON_DEPEND} |
346 |
- x11-apps/setxkbmap |
347 |
+ )" |
348 |
+RDEPEND="${CDEPEND} |
349 |
python? ( |
350 |
- dev-python/pyxdg |
351 |
deprecated? ( |
352 |
- >=dev-python/dbus-python-0.83 |
353 |
- dev-python/pygobject:2 |
354 |
- dev-python/pygtk:2 ) |
355 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
356 |
+ dev-python/pygtk:2[${PYTHON_USEDEP}] |
357 |
+ ) |
358 |
gtk3? ( |
359 |
- dev-python/pygobject:3 |
360 |
- x11-libs/gdk-pixbuf:2[introspection] |
361 |
- x11-libs/pango[introspection] |
362 |
- x11-libs/gtk+:3[introspection] ) |
363 |
+ x11-libs/gtk+:3[introspection] |
364 |
+ ) |
365 |
)" |
366 |
-DEPEND="${COMMON_DEPEND} |
367 |
- >=dev-lang/perl-5.8.1 |
368 |
- dev-util/gtk-doc-am |
369 |
+DEPEND="${CDEPEND} |
370 |
dev-util/intltool |
371 |
virtual/pkgconfig |
372 |
- nls? ( >=sys-devel/gettext-0.16.1 ) |
373 |
+ nls? ( sys-devel/gettext ) |
374 |
vala? ( $(vala_depend) )" |
375 |
|
376 |
-# stress test in bus/ fails |
377 |
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed |
378 |
-RESTRICT="test" |
379 |
- |
380 |
-DOCS="AUTHORS ChangeLog NEWS README" |
381 |
- |
382 |
-DISABLE_AUTOFORMATTING="yes" |
383 |
-DOC_CONTENTS="To use ibus, you should: |
384 |
-1. Get input engines from sunrise overlay. |
385 |
-Run \"emerge -s ibus-\" in your favorite terminal |
386 |
-for a list of packages we already have. |
387 |
- |
388 |
-2. Setup ibus: |
389 |
-$ ibus-setup |
390 |
- |
391 |
-3. Set the following in your user startup scripts |
392 |
-such as .xinitrc, .xsession or .xprofile: |
393 |
- |
394 |
-export XMODIFIERS=\"@im=ibus\" |
395 |
-export GTK_IM_MODULE=\"ibus\" |
396 |
-export QT_IM_MODULE=\"xim\" |
397 |
-ibus-daemon -d -x |
398 |
-" |
399 |
- |
400 |
pkg_setup() { |
401 |
use python && python-single-r1_pkg_setup |
402 |
} |
403 |
|
404 |
src_prepare() { |
405 |
- # Upstream's patchset |
406 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
407 |
- EPATCH_SUFFIX="patch" \ |
408 |
- EPATCH_FORCE="yes" \ |
409 |
- EPATCH_OPTS="-p1" \ |
410 |
- epatch "${WORKDIR}"/patches-upstream |
411 |
- fi |
412 |
- |
413 |
- # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations |
414 |
- sed -e 's/dconf update/:/' \ |
415 |
- -i data/dconf/Makefile.{am,in} || die |
416 |
use vala && vala_src_prepare |
417 |
|
418 |
+ sed -i "/^bash_completion/d" tools/Makefile.am |
419 |
+ |
420 |
+ default |
421 |
eautoreconf |
422 |
} |
423 |
|
424 |
src_configure() { |
425 |
- local python_conf |
426 |
+ local python_conf=() |
427 |
if use python; then |
428 |
- python_conf="PYTHON=${PYTHON} |
429 |
+ python_conf+=( |
430 |
$(use_enable deprecated python-library) |
431 |
- $(use_enable gtk3 setup)" |
432 |
+ $(use_enable gtk3 setup) |
433 |
+ --with-python=${EPYTHON} |
434 |
+ ) |
435 |
else |
436 |
- python_conf="--disable-python-library --disable-setup" |
437 |
+ python_conf+=( --disable-setup ) |
438 |
fi |
439 |
+ |
440 |
econf \ |
441 |
- --enable-dconf \ |
442 |
- --disable-emoji-dict \ |
443 |
- $(use_enable introspection) \ |
444 |
$(use_enable gconf) \ |
445 |
$(use_enable gtk gtk2) \ |
446 |
- $(use_enable gtk xim) \ |
447 |
- $(use_enable gtk3) \ |
448 |
$(use_enable gtk3 ui) \ |
449 |
+ $(use_enable gtk3) \ |
450 |
+ $(use_enable introspection) \ |
451 |
$(use_enable nls) \ |
452 |
$(use_enable test tests) \ |
453 |
- $(use_enable X xim) \ |
454 |
$(use_enable vala) \ |
455 |
$(use_enable wayland) \ |
456 |
- ${python_conf} |
457 |
+ $(use_enable X xim) \ |
458 |
+ --disable-emoji-dict \ |
459 |
+ "${python_conf[@]}" |
460 |
} |
461 |
|
462 |
src_test() { |
463 |
unset DBUS_SESSION_BUS_ADDRESS |
464 |
- Xemake check || die |
465 |
+ virtx emake -j1 check |
466 |
} |
467 |
|
468 |
src_install() { |
469 |
default |
470 |
+ prune_libtool_files --modules |
471 |
|
472 |
- prune_libtool_files --all |
473 |
+ keepdir /usr/share/ibus/engine |
474 |
|
475 |
- mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}" |
476 |
- rm -rf "${ED}"/usr/share/bash-completion || die |
477 |
- newbashcomp "${T}"/ibus.bash ${PN} |
478 |
- insinto /etc/X11/xinit/xinput.d |
479 |
- newins xinput-ibus ibus.conf |
480 |
- |
481 |
- keepdir /usr/share/ibus/{engine,icons} #289547 |
482 |
- |
483 |
- use deprecated && python_optimize |
484 |
- use python && use gtk3 && python_optimize |
485 |
+ newbashcomp tools/${PN}.bash ${PN} |
486 |
|
487 |
- readme.gentoo_create_doc |
488 |
+ insinto /etc/X11/xinit/xinput.d |
489 |
+ newins xinput-${PN} ${PN}.conf |
490 |
} |
491 |
|
492 |
pkg_preinst() { |
493 |
use gconf && gnome2_gconf_savelist |
494 |
- gnome2_schemas_savelist |
495 |
gnome2_icon_savelist |
496 |
+ gnome2_schemas_savelist |
497 |
} |
498 |
|
499 |
pkg_postinst() { |
500 |
use gconf && gnome2_gconf_install |
501 |
use gtk && gnome2_query_immodules_gtk2 |
502 |
use gtk3 && gnome2_query_immodules_gtk3 |
503 |
- gnome2_schemas_update |
504 |
gnome2_icon_cache_update |
505 |
- readme.gentoo_print_elog |
506 |
+ gnome2_schemas_update |
507 |
} |
508 |
|
509 |
pkg_postrm() { |
510 |
use gtk && gnome2_query_immodules_gtk2 |
511 |
use gtk3 && gnome2_query_immodules_gtk3 |
512 |
- use gconf && gnome2_schemas_update |
513 |
gnome2_icon_cache_update |
514 |
+ gnome2_schemas_update |
515 |
} |
516 |
|
517 |
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml |
518 |
index f67071b7101..9fc8f486d7d 100644 |
519 |
--- a/app-i18n/ibus/metadata.xml |
520 |
+++ b/app-i18n/ibus/metadata.xml |
521 |
@@ -6,14 +6,14 @@ |
522 |
<name>Cjk</name> |
523 |
</maintainer> |
524 |
<longdescription lang="en"> |
525 |
-IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It provides |
526 |
-full featured and user friendly input method user interface. It also may help |
527 |
-developers to develop input method easily. |
528 |
-</longdescription> |
529 |
+ IBus is a Intelligent Input Bus. It is a new input framework for Linux OS. |
530 |
+ It provides full featured and user friendly input method user interface. It |
531 |
+ also may help developers to develop input method easily. |
532 |
+ </longdescription> |
533 |
<use> |
534 |
+ <flag name="deprecated">Install the deprecated iBus Python library</flag> |
535 |
<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag> |
536 |
- <flag name="gtk3">Enable support for gtk+3</flag> |
537 |
- <flag name="deprecated">install the deprecated ibus python library</flag> |
538 |
+ <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag> |
539 |
</use> |
540 |
<upstream> |
541 |
<remote-id type="cpe">cpe:/a:ibus_project:ibus</remote-id> |