Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus/
Date: Mon, 25 Feb 2019 12:53:53
Message-Id: 1551099192.e8ee7ef76c120001316160854840c92a7d0980ea.hattya@gentoo
1 commit: e8ee7ef76c120001316160854840c92a7d0980ea
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 25 12:53:12 2019 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 25 12:53:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8ee7ef7
7
8 app-i18n/ibus: drop old
9
10 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 app-i18n/ibus/Manifest | 2 -
14 app-i18n/ibus/ibus-1.5.12.ebuild | 164 -----------------------------------
15 app-i18n/ibus/ibus-1.5.16.ebuild | 180 ---------------------------------------
16 3 files changed, 346 deletions(-)
17
18 diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
19 index 8d1ff04e919..5e89f5ede99 100644
20 --- a/app-i18n/ibus/Manifest
21 +++ b/app-i18n/ibus/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81
24 -DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237
25 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
26 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
27
28 diff --git a/app-i18n/ibus/ibus-1.5.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild
29 deleted file mode 100644
30 index 5e7791469af..00000000000
31 --- a/app-i18n/ibus/ibus-1.5.12.ebuild
32 +++ /dev/null
33 @@ -1,164 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="6"
38 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
39 -VALA_USE_DEPEND="vapigen"
40 -
41 -inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
42 -
43 -DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
44 -HOMEPAGE="https://github.com/ibus/ibus/wiki"
45 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
46 -
47 -LICENSE="LGPL-2.1"
48 -SLOT="0"
49 -KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
50 -IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
51 -REQUIRED_USE="gtk2? ( gtk )
52 - libnotify? ( gtk )
53 - python? (
54 - ${PYTHON_REQUIRED_USE}
55 - introspection
56 - )
57 - test? ( gtk )
58 - vala? ( introspection )"
59 -
60 -CDEPEND="app-text/iso-codes
61 - dev-libs/glib:2
62 - gnome-base/dconf
63 - gnome-base/librsvg:2
64 - sys-apps/dbus[X?]
65 - X? (
66 - x11-libs/libX11
67 - !gtk? ( x11-libs/gtk+:2 )
68 - )
69 - gconf? ( gnome-base/gconf:2 )
70 - gtk? (
71 - x11-libs/gtk+:3
72 - x11-libs/libX11
73 - x11-libs/libXi
74 - gtk2? ( x11-libs/gtk+:2 )
75 - )
76 - introspection? ( dev-libs/gobject-introspection )
77 - libnotify? ( x11-libs/libnotify )
78 - nls? ( virtual/libintl )
79 - python? (
80 - ${PYTHON_DEPS}
81 - dev-python/pygobject:3[${PYTHON_USEDEP}]
82 - )
83 - wayland? (
84 - dev-libs/wayland
85 - x11-libs/libxkbcommon
86 - )"
87 -RDEPEND="${CDEPEND}
88 - python? (
89 - gtk? (
90 - x11-libs/gtk+:3[introspection]
91 - )
92 - )"
93 -DEPEND="${CDEPEND}
94 - $(vala_depend)
95 - dev-util/intltool
96 - virtual/pkgconfig
97 - nls? ( sys-devel/gettext )"
98 -
99 -src_prepare() {
100 - vala_src_prepare --ignore-use
101 - if ! use libnotify; then
102 - touch ui/gtk3/panel.vala
103 - fi
104 - # for multiple Python implementations
105 - sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
106 - # fix for parallel install
107 - sed -i \
108 - -e "/^py2_compile/,/^$/d" \
109 - -e "/^install-data-hook/,/^$/d" \
110 - bindings/pygobject/Makefile.am
111 - # require user interaction
112 - sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
113 - # fixed in 1.5.14+
114 - sed -i "/def test_keymap/a\ self.skipTest('')" bindings/pygobject/test-override-ibus.py
115 - sed -i "/[[:space:]]test-stress[[:space:]]/d" bus/Makefile.am
116 - sed -i "/^TESTS += ibus-engine-switch/d" src/tests/Makefile.am
117 -
118 - sed -i "/^bash_completion/d" tools/Makefile.am
119 -
120 - default
121 - eautoreconf
122 - xdg_environment_reset
123 -}
124 -
125 -src_configure() {
126 - local python_conf=()
127 - if use python; then
128 - python_setup
129 - python_conf+=(
130 - $(use_enable gtk setup)
131 - --with-python=${EPYTHON}
132 - )
133 - else
134 - python_conf+=( --disable-setup )
135 - fi
136 -
137 - econf \
138 - $(use_enable X xim) \
139 - $(use_enable gconf) \
140 - $(use_enable gtk gtk3) \
141 - $(use_enable gtk ui) \
142 - $(use_enable gtk2) \
143 - $(use_enable introspection) \
144 - $(use_enable libnotify) \
145 - $(use_enable nls) \
146 - $(use_enable test tests) \
147 - $(use_enable vala) \
148 - $(use_enable wayland) \
149 - "${python_conf[@]}"
150 -}
151 -
152 -src_test() {
153 - unset DBUS_SESSION_BUS_ADDRESS
154 - virtx emake -j1 check
155 -}
156 -
157 -src_install() {
158 - default
159 - find "${ED}" -name '*.la' -delete || die
160 -
161 - if use python; then
162 - python_install() {
163 - emake -C bindings/pygobject \
164 - pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
165 - DESTDIR="${D}" \
166 - install
167 - }
168 - python_foreach_impl python_install
169 - fi
170 -
171 - keepdir /usr/share/ibus/engine
172 -
173 - newbashcomp tools/${PN}.bash ${PN}
174 -
175 - insinto /etc/X11/xinit/xinput.d
176 - newins xinput-${PN} ${PN}.conf
177 -}
178 -
179 -pkg_preinst() {
180 - use gconf && gnome2_gconf_savelist
181 -}
182 -
183 -pkg_postinst() {
184 - use gconf && gnome2_gconf_install
185 - use gtk && gnome2_query_immodules_gtk3
186 - use gtk2 && gnome2_query_immodules_gtk2
187 - gnome2_icon_cache_update
188 - gnome2_schemas_update
189 - dconf update
190 -}
191 -
192 -pkg_postrm() {
193 - use gtk && gnome2_query_immodules_gtk3
194 - use gtk2 && gnome2_query_immodules_gtk2
195 - gnome2_icon_cache_update
196 - gnome2_schemas_update
197 -}
198
199 diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild
200 deleted file mode 100644
201 index e4ffeb871fa..00000000000
202 --- a/app-i18n/ibus/ibus-1.5.16.ebuild
203 +++ /dev/null
204 @@ -1,180 +0,0 @@
205 -# Copyright 1999-2018 Gentoo Foundation
206 -# Distributed under the terms of the GNU General Public License v2
207 -
208 -EAPI="6"
209 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
210 -VALA_USE_DEPEND="vapigen"
211 -
212 -inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
213 -
214 -DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
215 -HOMEPAGE="https://github.com/ibus/ibus/wiki"
216 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
217 -
218 -LICENSE="LGPL-2.1"
219 -SLOT="0"
220 -KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
221 -IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
222 -REQUIRED_USE="emoji? ( gtk )
223 - gtk2? ( gtk )
224 - kde? ( gtk )
225 - libnotify? ( gtk )
226 - python? (
227 - ${PYTHON_REQUIRED_USE}
228 - introspection
229 - )
230 - test? ( gtk )
231 - vala? ( introspection )"
232 -
233 -CDEPEND="app-text/iso-codes
234 - dev-libs/glib:2
235 - gnome-base/dconf
236 - gnome-base/librsvg:2
237 - sys-apps/dbus[X?]
238 - X? (
239 - x11-libs/libX11
240 - !gtk? ( x11-libs/gtk+:2 )
241 - )
242 - gconf? ( gnome-base/gconf:2 )
243 - gtk? (
244 - x11-libs/gtk+:3
245 - x11-libs/libX11
246 - x11-libs/libXi
247 - gtk2? ( x11-libs/gtk+:2 )
248 - )
249 - introspection? ( dev-libs/gobject-introspection )
250 - kde? ( dev-qt/qtgui:5 )
251 - libnotify? ( x11-libs/libnotify )
252 - nls? ( virtual/libintl )
253 - python? (
254 - ${PYTHON_DEPS}
255 - dev-python/pygobject:3[${PYTHON_USEDEP}]
256 - )
257 - wayland? (
258 - dev-libs/wayland
259 - x11-libs/libxkbcommon
260 - )"
261 -RDEPEND="${CDEPEND}
262 - python? (
263 - gtk? (
264 - x11-libs/gtk+:3[introspection]
265 - )
266 - )"
267 -DEPEND="${CDEPEND}
268 - $(vala_depend)
269 - dev-util/intltool
270 - virtual/pkgconfig
271 - emoji? (
272 - app-i18n/unicode-cldr
273 - app-i18n/unicode-emoji
274 - )
275 - nls? ( sys-devel/gettext )"
276 -
277 -src_prepare() {
278 - vala_src_prepare --ignore-use
279 - if ! use emoji; then
280 - touch \
281 - tools/main.vala \
282 - ui/gtk3/panel.vala
283 - fi
284 - if ! use kde; then
285 - touch ui/gtk3/panel.vala
286 - fi
287 - if ! use libnotify; then
288 - touch ui/gtk3/panel.vala
289 - fi
290 - # for multiple Python implementations
291 - sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
292 - # fix for parallel install
293 - sed -i \
294 - -e "/^py2_compile/,/^$/d" \
295 - -e "/^install-data-hook/,/^$/d" \
296 - bindings/pygobject/Makefile.am
297 - # require user interaction
298 - sed -i "/^TESTS += ibus-compose/d" src/tests/Makefile.am
299 -
300 - sed -i "/^bash_completion/d" tools/Makefile.am
301 -
302 - default
303 - eautoreconf
304 - xdg_environment_reset
305 -}
306 -
307 -src_configure() {
308 - local unicodedir="${EPREFIX}"/usr/share/unicode
309 - local python_conf=()
310 - if use python; then
311 - python_setup
312 - python_conf+=(
313 - $(use_enable gtk setup)
314 - --with-python=${EPYTHON}
315 - )
316 - else
317 - python_conf+=( --disable-setup )
318 - fi
319 -
320 - econf \
321 - $(use_enable X xim) \
322 - $(use_enable emoji emoji-dict) \
323 - $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
324 - $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
325 - $(use_enable gconf) \
326 - $(use_enable gtk gtk3) \
327 - $(use_enable gtk ui) \
328 - $(use_enable gtk2) \
329 - $(use_enable introspection) \
330 - $(use_enable kde appindicator) \
331 - $(use_enable libnotify) \
332 - $(use_enable nls) \
333 - $(use_enable test tests) \
334 - $(use_enable vala) \
335 - $(use_enable wayland) \
336 - "${python_conf[@]}"
337 -}
338 -
339 -src_test() {
340 - unset DBUS_SESSION_BUS_ADDRESS
341 - virtx emake -j1 check
342 -}
343 -
344 -src_install() {
345 - default
346 - find "${ED}" -name '*.la' -delete || die
347 -
348 - if use python; then
349 - python_install() {
350 - emake -C bindings/pygobject \
351 - pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
352 - DESTDIR="${D}" \
353 - install
354 - }
355 - python_foreach_impl python_install
356 - fi
357 -
358 - keepdir /usr/share/ibus/engine
359 -
360 - newbashcomp tools/${PN}.bash ${PN}
361 -
362 - insinto /etc/X11/xinit/xinput.d
363 - newins xinput-${PN} ${PN}.conf
364 -}
365 -
366 -pkg_preinst() {
367 - use gconf && gnome2_gconf_savelist
368 -}
369 -
370 -pkg_postinst() {
371 - use gconf && gnome2_gconf_install
372 - use gtk && gnome2_query_immodules_gtk3
373 - use gtk2 && gnome2_query_immodules_gtk2
374 - gnome2_icon_cache_update
375 - gnome2_schemas_update
376 - dconf update
377 -}
378 -
379 -pkg_postrm() {
380 - use gtk && gnome2_query_immodules_gtk3
381 - use gtk2 && gnome2_query_immodules_gtk2
382 - gnome2_icon_cache_update
383 - gnome2_schemas_update
384 -}