1 |
commit: 900fe70d4c0eaa94c452c40db87138a9e3963262 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 1 13:37:43 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 1 14:23:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900fe70d |
7 |
|
8 |
app-i18n/ibus: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
app-i18n/ibus/Manifest | 2 - |
13 |
app-i18n/ibus/ibus-1.5.14.ebuild | 189 --------------------------------------- |
14 |
app-i18n/ibus/ibus-1.5.5.ebuild | 173 ----------------------------------- |
15 |
3 files changed, 364 deletions(-) |
16 |
|
17 |
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest |
18 |
index 3fe725d638f..f12243f7cc1 100644 |
19 |
--- a/app-i18n/ibus/Manifest |
20 |
+++ b/app-i18n/ibus/Manifest |
21 |
@@ -1,4 +1,2 @@ |
22 |
DIST ibus-1.5.12.tar.gz 2190284 SHA256 e24da95995f4aca5b96359eaba709487dc5ad4c732e9b01b9bcf9fb34be2442c SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 WHIRLPOOL 82354fc5006a0abe4cb431dda90a67dc1b775f0bac521b481eaeb7acd167ba6179cad14045c5141c57618845589094613bc489357ee8bf550f131ecfb1bf8293 |
23 |
-DIST ibus-1.5.14.tar.gz 2214350 SHA256 a42b40fe4642f36bf2a6f0b4649f54f4043812d6bfee4faca38117799a009d3c SHA512 2e86bc4e282265cfec6882fd132b36521bc2b64796e3d473668512d82ab8059c409ca1226d6b15d64ff4d46754cafa1585eddcc3aa89d58f9e9fdab0a825de0d WHIRLPOOL d2f7da33c73dded936ecf1c7f3edf1f5cdc70a8db70caec774246b1062d659fbb17495a1228cc7e126f99f52c068bc068d5ffb67d032dd6022c1f210eed0f230 |
24 |
DIST ibus-1.5.15.tar.gz 2259352 SHA256 41f7baad6f3aac0cdfaebef674a8731ae47950f140edfbeefebaeed78c93e385 SHA512 4e588acf2ca0172b365630dcfe2d9062e7583e50a44d435ec05c8e3976c6caf54c4708733f1f7dce5ef7724254469ee5c7ab3b086f0cbea18775c894863b0c3e WHIRLPOOL ba40cfe9f398963ce6122d4beabdccaa94c6ac7a7463fe3cea3dc967b19a4702996fd132372a167a02956e1340b4278c61ea19ed781203db33a4651ddd3824b1 |
25 |
-DIST ibus-1.5.5.tar.gz 2063794 SHA256 02ab36af6048399fedbe8d85074b161219b89df5020932df33cf8829764f8aec SHA512 8249d6ee4918b0e0fe030af736eed2260e1376b2fdaf0d819f289e0bd880a5e3874f1fb3d097fc74b9f359822ce16f4dae52a263aa28c2e2ce7bdf671cb2fea9 WHIRLPOOL 33ba90e5cdd54ecd7a03af8c5d2c1d2e8cfc88bfc53b65e5240eb4c60d6138007b754a60e8b1e79c98ce92e299d14f1a0cce445ad40b04e862adf3919401d77d |
26 |
|
27 |
diff --git a/app-i18n/ibus/ibus-1.5.14.ebuild b/app-i18n/ibus/ibus-1.5.14.ebuild |
28 |
deleted file mode 100644 |
29 |
index 33b9e5be6dc..00000000000 |
30 |
--- a/app-i18n/ibus/ibus-1.5.14.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,189 +0,0 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=5 |
37 |
- |
38 |
-PYTHON_COMPAT=( python2_7 ) |
39 |
-VALA_USE_DEPEND="vapigen" |
40 |
-# Vapigen is needed for the vala binding |
41 |
-# Valac is needed when building from git for the engine |
42 |
-UPSTREAM_VER= |
43 |
- |
44 |
-inherit autotools bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo-r1 vala virtualx |
45 |
- |
46 |
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" |
47 |
-HOMEPAGE="https://github.com/ibus/ibus/wiki" |
48 |
- |
49 |
-LICENSE="LGPL-2.1" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
52 |
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" |
53 |
-REQUIRED_USE=" |
54 |
- || ( gtk gtk3 X ) |
55 |
- deprecated? ( python ) |
56 |
- vala? ( introspection ) |
57 |
- python? ( |
58 |
- ${PYTHON_REQUIRED_USE} |
59 |
- || ( deprecated ( gtk3 introspection ) ) )" #342903 |
60 |
- |
61 |
-[[ -n ${UPSTREAM_VER} ]] && \ |
62 |
- UPSTRAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
63 |
- |
64 |
-SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz |
65 |
- ${UPSTRAM_PATCHSET_URI}" |
66 |
- |
67 |
-COMMON_DEPEND=" |
68 |
- >=dev-libs/glib-2.26:2 |
69 |
- gnome-base/librsvg:2 |
70 |
- sys-apps/dbus[X?] |
71 |
- app-text/iso-codes |
72 |
- >=gnome-base/dconf-0.13.4 |
73 |
- x11-libs/libnotify |
74 |
- gconf? ( >=gnome-base/gconf-2.12:2 ) |
75 |
- gtk? ( x11-libs/gtk+:2 ) |
76 |
- gtk3? ( x11-libs/gtk+:3 ) |
77 |
- python? ( ${PYTHON_DEPS} ) |
78 |
- X? ( |
79 |
- x11-libs/libX11 |
80 |
- x11-libs/gtk+:2 ) |
81 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) |
82 |
- nls? ( virtual/libintl ) |
83 |
- wayland? ( dev-libs/wayland )" |
84 |
-RDEPEND="${COMMON_DEPEND} |
85 |
- x11-apps/setxkbmap |
86 |
- python? ( |
87 |
- dev-python/pyxdg |
88 |
- deprecated? ( |
89 |
- >=dev-python/dbus-python-0.83 |
90 |
- dev-python/pygobject:2 |
91 |
- dev-python/pygtk:2 ) |
92 |
- gtk3? ( |
93 |
- dev-python/pygobject:3 |
94 |
- x11-libs/gdk-pixbuf:2[introspection] |
95 |
- x11-libs/pango[introspection] |
96 |
- x11-libs/gtk+:3[introspection] ) |
97 |
- )" |
98 |
-DEPEND="${COMMON_DEPEND} |
99 |
- >=dev-lang/perl-5.8.1 |
100 |
- dev-util/gtk-doc-am |
101 |
- dev-util/intltool |
102 |
- virtual/pkgconfig |
103 |
- nls? ( >=sys-devel/gettext-0.16.1 ) |
104 |
- vala? ( $(vala_depend) )" |
105 |
- |
106 |
-# stress test in bus/ fails |
107 |
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed |
108 |
-RESTRICT="test" |
109 |
- |
110 |
-DOCS="AUTHORS ChangeLog NEWS README" |
111 |
- |
112 |
-DISABLE_AUTOFORMATTING="yes" |
113 |
-DOC_CONTENTS="To use ibus, you should: |
114 |
-1. Get input engines from sunrise overlay. |
115 |
-Run \"emerge -s ibus-\" in your favorite terminal |
116 |
-for a list of packages we already have. |
117 |
- |
118 |
-2. Setup ibus: |
119 |
-$ ibus-setup |
120 |
- |
121 |
-3. Set the following in your user startup scripts |
122 |
-such as .xinitrc, .xsession or .xprofile: |
123 |
- |
124 |
-export XMODIFIERS=\"@im=ibus\" |
125 |
-export GTK_IM_MODULE=\"ibus\" |
126 |
-export QT_IM_MODULE=\"xim\" |
127 |
-ibus-daemon -d -x |
128 |
-" |
129 |
- |
130 |
-pkg_setup() { |
131 |
- use python && python-single-r1_pkg_setup |
132 |
-} |
133 |
- |
134 |
-src_prepare() { |
135 |
- # Upstream's patchset |
136 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
137 |
- EPATCH_SUFFIX="patch" \ |
138 |
- EPATCH_FORCE="yes" \ |
139 |
- EPATCH_OPTS="-p1" \ |
140 |
- epatch "${WORKDIR}"/patches-upstream |
141 |
- fi |
142 |
- |
143 |
- # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations |
144 |
- sed -e 's/dconf update/:/' \ |
145 |
- -i data/dconf/Makefile.{am,in} || die |
146 |
- use vala && vala_src_prepare |
147 |
- |
148 |
- eautoreconf |
149 |
-} |
150 |
- |
151 |
-src_configure() { |
152 |
- local python_conf |
153 |
- if use python; then |
154 |
- python_conf="PYTHON=${PYTHON} |
155 |
- $(use_enable deprecated python-library) |
156 |
- $(use_enable gtk3 setup)" |
157 |
- else |
158 |
- python_conf="--disable-python-library --disable-setup" |
159 |
- fi |
160 |
- econf \ |
161 |
- --enable-dconf \ |
162 |
- --disable-emoji-dict \ |
163 |
- $(use_enable introspection) \ |
164 |
- $(use_enable gconf) \ |
165 |
- $(use_enable gtk gtk2) \ |
166 |
- $(use_enable gtk xim) \ |
167 |
- $(use_enable gtk3) \ |
168 |
- $(use_enable gtk3 ui) \ |
169 |
- $(use_enable nls) \ |
170 |
- $(use_enable test tests) \ |
171 |
- $(use_enable X xim) \ |
172 |
- $(use_enable vala) \ |
173 |
- $(use_enable wayland) \ |
174 |
- ${python_conf} |
175 |
-} |
176 |
- |
177 |
-src_test() { |
178 |
- unset DBUS_SESSION_BUS_ADDRESS |
179 |
- Xemake check || die |
180 |
-} |
181 |
- |
182 |
-src_install() { |
183 |
- default |
184 |
- |
185 |
- prune_libtool_files --all |
186 |
- |
187 |
- mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}" |
188 |
- rm -rf "${ED}"/usr/share/bash-completion || die |
189 |
- newbashcomp "${T}"/ibus.bash ${PN} |
190 |
- insinto /etc/X11/xinit/xinput.d |
191 |
- newins xinput-ibus ibus.conf |
192 |
- |
193 |
- keepdir /usr/share/ibus/{engine,icons} #289547 |
194 |
- |
195 |
- use deprecated && python_optimize |
196 |
- use python && use gtk3 && python_optimize |
197 |
- |
198 |
- readme.gentoo_create_doc |
199 |
-} |
200 |
- |
201 |
-pkg_preinst() { |
202 |
- use gconf && gnome2_gconf_savelist |
203 |
- gnome2_schemas_savelist |
204 |
- gnome2_icon_savelist |
205 |
-} |
206 |
- |
207 |
-pkg_postinst() { |
208 |
- use gconf && gnome2_gconf_install |
209 |
- use gtk && gnome2_query_immodules_gtk2 |
210 |
- use gtk3 && gnome2_query_immodules_gtk3 |
211 |
- gnome2_schemas_update |
212 |
- gnome2_icon_cache_update |
213 |
- readme.gentoo_print_elog |
214 |
-} |
215 |
- |
216 |
-pkg_postrm() { |
217 |
- use gtk && gnome2_query_immodules_gtk2 |
218 |
- use gtk3 && gnome2_query_immodules_gtk3 |
219 |
- use gconf && gnome2_schemas_update |
220 |
- gnome2_icon_cache_update |
221 |
-} |
222 |
|
223 |
diff --git a/app-i18n/ibus/ibus-1.5.5.ebuild b/app-i18n/ibus/ibus-1.5.5.ebuild |
224 |
deleted file mode 100644 |
225 |
index 8ad305083ac..00000000000 |
226 |
--- a/app-i18n/ibus/ibus-1.5.5.ebuild |
227 |
+++ /dev/null |
228 |
@@ -1,173 +0,0 @@ |
229 |
-# Copyright 1999-2016 Gentoo Foundation |
230 |
-# Distributed under the terms of the GNU General Public License v2 |
231 |
- |
232 |
-EAPI=5 |
233 |
-PYTHON_COMPAT=( python2_7 ) |
234 |
-VALA_MIN_API_VERSION="0.20" |
235 |
-VALA_USE_DEPEND="vapigen" |
236 |
-# Vapigen is needed for the vala binding |
237 |
-# Valac is needed when building from git for the engine |
238 |
- |
239 |
-inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 readme.gentoo vala virtualx |
240 |
- |
241 |
-DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" |
242 |
-HOMEPAGE="https://github.com/ibus/ibus/wiki" |
243 |
-SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz" |
244 |
- |
245 |
-LICENSE="LGPL-2.1" |
246 |
-SLOT="0" |
247 |
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
248 |
-IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X" |
249 |
-REQUIRED_USE="|| ( gtk gtk3 X ) |
250 |
- deprecated? ( python ) |
251 |
- python? ( |
252 |
- ${PYTHON_REQUIRED_USE} |
253 |
- || ( deprecated ( gtk3 introspection ) ) )" #342903 |
254 |
- |
255 |
-COMMON_DEPEND=" |
256 |
- >=dev-libs/glib-2.26:2 |
257 |
- gnome-base/librsvg:2 |
258 |
- sys-apps/dbus[X?] |
259 |
- app-text/iso-codes |
260 |
- >=gnome-base/dconf-0.13.4 |
261 |
- x11-libs/libnotify |
262 |
- |
263 |
- gconf? ( >=gnome-base/gconf-2.12:2 ) |
264 |
- gtk? ( x11-libs/gtk+:2 ) |
265 |
- gtk3? ( x11-libs/gtk+:3 ) |
266 |
- python? ( ${PYTHON_DEPS} ) |
267 |
- X? ( |
268 |
- x11-libs/libX11 |
269 |
- x11-libs/gtk+:2 ) |
270 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) |
271 |
- nls? ( virtual/libintl ) |
272 |
- wayland? ( dev-libs/wayland )" |
273 |
-RDEPEND="${COMMON_DEPEND} |
274 |
- x11-apps/setxkbmap |
275 |
- python? ( |
276 |
- dev-python/pyxdg |
277 |
- deprecated? ( |
278 |
- >=dev-python/dbus-python-0.83 |
279 |
- dev-python/pygobject:2 |
280 |
- dev-python/pygtk:2 ) |
281 |
- gtk3? ( |
282 |
- dev-python/pygobject:3 |
283 |
- x11-libs/gdk-pixbuf:2[introspection] |
284 |
- x11-libs/pango[introspection] |
285 |
- x11-libs/gtk+:3[introspection] ) |
286 |
- )" |
287 |
-DEPEND="${COMMON_DEPEND} |
288 |
- >=dev-lang/perl-5.8.1 |
289 |
- dev-util/gtk-doc-am |
290 |
- dev-util/intltool |
291 |
- virtual/pkgconfig |
292 |
- nls? ( >=sys-devel/gettext-0.16.1 ) |
293 |
- vala? ( $(vala_depend) ) |
294 |
- gnome-base/gconf" |
295 |
- |
296 |
-# stress test in bus/ fails |
297 |
-# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed |
298 |
-RESTRICT="test" |
299 |
- |
300 |
-DOCS="AUTHORS ChangeLog NEWS README" |
301 |
- |
302 |
-DISABLE_AUTOFORMATTING="yes" |
303 |
-DOC_CONTENTS="To use ibus, you should: |
304 |
-1. Get input engines from sunrise overlay. |
305 |
-Run \"emerge -s ibus-\" in your favorite terminal |
306 |
-for a list of packages we already have. |
307 |
- |
308 |
-2. Setup ibus: |
309 |
-$ ibus-setup |
310 |
- |
311 |
-3. Set the following in your user startup scripts |
312 |
-such as .xinitrc, .xsession or .xprofile: |
313 |
- |
314 |
-export XMODIFIERS=\"@im=ibus\" |
315 |
-export GTK_IM_MODULE=\"ibus\" |
316 |
-export QT_IM_MODULE=\"xim\" |
317 |
-ibus-daemon -d -x |
318 |
-" |
319 |
- |
320 |
-pkg_setup() { |
321 |
- use python && python-single-r1_pkg_setup |
322 |
-} |
323 |
- |
324 |
-src_prepare() { |
325 |
- # We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations |
326 |
- sed -e 's/dconf update/$(NULL)/' \ |
327 |
- -i data/dconf/Makefile.{am,in} || die |
328 |
- use vala && vala_src_prepare |
329 |
- cp "${S}"/client/gtk2/ibusimcontext.c "${S}"/client/gtk3/ibusimcontext.c || die |
330 |
-} |
331 |
- |
332 |
-src_configure() { |
333 |
- local python_conf |
334 |
- if use python; then |
335 |
- python_conf="PYTHON=${PYTHON} |
336 |
- $(use_enable deprecated python-library) |
337 |
- $(use_enable gtk3 setup)" |
338 |
- else |
339 |
- python_conf="--disable-python-library --disable-setup" |
340 |
- fi |
341 |
- econf \ |
342 |
- --enable-dconf \ |
343 |
- $(use_enable introspection) \ |
344 |
- $(use_enable gconf) \ |
345 |
- $(use_enable gtk gtk2) \ |
346 |
- $(use_enable gtk xim) \ |
347 |
- $(use_enable gtk3) \ |
348 |
- $(use_enable gtk3 ui) \ |
349 |
- $(use_enable nls) \ |
350 |
- $(use_enable test tests) \ |
351 |
- $(use_enable X xim) \ |
352 |
- $(use_enable vala) \ |
353 |
- $(use_enable wayland) \ |
354 |
- ${python_conf} |
355 |
-} |
356 |
- |
357 |
-src_test() { |
358 |
- unset DBUS_SESSION_BUS_ADDRESS |
359 |
- Xemake check || die |
360 |
-} |
361 |
- |
362 |
-src_install() { |
363 |
- default |
364 |
- |
365 |
- prune_libtool_files --all |
366 |
- |
367 |
- mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}" |
368 |
- rm -rf "${ED}"/usr/share/bash-completion || die |
369 |
- newbashcomp "${T}"/ibus.bash ${PN} |
370 |
- insinto /etc/X11/xinit/xinput.d |
371 |
- newins xinput-ibus ibus.conf |
372 |
- |
373 |
- keepdir /usr/share/ibus/{engine,icons} #289547 |
374 |
- |
375 |
- use deprecated && python_optimize |
376 |
- use python && use gtk3 && python_optimize |
377 |
- |
378 |
- readme.gentoo_create_doc |
379 |
-} |
380 |
- |
381 |
-pkg_preinst() { |
382 |
- use gconf && gnome2_gconf_savelist |
383 |
- gnome2_schemas_savelist |
384 |
- gnome2_icon_savelist |
385 |
-} |
386 |
- |
387 |
-pkg_postinst() { |
388 |
- use gconf && gnome2_gconf_install |
389 |
- use gtk && gnome2_query_immodules_gtk2 |
390 |
- use gtk3 && gnome2_query_immodules_gtk3 |
391 |
- gnome2_schemas_update |
392 |
- gnome2_icon_cache_update |
393 |
- readme.gentoo_print_elog |
394 |
-} |
395 |
- |
396 |
-pkg_postrm() { |
397 |
- use gtk && gnome2_query_immodules_gtk2 |
398 |
- use gtk3 && gnome2_query_immodules_gtk3 |
399 |
- use gconf && gnome2_schemas_update |
400 |
- gnome2_icon_cache_update |
401 |
-} |