1 |
matsuu 08/05/01 16:34:57 |
2 |
|
3 |
Modified: ChangeLog uim-1.4.1.ebuild uim-1.4.2.ebuild |
4 |
Added: uim-1.5.0_beta2.ebuild |
5 |
Removed: uim-1.4.1-r1.ebuild |
6 |
Log: |
7 |
Version bumped. |
8 |
Fixed kde-base/kdelibs dependency, bug #213423. |
9 |
(Portage version: 2.1.5_rc6) |
10 |
|
11 |
Revision Changes Path |
12 |
1.173 app-i18n/uim/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.173&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.173&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/ChangeLog?r1=1.172&r2=1.173 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v |
21 |
retrieving revision 1.172 |
22 |
retrieving revision 1.173 |
23 |
diff -u -r1.172 -r1.173 |
24 |
--- ChangeLog 24 Feb 2008 16:28:09 -0000 1.172 |
25 |
+++ ChangeLog 1 May 2008 16:34:56 -0000 1.173 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for app-i18n/uim |
28 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.172 2008/02/24 16:28:09 matsuu Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.173 2008/05/01 16:34:56 matsuu Exp $ |
31 |
+ |
32 |
+*uim-1.5.0_beta2 (01 May 2008) |
33 |
+ |
34 |
+ 01 May 2008; MATSUU Takuto <matsuu@g.o> uim-1.4.1.ebuild, |
35 |
+ -uim-1.4.1-r1.ebuild, uim-1.4.2.ebuild, +uim-1.5.0_beta2.ebuild: |
36 |
+ Version bumped. |
37 |
+ Fixed kde-base/kdelibs dependency, bug #213423. |
38 |
|
39 |
*uim-1.4.2 (24 Feb 2008) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.13 app-i18n/uim/uim-1.4.1.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild?rev=1.13&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild?rev=1.13&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild?r1=1.12&r2=1.13 |
49 |
|
50 |
Index: uim-1.4.1.ebuild |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v |
53 |
retrieving revision 1.12 |
54 |
retrieving revision 1.13 |
55 |
diff -u -r1.12 -r1.13 |
56 |
--- uim-1.4.1.ebuild 10 Aug 2007 22:27:21 -0000 1.12 |
57 |
+++ uim-1.4.1.ebuild 1 May 2008 16:34:56 -0000 1.13 |
58 |
@@ -1,6 +1,6 @@ |
59 |
-# Copyright 1999-2007 Gentoo Foundation |
60 |
+# Copyright 1999-2008 Gentoo Foundation |
61 |
# Distributed under the terms of the GNU General Public License v2 |
62 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v 1.12 2007/08/10 22:27:21 matsuu Exp $ |
63 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.1.ebuild,v 1.13 2008/05/01 16:34:56 matsuu Exp $ |
64 |
|
65 |
inherit eutils qt3 multilib elisp-common flag-o-matic |
66 |
|
67 |
|
68 |
|
69 |
|
70 |
1.2 app-i18n/uim/uim-1.4.2.ebuild |
71 |
|
72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild?rev=1.2&view=markup |
73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild?rev=1.2&content-type=text/plain |
74 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild?r1=1.1&r2=1.2 |
75 |
|
76 |
Index: uim-1.4.2.ebuild |
77 |
=================================================================== |
78 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v |
79 |
retrieving revision 1.1 |
80 |
retrieving revision 1.2 |
81 |
diff -u -r1.1 -r1.2 |
82 |
--- uim-1.4.2.ebuild 24 Feb 2008 16:28:09 -0000 1.1 |
83 |
+++ uim-1.4.2.ebuild 1 May 2008 16:34:56 -0000 1.2 |
84 |
@@ -1,7 +1,8 @@ |
85 |
# Copyright 1999-2008 Gentoo Foundation |
86 |
# Distributed under the terms of the GNU General Public License v2 |
87 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.1 2008/02/24 16:28:09 matsuu Exp $ |
88 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.2.ebuild,v 1.2 2008/05/01 16:34:56 matsuu Exp $ |
89 |
|
90 |
+EAPI=1 |
91 |
inherit eutils qt3 multilib elisp-common flag-o-matic |
92 |
|
93 |
DESCRIPTION="Simple, secure and flexible input method library" |
94 |
@@ -26,7 +27,7 @@ |
95 |
emacs? ( virtual/emacs ) |
96 |
gnome? ( >=gnome-base/gnome-panel-2.14 ) |
97 |
gtk? ( >=x11-libs/gtk+-2.4 ) |
98 |
- kde? ( kde-base/kdelibs ) |
99 |
+ kde? ( kde-base/kdelibs:3.5 ) |
100 |
libedit? ( dev-libs/libedit ) |
101 |
m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) |
102 |
ncurses? ( sys-libs/ncurses ) |
103 |
|
104 |
|
105 |
|
106 |
1.1 app-i18n/uim/uim-1.5.0_beta2.ebuild |
107 |
|
108 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.0_beta2.ebuild?rev=1.1&view=markup |
109 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/uim/uim-1.5.0_beta2.ebuild?rev=1.1&content-type=text/plain |
110 |
|
111 |
Index: uim-1.5.0_beta2.ebuild |
112 |
=================================================================== |
113 |
# Copyright 1999-2008 Gentoo Foundation |
114 |
# Distributed under the terms of the GNU General Public License v2 |
115 |
# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.5.0_beta2.ebuild,v 1.1 2008/05/01 16:34:56 matsuu Exp $ |
116 |
|
117 |
EAPI=1 |
118 |
inherit eutils qt3 multilib elisp-common flag-o-matic |
119 |
|
120 |
MY_P="${P/_/-}" |
121 |
DESCRIPTION="Simple, secure and flexible input method library" |
122 |
HOMEPAGE="http://code.google.com/p/uim/" |
123 |
SRC_URI="http://uim.googlecode.com/files/${MY_P}.tar.bz2" |
124 |
|
125 |
LICENSE="BSD GPL-2 LGPL-2.1" |
126 |
SLOT="0" |
127 |
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
128 |
IUSE="anthy canna eb emacs gnome gtk kde libedit m17n-lib ncurses nls prime qt3 |
129 |
qt4 truetype unicode X linguas_zh_CN linguas_ja linguas_ko" |
130 |
|
131 |
RDEPEND="X? ( x11-libs/libX11 |
132 |
x11-libs/libXft |
133 |
x11-libs/libXt |
134 |
x11-libs/libICE |
135 |
x11-libs/libSM |
136 |
x11-libs/libXext |
137 |
x11-libs/libXrender ) |
138 |
anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) ) |
139 |
canna? ( app-i18n/canna ) |
140 |
eb? ( dev-libs/eb ) |
141 |
emacs? ( virtual/emacs ) |
142 |
gnome? ( >=gnome-base/gnome-panel-2.14 ) |
143 |
gtk? ( >=x11-libs/gtk+-2.4 ) |
144 |
kde? ( kde-base/kdelibs:3.5 ) |
145 |
libedit? ( dev-libs/libedit ) |
146 |
m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) |
147 |
ncurses? ( sys-libs/ncurses ) |
148 |
nls? ( virtual/libintl ) |
149 |
prime? ( app-i18n/prime ) |
150 |
qt3? ( $(qt_min_version 3.3.4) ) |
151 |
qt4? ( || ( x11-libs/qt-core:4 >=x11-libs/qt-4:4 ) ) |
152 |
!app-i18n/uim-svn |
153 |
!<app-i18n/prime-0.9.4" |
154 |
|
155 |
DEPEND="${RDEPEND} |
156 |
X? ( x11-proto/xextproto |
157 |
x11-proto/xproto )" |
158 |
|
159 |
RDEPEND="${RDEPEND} |
160 |
X? ( |
161 |
media-fonts/font-sony-misc |
162 |
linguas_zh_CN? ( media-fonts/font-isas-misc ) |
163 |
linguas_ja? ( media-fonts/font-jis-misc ) |
164 |
linguas_ko? ( media-fonts/font-daewoo-misc ) |
165 |
)" |
166 |
# linguas_zh_TW? ( media-fonts/taipeifonts ) |
167 |
|
168 |
S="${WORKDIR}/${MY_P}" |
169 |
|
170 |
SITEFILE=50${PN}-gentoo.el |
171 |
|
172 |
pkg_setup() { |
173 |
if use qt3 && ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then |
174 |
eerror "To support qt3 in this package is required to have" |
175 |
eerror "=x11-libs/qt-3* compiled with immqt-bc(recommended) or immqt USE flag." |
176 |
die "Please reemerge =x11-libs/qt-3* with USE=\"immqt-bc\" or USE=\"immqt\"." |
177 |
|
178 |
fi |
179 |
# An arch specific config directory is used on multilib systems |
180 |
has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" |
181 |
GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/} |
182 |
} |
183 |
|
184 |
src_compile() { |
185 |
local myconf |
186 |
|
187 |
if use gtk && (use anthy || use canna); then |
188 |
myconf="${myconf} --enable-dict" |
189 |
else |
190 |
myconf="${myconf} --disable-dict" |
191 |
fi |
192 |
|
193 |
if use qt3 ; then |
194 |
append-flags -DQT_THREAD_SUPPORT |
195 |
fi |
196 |
|
197 |
if use gtk || use qt3 || use qt4 ; then |
198 |
myconf="${myconf} --enable-pref" |
199 |
else |
200 |
myconf="${myconf} --disable-pref" |
201 |
fi |
202 |
|
203 |
if use anthy ; then |
204 |
if use unicode ; then |
205 |
myconf="${myconf} --with-anthy-utf8" |
206 |
else |
207 |
myconf="${myconf} --with-anthy" |
208 |
fi |
209 |
else |
210 |
myconf="${myconf} --without-anthy" |
211 |
fi |
212 |
|
213 |
if use qt3 || use qt4 ; then |
214 |
myconf="${myconf} --with-qt" |
215 |
else |
216 |
myconf="${myconf} --without-qt" |
217 |
fi |
218 |
|
219 |
econf $(use_with X x) \ |
220 |
$(use_with canna) \ |
221 |
$(use_with eb) \ |
222 |
$(use_enable emacs) \ |
223 |
$(use_with emacs lispdir "${SITELISP}") \ |
224 |
$(use_enable gnome gnome-applet) \ |
225 |
$(use_with gtk gtk2) \ |
226 |
$(use_with libedit) \ |
227 |
$(use_enable kde kde-applet) \ |
228 |
$(use_with m17n-lib m17nlib) \ |
229 |
$(use_enable ncurses fep) \ |
230 |
$(use_enable nls) \ |
231 |
$(use_with qt3 qt-immodule) \ |
232 |
$(use_with qt4 qt-immodule) \ |
233 |
$(use_with truetype xft) \ |
234 |
${myconf} || die "econf failed" |
235 |
emake -j1 || die "emake failed" |
236 |
|
237 |
if use emacs; then |
238 |
cd emacs |
239 |
elisp-comp *.el || die "elisp-comp failed" |
240 |
fi |
241 |
} |
242 |
|
243 |
src_install() { |
244 |
emake DESTDIR="${D}" install || die "make install failed" |
245 |
|
246 |
dodoc AUTHORS ChangeLog* NEWS README RELNOTE |
247 |
if use emacs; then |
248 |
elisp-install uim-el emacs/*.elc || die "elisp-install failed" |
249 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ |
250 |
|| die "elisp-site-file-install failed" |
251 |
fi |
252 |
} |
253 |
|
254 |
pkg_postinst() { |
255 |
elog |
256 |
elog "To use uim-skk you should emerge app-i18n/skk-jisyo." |
257 |
elog |
258 |
|
259 |
elog |
260 |
elog "New input method switcher has been introduced. You need to set" |
261 |
elog |
262 |
elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" |
263 |
elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" |
264 |
elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" |
265 |
elog |
266 |
elog "If you would like to use uim-anthy as default input method, put" |
267 |
elog "(define default-im-name 'anthy)" |
268 |
elog "to your ~/.uim." |
269 |
elog |
270 |
elog "All input methods can be found by running uim-im-switcher-gtk" |
271 |
elog "or uim-im-switcher-qt." |
272 |
elog |
273 |
elog "If you upgrade from a version of uim older than 1.4.0," |
274 |
elog "you should run revdep-rebuild." |
275 |
|
276 |
use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules" |
277 |
if use emacs; then |
278 |
elisp-site-regen |
279 |
echo |
280 |
elog "uim is autoloaded with Emacs with a minimal set of features:" |
281 |
elog "There is no keybinding defined to call it directly, so please" |
282 |
elog "create one yourself and choose an input method." |
283 |
elog "Integration with LEIM is not done with this ebuild, please have" |
284 |
elog "a look at the documentation how to achieve this." |
285 |
fi |
286 |
} |
287 |
|
288 |
pkg_postrm() { |
289 |
use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules" |
290 |
use emacs && elisp-site-regen |
291 |
} |
292 |
|
293 |
|
294 |
|
295 |
-- |
296 |
gentoo-commits@l.g.o mailing list |