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

Gentoo Archives: gentoo-commits

From: "Matsuu Takuto (matsuu)" <matsuu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-i18n/uim: ChangeLog uim-1.7.1-r1.ebuild uim-1.7.0.ebuild
Date: Wed, 21 Dec 2011 17:39:52
Message-Id: 20111221173941.C53412004B@flycatcher.gentoo.org
1 matsuu 11/12/21 17:39:41
2
3 Modified: ChangeLog
4 Added: uim-1.7.1-r1.ebuild
5 Removed: uim-1.7.0.ebuild
6 Log:
7 Added $(use_enable qt4 qt4-qt3support), bug #282922. Added REQUIRED_USE, bug #383389.
8
9 (Portage version: 2.1.10.41/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.237 app-i18n/uim/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.237&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.237&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/ChangeLog?r1=1.236&r2=1.237
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v
21 retrieving revision 1.236
22 retrieving revision 1.237
23 diff -u -r1.236 -r1.237
24 --- ChangeLog 28 Sep 2011 10:59:35 -0000 1.236
25 +++ ChangeLog 21 Dec 2011 17:39:41 -0000 1.237
26 @@ -1,6 +1,13 @@
27 # ChangeLog for app-i18n/uim
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.236 2011/09/28 10:59:35 ssuominen Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.237 2011/12/21 17:39:41 matsuu Exp $
31 +
32 +*uim-1.7.1-r1 (21 Dec 2011)
33 +
34 + 21 Dec 2011; MATSUU Takuto <matsuu@g.o> -uim-1.7.0.ebuild,
35 + +uim-1.7.1-r1.ebuild, +files/uim-1.7.1-qt4.patch:
36 + Added $(use_enable qt4 qt4-qt3support), bug #282922. Added REQUIRED_USE, bug
37 + #383389. Removed old version.
38
39 28 Sep 2011; Samuli Suominen <ssuominen@g.o> uim-1.6.1.ebuild,
40 uim-1.7.0.ebuild, uim-1.7.1.ebuild, metadata.xml:
41
42
43
44 1.1 app-i18n/uim/uim-1.7.1-r1.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/uim-1.7.1-r1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/uim-1.7.1-r1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: uim-1.7.1-r1.ebuild
50 ===================================================================
51 # Copyright 1999-2011 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.1-r1.ebuild,v 1.1 2011/12/21 17:39:41 matsuu Exp $
54
55 EAPI="4"
56 inherit autotools eutils multilib elisp-common flag-o-matic
57
58 DESCRIPTION="Simple, secure and flexible input method library"
59 HOMEPAGE="http://code.google.com/p/uim/"
60 SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
61
62 LICENSE="BSD GPL-2 LGPL-2.1"
63 SLOT="0"
64 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
65 IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
66
67 RESTRICT="test"
68
69 REQUIRED_USE="gtk? ( X ) qt4? ( X )"
70
71 RDEPEND="X? (
72 x11-libs/libX11
73 x11-libs/libXft
74 x11-libs/libXt
75 x11-libs/libICE
76 x11-libs/libSM
77 x11-libs/libXext
78 x11-libs/libXrender
79 )
80 anthy? (
81 unicode? ( >=app-i18n/anthy-8622 )
82 !unicode? ( app-i18n/anthy )
83 )
84 canna? ( app-i18n/canna )
85 curl? ( >=net-misc/curl-7.16.4 )
86 eb? ( dev-libs/eb )
87 emacs? ( virtual/emacs )
88 libffi? ( virtual/libffi )
89 gnome? ( >=gnome-base/gnome-panel-2.14 )
90 gtk? ( >=x11-libs/gtk+-2.4:2 )
91 gtk3? ( x11-libs/gtk+:3 )
92 kde? ( >=kde-base/kdelibs-4 )
93 libedit? ( dev-libs/libedit )
94 libnotify? ( >=x11-libs/libnotify-0.4 )
95 m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
96 ncurses? ( sys-libs/ncurses )
97 nls? ( virtual/libintl )
98 prime? ( app-i18n/prime )
99 qt4? ( x11-libs/qt-gui:4[qt3support] )
100 skk? ( app-i18n/skk-jisyo )
101 sqlite? ( dev-db/sqlite:3 )
102 ssl? ( dev-libs/openssl )
103 !dev-scheme/sigscheme
104 !app-i18n/uim-svn
105 !<app-i18n/prime-0.9.4"
106 # >=dev-scheme/sigscheme-0.8.5
107 # mana? ( app-i18n/mana )
108 # scim? ( >=app-i18n/scim-1.3.0 ) # broken
109 # sj3? ( >=app-i18n/sj3-2.0.1.21 )
110 # wnn? ( app-i18n/wnn )
111 # gnome? (
112 # gtk? ( >=gnome-base/gnome-panel-2.14 )
113 # gtk3? ( >=gnome-base/gnome-panel-3 )
114 # )
115 DEPEND="${RDEPEND}
116 dev-util/pkgconfig
117 >=sys-devel/gettext-0.15
118 kde? ( dev-util/cmake )
119 X? (
120 x11-proto/xextproto
121 x11-proto/xproto
122 )"
123
124 RDEPEND="${RDEPEND}
125 X? (
126 media-fonts/font-sony-misc
127 linguas_zh_CN? (
128 || ( media-fonts/font-isas-misc media-fonts/intlfonts )
129 )
130 linguas_zh_TW? (
131 media-fonts/intlfonts
132 )
133 linguas_ja? (
134 || ( media-fonts/font-jis-misc media-fonts/intlfonts )
135 )
136 linguas_ko? (
137 || ( media-fonts/font-daewoo-misc media-fonts/intlfonts )
138 )
139 )"
140 # test? ( dev-scheme/gauche )
141
142 SITEFILE=50${PN}-gentoo.el
143
144 update_gtk_immodules() {
145 local GTK2_CONFDIR="/etc/gtk-2.0"
146 # bug #366889
147 if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
148 GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
149 fi
150 mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
151
152 if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
153 "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
154 fi
155 }
156
157 update_gtk3_immodules() {
158 if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
159 "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
160 fi
161 }
162
163 src_prepare() {
164 epatch \
165 "${FILESDIR}"/${PN}-1.7.1-qt4.patch \
166 "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \
167 "${FILESDIR}"/${PN}-1.5.4-zhTW.patch
168
169 # bug 275420
170 sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
171
172 echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die
173
174 #./autogen.sh
175 AT_NO_RECURSIVE=1 eautoreconf
176 }
177
178 src_configure() {
179 local myconf
180
181 if (use gtk || use gtk3) && (use anthy || use canna) ; then
182 myconf="${myconf} --enable-dict"
183 else
184 myconf="${myconf} --disable-dict"
185 fi
186
187 if use gtk || use gtk3 || use qt4 ; then
188 myconf="${myconf} --enable-pref"
189 else
190 myconf="${myconf} --disable-pref"
191 fi
192
193 if use anthy ; then
194 if use unicode ; then
195 myconf="${myconf} --with-anthy-utf8"
196 else
197 myconf="${myconf} --with-anthy"
198 fi
199 else
200 myconf="${myconf} --without-anthy"
201 fi
202
203 if use libnotify ; then
204 myconf="${myconf} --enable-notify=libnotify"
205 fi
206
207 #if use gnome ; then
208 # myconf="${myconf} $(use_enable gtk gnome-applet)"
209 # myconf="${myconf} $(use_enable gtk3 gnome3-applet)"
210 #fi
211
212 econf $(use_with X x) \
213 $(use_with canna) \
214 $(use_with curl) \
215 $(use_with eb) \
216 $(use_enable emacs) \
217 $(use_with emacs lispdir "${SITELISP}") \
218 $(use_with libffi ffi) \
219 $(use_enable gnome gnome-applet) \
220 $(use_with gtk gtk2) \
221 $(use_with gtk3) \
222 $(use_with libedit) \
223 --disable-kde-applet \
224 $(use_enable kde kde4-applet) \
225 $(use_with m17n-lib m17nlib) \
226 $(use_enable ncurses fep) \
227 $(use_enable nls) \
228 $(use_with prime) \
229 --without-qt \
230 --without-qt-immodule \
231 $(use_with qt4 qt4) \
232 $(use_with qt4 qt4-immodule) \
233 $(use_enable qt4 qt4-qt3support) \
234 $(use_with skk) \
235 $(use_with sqlite sqlite3) \
236 $(use_enable ssl openssl) \
237 $(use_enable static-libs static) \
238 $(use_with xft) \
239 ${myconf}
240 }
241
242 src_compile() {
243 emake || die "emake failed"
244
245 if use emacs; then
246 cd emacs
247 elisp-compile *.el || die "elisp-compile failed"
248 fi
249 }
250
251 src_install() {
252 # parallel make install b0rked, bug #222677
253 emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
254
255 dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
256 if use emacs; then
257 elisp-install uim-el emacs/*.elc || die "elisp-install failed"
258 elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
259 || die "elisp-site-file-install failed"
260 fi
261
262 find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} +
263 use static-libs || find "${ED}" -name '*.la' -exec rm {} +
264
265 sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die
266 insinto /etc/X11/xinit/xinput.d
267 doins "${T}/uim.conf" || die
268
269 # collision with dev-scheme/sigscheme, bug #330975
270 # find "${ED}" -name '*gcroots*' -delete || die
271 }
272
273 pkg_postinst() {
274 elog
275 elog "New input method switcher has been introduced. You need to set"
276 elog
277 elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
278 elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
279 elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
280 elog
281 elog "If you would like to use uim-anthy as default input method, put"
282 elog "(define default-im-name 'anthy)"
283 elog "to your ~/.uim."
284 elog
285 elog "All input methods can be found by running uim-im-switcher-gtk, "
286 elog "uim-im-switcher-gtk3 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 use gtk && update_gtk_immodules
292 use gtk3 && update_gtk3_immodules
293 if use emacs; then
294 elisp-site-regen
295 echo
296 elog "uim is autoloaded with Emacs with a minimal set of features:"
297 elog "There is no keybinding defined to call it directly, so please"
298 elog "create one yourself and choose an input method."
299 elog "Integration with LEIM is not done with this ebuild, please have"
300 elog "a look at the documentation how to achieve this."
301 fi
302 }
303
304 pkg_postrm() {
305 use gtk && update_gtk_immodules
306 use gtk3 && update_gtk3_immodules
307 use emacs && elisp-site-regen
308 }
Report Message
Find on MARC Find on Google Groups