Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-i18n/uim: uim-1.5.6-r4.ebuild ChangeLog uim-1.4.2.ebuild uim-1.5.7.ebuild uim-1.5.6-r1.ebuild
Date: Mon, 04 Jan 2010 03:58:22
Message-Id: E1NRe5D-0007jZ-GK@stork.gentoo.org
1 yngwin 10/01/04 03:58:19
2
3 Modified: uim-1.5.6-r4.ebuild ChangeLog uim-1.4.2.ebuild
4 uim-1.5.7.ebuild uim-1.5.6-r1.ebuild
5 Log:
6 Drop qt3 support, bug 283429
7 (Portage version: 2.2_rc61/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 app-i18n/uim/uim-1.5.6-r4.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.6-r4.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.6-r4.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.6-r4.ebuild?r1=1.2&r2=1.3
15
16 Index: uim-1.5.6-r4.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r4.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- uim-1.5.6-r4.ebuild 27 Nov 2009 16:15:55 -0000 1.2
23 +++ uim-1.5.6-r4.ebuild 4 Jan 2010 03:58:18 -0000 1.3
24 @@ -1,9 +1,9 @@
25 -# Copyright 1999-2009 Gentoo Foundation
26 +# Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r4.ebuild,v 1.2 2009/11/27 16:15:55 matsuu Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r4.ebuild,v 1.3 2010/01/04 03:58:18 yngwin Exp $
30
31 EAPI="2"
32 -inherit autotools eutils qt3 multilib elisp-common flag-o-matic
33 +inherit autotools eutils multilib elisp-common flag-o-matic
34
35 DESCRIPTION="Simple, secure and flexible input method library"
36 HOMEPAGE="http://code.google.com/p/uim/"
37 @@ -12,7 +12,7 @@
38 LICENSE="BSD GPL-2 LGPL-2.1"
39 SLOT="0"
40 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
41 -IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
42 +IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
43
44 RDEPEND="X? (
45 x11-libs/libX11
46 @@ -38,7 +38,6 @@
47 ncurses? ( sys-libs/ncurses )
48 nls? ( virtual/libintl )
49 prime? ( app-i18n/prime )
50 - qt3? ( || ( >=x11-libs/qt-3.2.0:3[immqt-bc] >=x11-libs/qt-3.2.0:3[immqt] ) )
51 qt4? ( x11-libs/qt-gui:4[qt3support] )
52 !app-i18n/uim-svn
53 !<app-i18n/prime-0.9.4"
54 @@ -102,11 +101,7 @@
55 myconf="${myconf} --disable-dict"
56 fi
57
58 - if use qt3 ; then
59 - append-flags -DQT_THREAD_SUPPORT
60 - fi
61 -
62 - if use gtk || use qt3 ; then
63 + if use gtk; then
64 myconf="${myconf} --enable-pref"
65 else
66 myconf="${myconf} --disable-pref"
67 @@ -139,11 +134,11 @@
68 $(use_enable ncurses fep) \
69 $(use_enable nls) \
70 $(use_with prime) \
71 - $(use_with qt3 qt) \
72 - $(use_with qt3 qt-immodule) \
73 + --without-qt \
74 + --without-qt-immodule \
75 $(use_with qt4 qt4-immodule) \
76 $(use_with xft) \
77 - ${myconf} || die "econf failed"
78 + ${myconf}
79 }
80
81 src_compile() {
82
83
84
85 1.215 app-i18n/uim/ChangeLog
86
87 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.215&view=markup
88 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.215&content-type=text/plain
89 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/ChangeLog?r1=1.214&r2=1.215
90
91 Index: ChangeLog
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v
94 retrieving revision 1.214
95 retrieving revision 1.215
96 diff -u -r1.214 -r1.215
97 --- ChangeLog 31 Dec 2009 15:54:40 -0000 1.214
98 +++ ChangeLog 4 Jan 2010 03:58:18 -0000 1.215
99 @@ -1,6 +1,10 @@
100 # ChangeLog for app-i18n/uim
101 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
102 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.214 2009/12/31 15:54:40 mr_bones_ Exp $
103 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
104 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.215 2010/01/04 03:58:18 yngwin Exp $
105 +
106 + 04 Jan 2010; Ben de Groot <yngwin@g.o> uim-1.4.2.ebuild,
107 + uim-1.5.6-r1.ebuild, uim-1.5.6-r4.ebuild, uim-1.5.7.ebuild:
108 + Drop qt3 support, bug 283429
109
110 31 Dec 2009; Michael Sterrett <mr_bones_@g.o> +uim-1.4.2.ebuild:
111 resurrect uim-1.4.2.ebuild which is still in use
112
113
114
115 1.13 app-i18n/uim/uim-1.4.2.ebuild
116
117 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild?rev=1.13&view=markup
118 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild?rev=1.13&content-type=text/plain
119 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild?r1=1.12&r2=1.13
120
121 Index: uim-1.4.2.ebuild
122 ===================================================================
123 RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v
124 retrieving revision 1.12
125 retrieving revision 1.13
126 diff -u -r1.12 -r1.13
127 --- uim-1.4.2.ebuild 31 Dec 2009 15:54:40 -0000 1.12
128 +++ uim-1.4.2.ebuild 4 Jan 2010 03:58:18 -0000 1.13
129 @@ -1,9 +1,9 @@
130 -# Copyright 1999-2009 Gentoo Foundation
131 +# Copyright 1999-2010 Gentoo Foundation
132 # Distributed under the terms of the GNU General Public License v2
133 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.12 2009/12/31 15:54:40 mr_bones_ Exp $
134 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.13 2010/01/04 03:58:18 yngwin Exp $
135
136 EAPI=1
137 -inherit eutils qt3 multilib elisp-common flag-o-matic
138 +inherit eutils multilib elisp-common flag-o-matic
139
140 DESCRIPTION="Simple, secure and flexible input method library"
141 HOMEPAGE="http://code.google.com/p/uim/"
142 @@ -32,7 +32,6 @@
143 ncurses? ( sys-libs/ncurses )
144 nls? ( virtual/libintl )
145 prime? ( app-i18n/prime )
146 - qt3? ( x11-libs/qt:3 )
147 !app-i18n/uim-svn
148 !<app-i18n/prime-0.9.4"
149
150 @@ -52,12 +51,6 @@
151 SITEFILE=50${PN}-gentoo.el
152
153 pkg_setup() {
154 - if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
155 - eerror "To support qt3 in this package is required to have"
156 - eerror "=x11-libs/qt-3* compiled with immqt-bc(recommended) or immqt USE flag."
157 - die "Please reemerge =x11-libs/qt-3* with USE=\"immqt-bc\" or USE=\"immqt\"."
158 -
159 - fi
160 # An arch specific config directory is used on multilib systems
161 has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
162 GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
163 @@ -72,11 +65,7 @@
164 myconf="${myconf} --disable-dict"
165 fi
166
167 - if use qt3 ; then
168 - append-flags -DQT_THREAD_SUPPORT
169 - fi
170 -
171 - if use gtk || use qt3 ; then
172 + if use gtk; then
173 myconf="${myconf} --enable-pref"
174 else
175 myconf="${myconf} --disable-pref"
176 @@ -95,9 +84,9 @@
177 $(use_with m17n-lib m17nlib) \
178 $(use_enable ncurses fep) \
179 $(use_enable nls) \
180 - $(use_with qt3 qt) \
181 - $(use_with qt3 qt-immodule) \
182 - ${myconf} || die "econf failed"
183 + --without-qt \
184 + --without-qt-immodule \
185 + ${myconf}
186 emake -j1 || die "emake failed"
187
188 if use emacs; then
189 @@ -126,7 +115,6 @@
190 elog "New input method switcher has been introduced. You need to set"
191 elog
192 elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
193 - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
194 elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
195 elog
196 elog "If you would like to use uim-anthy as default input method, put"
197 @@ -134,7 +122,6 @@
198 elog "to your ~/.uim."
199 elog
200 elog "All input methods can be found by running uim-im-switcher-gtk"
201 - elog "or uim-im-switcher-qt."
202 elog
203 elog "If you upgrade from a version of uim older than 1.4.0,"
204 elog "you should run revdep-rebuild."
205
206
207
208 1.6 app-i18n/uim/uim-1.5.7.ebuild
209
210 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild?rev=1.6&view=markup
211 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild?rev=1.6&content-type=text/plain
212 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild?r1=1.5&r2=1.6
213
214 Index: uim-1.5.7.ebuild
215 ===================================================================
216 RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild,v
217 retrieving revision 1.5
218 retrieving revision 1.6
219 diff -u -r1.5 -r1.6
220 --- uim-1.5.7.ebuild 31 Dec 2009 14:07:15 -0000 1.5
221 +++ uim-1.5.7.ebuild 4 Jan 2010 03:58:18 -0000 1.6
222 @@ -1,9 +1,9 @@
223 -# Copyright 1999-2009 Gentoo Foundation
224 +# Copyright 1999-2010 Gentoo Foundation
225 # Distributed under the terms of the GNU General Public License v2
226 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild,v 1.5 2009/12/31 14:07:15 ranger Exp $
227 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.7.ebuild,v 1.6 2010/01/04 03:58:18 yngwin Exp $
228
229 EAPI="2"
230 -inherit autotools eutils qt3 multilib elisp-common flag-o-matic
231 +inherit autotools eutils multilib elisp-common flag-o-matic
232
233 DESCRIPTION="Simple, secure and flexible input method library"
234 HOMEPAGE="http://code.google.com/p/uim/"
235 @@ -12,7 +12,7 @@
236 LICENSE="BSD GPL-2 LGPL-2.1"
237 SLOT="0"
238 KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 ~sparc ~x86"
239 -IUSE="+anthy canna eb emacs gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
240 +IUSE="+anthy canna eb emacs gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
241
242 RDEPEND="X? (
243 x11-libs/libX11
244 @@ -39,7 +39,6 @@
245 ncurses? ( sys-libs/ncurses )
246 nls? ( virtual/libintl )
247 prime? ( app-i18n/prime )
248 - qt3? ( || ( >=x11-libs/qt-3.2.0:3[immqt-bc] >=x11-libs/qt-3.2.0:3[immqt] ) )
249 qt4? ( x11-libs/qt-gui:4[qt3support] )
250 !app-i18n/uim-svn
251 !<app-i18n/prime-0.9.4"
252 @@ -102,11 +101,7 @@
253 myconf="${myconf} --disable-dict"
254 fi
255
256 - if use qt3 ; then
257 - append-flags -DQT_THREAD_SUPPORT
258 - fi
259 -
260 - if use gtk || use qt3 || use qt4 ; then
261 + if use gtk || use qt4 ; then
262 myconf="${myconf} --enable-pref"
263 else
264 myconf="${myconf} --disable-pref"
265 @@ -140,12 +135,12 @@
266 $(use_enable ncurses fep) \
267 $(use_enable nls) \
268 $(use_with prime) \
269 - $(use_with qt3 qt) \
270 - $(use_with qt3 qt-immodule) \
271 + --without-qt \
272 + --without-qt-immodule \
273 $(use_with qt4 qt4) \
274 $(use_with qt4 qt4-immodule) \
275 $(use_with xft) \
276 - ${myconf} || die "econf failed"
277 + ${myconf}
278 }
279
280 src_compile() {
281 @@ -184,7 +179,7 @@
282 elog "to your ~/.uim."
283 elog
284 elog "All input methods can be found by running uim-im-switcher-gtk, "
285 - elog "uim-im-switcher-qt or uim-im-switcher-qt4."
286 + elog "or uim-im-switcher-qt4."
287 elog
288 elog "If you upgrade from a version of uim older than 1.4.0,"
289 elog "you should run revdep-rebuild."
290
291
292
293 1.11 app-i18n/uim/uim-1.5.6-r1.ebuild
294
295 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild?rev=1.11&view=markup
296 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild?rev=1.11&content-type=text/plain
297 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild?r1=1.10&r2=1.11
298
299 Index: uim-1.5.6-r1.ebuild
300 ===================================================================
301 RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild,v
302 retrieving revision 1.10
303 retrieving revision 1.11
304 diff -u -r1.10 -r1.11
305 --- uim-1.5.6-r1.ebuild 27 Nov 2009 16:15:55 -0000 1.10
306 +++ uim-1.5.6-r1.ebuild 4 Jan 2010 03:58:18 -0000 1.11
307 @@ -1,9 +1,9 @@
308 -# Copyright 1999-2009 Gentoo Foundation
309 +# Copyright 1999-2010 Gentoo Foundation
310 # Distributed under the terms of the GNU General Public License v2
311 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild,v 1.10 2009/11/27 16:15:55 matsuu Exp $
312 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.6-r1.ebuild,v 1.11 2010/01/04 03:58:18 yngwin Exp $
313
314 EAPI="2"
315 -inherit autotools eutils qt3 multilib elisp-common flag-o-matic
316 +inherit autotools eutils multilib elisp-common flag-o-matic
317
318 DESCRIPTION="Simple, secure and flexible input method library"
319 HOMEPAGE="http://code.google.com/p/uim/"
320 @@ -12,7 +12,7 @@
321 LICENSE="BSD GPL-2 LGPL-2.1"
322 SLOT="0"
323 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
324 -IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt3 qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
325 +IUSE="+anthy canna eb emacs gnome gtk libedit libnotify m17n-lib ncurses nls prime qt4 unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
326
327 RDEPEND="X? (
328 x11-libs/libX11
329 @@ -38,7 +38,6 @@
330 ncurses? ( sys-libs/ncurses )
331 nls? ( virtual/libintl )
332 prime? ( app-i18n/prime )
333 - qt3? ( || ( >=x11-libs/qt-3.2.0:3[immqt-bc] >=x11-libs/qt-3.2.0:3[immqt] ) )
334 qt4? ( x11-libs/qt-gui:4[qt3support] )
335 !app-i18n/uim-svn
336 !<app-i18n/prime-0.9.4"
337 @@ -99,11 +98,7 @@
338 myconf="${myconf} --disable-dict"
339 fi
340
341 - if use qt3 ; then
342 - append-flags -DQT_THREAD_SUPPORT
343 - fi
344 -
345 - if use gtk || use qt3 ; then
346 + if use gtk; then
347 myconf="${myconf} --enable-pref"
348 else
349 myconf="${myconf} --disable-pref"
350 @@ -136,11 +131,11 @@
351 $(use_enable ncurses fep) \
352 $(use_enable nls) \
353 $(use_with prime) \
354 - $(use_with qt3 qt) \
355 - $(use_with qt3 qt-immodule) \
356 + --without-qt \
357 + --without-qt-immodule \
358 $(use_with qt4 qt4-immodule) \
359 $(use_with xft) \
360 - ${myconf} || die "econf failed"
361 + ${myconf}
362 }
363
364 src_compile() {
Report Message
Find on MARC Find on Google Groups