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/uim/, app-i18n/uim/files/
Date: Sat, 23 Oct 2021 14:32:12
Message-Id: 1634999513.cf290e857cb6559bd64bc79b4efbfc4a5215e36e.hattya@gentoo
1 commit: cf290e857cb6559bd64bc79b4efbfc4a5215e36e
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 23 14:31:17 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 23 14:31:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf290e85
7
8 app-i18n/uim: new snapshot
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
12
13 app-i18n/uim/Manifest | 2 +
14 app-i18n/uim/files/uim-kde.patch | 72 +++++++++
15 app-i18n/uim/uim-1.8.9_pre20210103.ebuild | 245 ++++++++++++++++++++++++++++++
16 3 files changed, 319 insertions(+)
17
18 diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
19 index 593def9c836..67883695dc1 100644
20 --- a/app-i18n/uim/Manifest
21 +++ b/app-i18n/uim/Manifest
22 @@ -1 +1,3 @@
23 +DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1 SHA512 b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
24 DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
25 +DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104 SHA512 39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
26
27 diff --git a/app-i18n/uim/files/uim-kde.patch b/app-i18n/uim/files/uim-kde.patch
28 new file mode 100644
29 index 00000000000..8a291650ae3
30 --- /dev/null
31 +++ b/app-i18n/uim/files/uim-kde.patch
32 @@ -0,0 +1,72 @@
33 +--- a/configure.ac
34 ++++ b/configure.ac
35 +@@ -1449,6 +1449,28 @@
36 +
37 + AM_CONDITIONAL(KDE4_APPLET, test "x$enable_kde4_applet" = xyes)
38 +
39 ++dnl ****************************
40 ++dnl *** test for KDE5 applet ***
41 ++dnl ****************************
42 ++AC_ARG_ENABLE(kde5-applet,
43 ++ AC_HELP_STRING([--disable-kde5-applet],
44 ++ [do not build uim KDE Plasma 5 widget]),
45 ++ [],
46 ++ [enable_kde5_applet=yes])
47 ++
48 ++if test "x$enable_kde5_applet" != xno; then
49 ++ if test "x$with_qt5" != xyes; then
50 ++ enable_kde5_applet=no
51 ++ fi
52 ++fi
53 ++
54 ++if test "x$enable_kde5_applet" = xyes && test "x$CMAKE" = xno; then
55 ++ AC_MSG_WARN([no CMake found])
56 ++ enable_kde5_applet=no
57 ++fi
58 ++
59 ++AM_CONDITIONAL(KDE5_APPLET, test "x$enable_kde5_applet" = xyes)
60 ++
61 + AC_ARG_ENABLE(pref,
62 + AC_HELP_STRING([--disable-pref],
63 + [do not build graphical utility to edit user settings]),
64 +@@ -1948,12 +1970,15 @@
65 + qt5_immodule_option="DEFINES+=QT5_IMMODULE"
66 + fi
67 + set -e
68 +- # FIXME: move CMAKE_CXX_FLAGS into cmake_option
69 +- ${CMAKE} \
70 +- -B ${ac_abs_top_builddir}/qt5/applet.cmake \
71 +- -S ${ac_abs_top_srcdir}/qt5/applet \
72 +- -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
73 +- ${cmake_option}
74 ++ # Generate a Makefile for KDE5 applet by cmake
75 ++ if test "x$enable_kde5_applet" = xyes; then
76 ++ # FIXME: move CMAKE_CXX_FLAGS into cmake_option
77 ++ ${CMAKE} \
78 ++ -B ${ac_abs_top_builddir}/qt5/applet.cmake \
79 ++ -S ${ac_abs_top_srcdir}/qt5/applet \
80 ++ -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
81 ++ ${cmake_option}
82 ++ fi
83 + ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
84 + ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
85 + ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \
86 +@@ -2007,6 +2032,7 @@
87 + Qt5 immodule : ${with_qt5_immodule}
88 + KDE3 Applet : ${enable_kde_applet}
89 + KDE4 Applet : ${enable_kde4_applet}
90 ++ KDE5 Applet : ${enable_kde5_applet}
91 + FEP : ${enable_fep}
92 + Emacs : ${enable_emacs}
93 + XIM : ${use_xim}
94 +--- a/qt5/applet/Makefile.am
95 ++++ b/qt5/applet/Makefile.am
96 +@@ -6,6 +6,8 @@
97 + plasmoid
98 +
99 + if QT5
100 ++if KDE5_APPLET
101 + all clean install uninstall:
102 + $(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@
103 + endif
104 ++endif
105
106 diff --git a/app-i18n/uim/uim-1.8.9_pre20210103.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
107 new file mode 100644
108 index 00000000000..d96338d66ab
109 --- /dev/null
110 +++ b/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
111 @@ -0,0 +1,245 @@
112 +# Copyright 1999-2021 Gentoo Authors
113 +# Distributed under the terms of the GNU General Public License v2
114 +
115 +EAPI="7"
116 +
117 +inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils vcs-snapshot
118 +
119 +EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
120 +SIG_PV="0.9.1"
121 +
122 +DESCRIPTION="A multilingual input method framework"
123 +HOMEPAGE="https://github.com/uim/uim"
124 +SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
125 + https://github.com/${PN}/sigscheme/releases/download/${SIG_PV}/sigscheme-${SIG_PV}.tar.bz2"
126 +
127 +LICENSE="BSD GPL-2 LGPL-2.1"
128 +SLOT="0"
129 +KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
130 +IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
131 +RESTRICT="test"
132 +REQUIRED_USE="gtk? ( X )
133 + gtk2? ( X )
134 + qt5? ( X )
135 + xft? ( X )"
136 +
137 +CDEPEND="X? (
138 + x11-libs/libICE
139 + x11-libs/libSM
140 + x11-libs/libX11
141 + x11-libs/libXext
142 + x11-libs/libXft
143 + x11-libs/libXrender
144 + x11-libs/libXt
145 + )
146 + anthy? ( app-i18n/anthy )
147 + curl? ( net-misc/curl )
148 + eb? ( dev-libs/eb )
149 + emacs? ( >=app-editors/emacs-23.1:* )
150 + expat? ( dev-libs/expat )
151 + gtk? ( x11-libs/gtk+:3 )
152 + gtk2? ( x11-libs/gtk+:2 )
153 + kde? ( kde-frameworks/plasma:5 )
154 + libedit? ( dev-libs/libedit )
155 + libffi? ( dev-libs/libffi:= )
156 + libnotify? ( x11-libs/libnotify )
157 + m17n-lib? ( dev-libs/m17n-lib )
158 + ncurses? ( sys-libs/ncurses:0= )
159 + nls? ( virtual/libintl )
160 + qt5? ( dev-qt/qtx11extras:5 )
161 + skk? ( app-i18n/skk-jisyo )
162 + sqlite? ( dev-db/sqlite:3 )
163 + ssl? ( dev-libs/openssl:0= )"
164 +DEPEND="${CDEPEND}
165 + X? ( x11-base/xorg-proto )"
166 +RDEPEND="${CDEPEND}
167 + !dev-scheme/sigscheme
168 + X? (
169 + media-fonts/font-sony-misc
170 + l10n_ja? (
171 + || (
172 + media-fonts/font-jis-misc
173 + media-fonts/intlfonts
174 + )
175 + )
176 + l10n_ko? (
177 + || (
178 + media-fonts/font-daewoo-misc
179 + media-fonts/intlfonts
180 + )
181 + )
182 + l10n_zh-CN? (
183 + || (
184 + media-fonts/font-isas-misc
185 + media-fonts/intlfonts
186 + )
187 + )
188 + l10n_zh-TW? ( media-fonts/intlfonts )
189 + )"
190 +BDEPEND="dev-util/intltool
191 + sys-devel/gettext
192 + virtual/pkgconfig
193 + kde? ( dev-util/cmake )"
194 +
195 +PATCHES=(
196 + "${FILESDIR}"/${PN}-gentoo.patch
197 + "${FILESDIR}"/${PN}-kde.patch
198 + "${FILESDIR}"/${PN}-slibtool.patch
199 + "${FILESDIR}"/${PN}-tinfo.patch
200 + "${FILESDIR}"/${PN}-xkb.patch
201 + "${FILESDIR}"/${PN}-zh-TW.patch
202 +)
203 +DOCS=( AUTHORS NEWS README RELNOTE doc )
204 +
205 +AT_NO_RECURSIVE="yes"
206 +SITEFILE="50${PN}-gentoo.el"
207 +
208 +src_unpack() {
209 + vcs-snapshot_src_unpack
210 + rmdir "${S}"/sigscheme || die
211 + mv "${WORKDIR}"/sigscheme-${SIG_PV} "${S}"/sigscheme || die
212 +}
213 +
214 +src_prepare() {
215 + default
216 + sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
217 + # fix build with >=dev-scheme/chicken-4, bug #656852
218 + touch scm/json-parser-expanded.scm
219 + # fix build with "-march=pentium4 -O2", bug #661806
220 + use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
221 +
222 + eautoreconf
223 +}
224 +
225 +src_configure() {
226 + local myconf=(
227 + $(use_with X x)
228 + $(use_with anthy anthy-utf8)
229 + $(use_with curl)
230 + $(use_with eb)
231 + $(use_enable emacs)
232 + $(use_with emacs lispdir "${SITELISP}")
233 + $(use_with expat)
234 + $(use_enable kde kde5-applet)
235 + $(use_with libedit)
236 + $(use_with libffi ffi)
237 + $(use_with gtk gtk3)
238 + $(use_with gtk2)
239 + $(use_with m17n-lib m17nlib)
240 + $(use_enable ncurses fep)
241 + $(use_enable nls)
242 + $(use_with qt5)
243 + $(use_with qt5 qt5-immodule)
244 + _QMAKE5=$(qt5_get_bindir)/qmake
245 + $(use_with skk)
246 + $(use_with sqlite sqlite3)
247 + $(use_enable ssl openssl)
248 + $(use_enable static-libs static)
249 + $(use_with xft)
250 + --without-anthy
251 + --without-canna
252 + --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
253 + --disable-gnome-applet
254 + --disable-gnome3-applet
255 + --disable-kde-applet
256 + --disable-kde4-applet
257 + --without-mana
258 + --enable-maintainer-mode
259 + --without-prime
260 + --disable-qt4-qt3support
261 + )
262 +
263 + if (use gtk || use gtk2) && use anthy; then
264 + myconf+=( --enable-dict )
265 + else
266 + myconf+=( --disable-dict )
267 + fi
268 +
269 + if use libnotify; then
270 + myconf+=( --enable-notify=libnotify )
271 + fi
272 +
273 + if use gtk || use gtk2 || use qt5; then
274 + myconf+=( --enable-pref )
275 + else
276 + myconf+=( --disable-pref )
277 + fi
278 +
279 + econf "${myconf[@]}"
280 +}
281 +
282 +src_compile() {
283 + default
284 +
285 + if use emacs; then
286 + cd emacs || die
287 + elisp-compile *.el || die
288 + cd - >/dev/null || die
289 + fi
290 +}
291 +
292 +src_install() {
293 + # bug #222677
294 + emake -j1 DESTDIR="${D}" install
295 + rm -f doc/Makefile*
296 + einstalldocs
297 +
298 + find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
299 + use static-libs || find "${ED}" -name '*.la' -delete || die
300 +
301 + insinto /etc/X11/xinit/xinput.d
302 + sed \
303 + -e "s:@EPREFIX@:${EPREFIX}:g" \
304 + "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
305 + doins "${T}"/${PN}.conf
306 +
307 + if use X; then
308 + docinto xim
309 + dodoc xim/README*
310 + fi
311 +
312 + if use emacs; then
313 + elisp-install ${PN}-el emacs/*.el{,c}
314 + elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
315 + docinto emacs
316 + dodoc emacs/README*
317 + fi
318 +
319 + if use ncurses; then
320 + docinto fep
321 + dodoc fep/README*
322 + fi
323 +}
324 +
325 +pkg_postinst() {
326 + elog "New input method switcher has been introduced. You need to set"
327 + elog
328 + elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
329 + elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
330 + elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
331 + elog
332 + elog "If you would like to use uim-anthy as default input method, put"
333 + elog "(define default-im-name 'anthy)"
334 + elog "to your ~/.uim."
335 + elog
336 + elog "All input methods can be found by running uim-im-switcher-gtk, "
337 + elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
338 +
339 + if use emacs; then
340 + elisp-site-regen
341 + elog
342 + elog "uim is autoloaded with Emacs with a minimal set of features:"
343 + elog "There is no keybinding defined to call it directly, so please"
344 + elog "create one yourself and choose an input method."
345 + elog "Integration with LEIM is not done with this ebuild, please have"
346 + elog "a look at the documentation how to achieve this."
347 + fi
348 + use gtk && gnome2_query_immodules_gtk3
349 + use gtk2 && gnome2_query_immodules_gtk2
350 +}
351 +
352 +pkg_postrm() {
353 + use emacs && elisp-site-regen
354 + use gtk && gnome2_query_immodules_gtk3
355 + use gtk2 && gnome2_query_immodules_gtk2
356 +}