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.6.0-r2.ebuild uim-1.6.0.ebuild uim-1.5.6-r4.ebuild uim-1.5.6-r1.ebuild
Date: Wed, 05 Jan 2011 11:17:39
Message-Id: 20110105111711.D1BB820057@flycatcher.gentoo.org
1 matsuu 11/01/05 11:17:11
2
3 Modified: ChangeLog
4 Added: uim-1.6.0-r2.ebuild
5 Removed: uim-1.6.0.ebuild uim-1.5.6-r4.ebuild
6 uim-1.5.6-r1.ebuild
7 Log:
8 Fixed Qt4 issue, bug #349859. Fixed gtk issue, bug #350207. These patches are submitted by Muneyuki Noguchi. Respect CXX and LDFLAGS, bug #349689.
9
10 (Portage version: 2.1.9.28/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.226 app-i18n/uim/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.226&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/ChangeLog?rev=1.226&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/ChangeLog?r1=1.225&r2=1.226
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v
22 retrieving revision 1.225
23 retrieving revision 1.226
24 diff -u -r1.225 -r1.226
25 --- ChangeLog 26 Dec 2010 17:29:08 -0000 1.225
26 +++ ChangeLog 5 Jan 2011 11:17:11 -0000 1.226
27 @@ -1,6 +1,17 @@
28 # ChangeLog for app-i18n/uim
29 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.225 2010/12/26 17:29:08 jer Exp $
31 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
32 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.226 2011/01/05 11:17:11 matsuu Exp $
33 +
34 +*uim-1.6.0-r2 (05 Jan 2011)
35 +
36 + 05 Jan 2011; MATSUU Takuto <matsuu@g.o> -uim-1.5.6-r1.ebuild,
37 + -uim-1.5.6-r4.ebuild, -files/uim-1.5.6-toplevel-delete-event.patch,
38 + -uim-1.6.0.ebuild, +uim-1.6.0-r2.ebuild, +files/uim-1.6.0-gettext.patch,
39 + +files/uim-1.6.0-linker.patch, +files/uim-1.6.0-xcompose.patch,
40 + -files/uim-disable-notify.diff:
41 + Fixed Qt4 issue, bug #349859. Fixed gtk issue, bug #350207. These patches are
42 + submitted by Muneyuki Noguchi. Respect CXX and LDFLAGS, bug #349689. Removed
43 + old versions.
44
45 26 Dec 2010; Jeroen Roovers <jer@g.o> uim-1.6.0.ebuild,
46 uim-1.6.0-r1.ebuild:
47
48
49
50 1.1 app-i18n/uim/uim-1.6.0-r2.ebuild
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/uim-1.6.0-r2.ebuild?rev=1.1&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/uim/uim-1.6.0-r2.ebuild?rev=1.1&content-type=text/plain
54
55 Index: uim-1.6.0-r2.ebuild
56 ===================================================================
57 # Copyright 1999-2011 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 # $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.0-r2.ebuild,v 1.1 2011/01/05 11:17:11 matsuu Exp $
60
61 EAPI="3"
62 inherit autotools eutils multilib elisp-common flag-o-matic
63
64 DESCRIPTION="Simple, secure and flexible input method library"
65 HOMEPAGE="http://code.google.com/p/uim/"
66 SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2"
67
68 LICENSE="BSD GPL-2 LGPL-2.1"
69 SLOT="0"
70 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
71 IUSE="+anthy canna curl eb emacs ffi gnome gtk kde libedit libnotify m17n-lib ncurses nls prime qt4 skk sqlite ssl test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
72
73 RESTRICT="test"
74
75 RDEPEND="X? (
76 x11-libs/libX11
77 x11-libs/libXft
78 x11-libs/libXt
79 x11-libs/libICE
80 x11-libs/libSM
81 x11-libs/libXext
82 x11-libs/libXrender
83 )
84 anthy? (
85 unicode? ( >=app-i18n/anthy-8622 )
86 !unicode? ( app-i18n/anthy )
87 )
88 canna? ( app-i18n/canna )
89 curl? ( >=net-misc/curl-7.16.4 )
90 eb? ( dev-libs/eb )
91 emacs? ( virtual/emacs )
92 ffi? ( virtual/libffi )
93 gnome? ( >=gnome-base/gnome-panel-2.14 )
94 gtk? ( >=x11-libs/gtk+-2.4:2 )
95 kde? ( >=kde-base/kdelibs-4 )
96 libedit? ( dev-libs/libedit )
97 libnotify? ( >=x11-libs/libnotify-0.4 )
98 m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
99 ncurses? ( sys-libs/ncurses )
100 nls? ( virtual/libintl )
101 prime? ( app-i18n/prime )
102 qt4? ( x11-libs/qt-gui:4[qt3support] )
103 skk? ( app-i18n/skk-jisyo )
104 sqlite? ( dev-db/sqlite:3 )
105 ssl? ( dev-libs/openssl )
106 !dev-scheme/sigscheme
107 !app-i18n/uim-svn
108 !<app-i18n/prime-0.9.4"
109 # >=dev-scheme/sigscheme-0.8.5
110 # mana? ( app-i18n/mana )
111 # scim? ( >=app-i18n/scim-1.3.0 ) # broken
112 # sj3? ( >=app-i18n/sj3-2.0.1.21 )
113 # wnn? ( app-i18n/wnn )
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 pkg_setup() {
145 # An arch specific config directory is used on multilib systems
146 has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
147 GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
148 }
149
150 src_prepare() {
151 epatch \
152 "${FILESDIR}/${P}-gentoo.patch" \
153 "${FILESDIR}/${PN}-1.5.4-zhTW.patch" \
154 "${FILESDIR}/${P}-sandbox-violation.patch" \
155 "${FILESDIR}/${P}-gettext.patch" \
156 "${FILESDIR}/${P}-xcompose.patch" \
157 "${FILESDIR}/${P}-linker.patch"
158
159 # bug 275420
160 sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die
161 #./autogen.sh
162 AT_NO_RECURSIVE=1 eautoreconf
163 }
164
165 src_configure() {
166 local myconf
167
168 if use gtk && (use anthy || use canna) ; then
169 myconf="${myconf} --enable-dict"
170 else
171 myconf="${myconf} --disable-dict"
172 fi
173
174 if use gtk || use qt4 ; then
175 myconf="${myconf} --enable-pref"
176 else
177 myconf="${myconf} --disable-pref"
178 fi
179
180 if use anthy ; then
181 if use unicode ; then
182 myconf="${myconf} --with-anthy-utf8"
183 else
184 myconf="${myconf} --with-anthy"
185 fi
186 else
187 myconf="${myconf} --without-anthy"
188 fi
189
190 if use libnotify ; then
191 myconf="${myconf} --enable-notify=libnotify"
192 fi
193
194 econf $(use_with X x) \
195 $(use_with canna) \
196 $(use_with curl) \
197 $(use_with eb) \
198 $(use_enable emacs) \
199 $(use_with emacs lispdir "${SITELISP}") \
200 $(use_with ffi) \
201 $(use_enable gnome gnome-applet) \
202 $(use_with gtk gtk2) \
203 $(use_with libedit) \
204 --disable-kde-applet \
205 $(use_enable kde kde4-applet) \
206 $(use_with m17n-lib m17nlib) \
207 $(use_enable ncurses fep) \
208 $(use_enable nls) \
209 $(use_with prime) \
210 --without-qt \
211 --without-qt-immodule \
212 $(use_with qt4 qt4) \
213 $(use_with qt4 qt4-immodule) \
214 $(use_with skk) \
215 $(use_with sqlite sqlite3) \
216 $(use_enable ssl openssl) \
217 $(use_with xft) \
218 ${myconf}
219 # $(use_enable qt4 qt4-qt3support) \
220 }
221
222 src_compile() {
223 emake || die "emake failed"
224
225 if use emacs; then
226 cd emacs
227 elisp-compile *.el || die "elisp-compile failed"
228 fi
229 }
230
231 src_install() {
232 # parallel make install b0rked, bug #222677
233 emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed"
234
235 dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die
236 if use emacs; then
237 elisp-install uim-el emacs/*.elc || die "elisp-install failed"
238 elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \
239 || die "elisp-site-file-install failed"
240 fi
241
242 # collision with dev-scheme/sigscheme, bug #330975
243 # find "${ED}" -name '*gcroots*' -delete || die
244 }
245
246 pkg_postinst() {
247 elog
248 elog "New input method switcher has been introduced. You need to set"
249 elog
250 elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
251 elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
252 elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
253 elog
254 elog "If you would like to use uim-anthy as default input method, put"
255 elog "(define default-im-name 'anthy)"
256 elog "to your ~/.uim."
257 elog
258 elog "All input methods can be found by running uim-im-switcher-gtk, "
259 elog "or uim-im-switcher-qt4."
260 elog
261 elog "If you upgrade from a version of uim older than 1.4.0,"
262 elog "you should run revdep-rebuild."
263
264 use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
265 if use emacs; then
266 elisp-site-regen
267 echo
268 elog "uim is autoloaded with Emacs with a minimal set of features:"
269 elog "There is no keybinding defined to call it directly, so please"
270 elog "create one yourself and choose an input method."
271 elog "Integration with LEIM is not done with this ebuild, please have"
272 elog "a look at the documentation how to achieve this."
273 fi
274 }
275
276 pkg_postrm() {
277 use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
278 use emacs && elisp-site-regen
279 }
Report Message
Find on MARC Find on Google Groups