diff options
| -rw-r--r-- | app-i18n/uim/ChangeLog | 8 | ||||
| -rw-r--r-- | app-i18n/uim/Manifest | 23 | ||||
| -rw-r--r-- | app-i18n/uim/files/uim-1.6.0-gentoo.patch | 11 | ||||
| -rw-r--r-- | app-i18n/uim/metadata.xml | 2 | ||||
| -rw-r--r-- | app-i18n/uim/uim-1.6.0.ebuild | 219 |
5 files changed, 257 insertions, 6 deletions
diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog index 4f4174b74f14..c947c86f06c5 100644 --- a/app-i18n/uim/ChangeLog +++ b/app-i18n/uim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-i18n/uim # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.222 2010/10/23 10:07:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.223 2010/11/08 07:10:58 matsuu Exp $ + +*uim-1.6.0 (08 Nov 2010) + + 08 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> +uim-1.6.0.ebuild, + +files/uim-1.6.0-gentoo.patch, metadata.xml: + Version bumped,bug #335075. Added !dev-scheme/sigscheme, bug #330975. 23 Oct 2010; Markos Chandras <hwoarang@gentoo.org> uim-1.5.7-r1.ebuild, +files/uim-1.5.7-qt4.7.patch: diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest index f693233d5cc8..6911210c3cbf 100644 --- a/app-i18n/uim/Manifest +++ b/app-i18n/uim/Manifest @@ -9,21 +9,34 @@ AUX uim-1.5.6-toplevel-delete-event.patch 870 RMD160 397d29ab572a0a5aabfa18dce56 AUX uim-1.5.7-kde4-applet.patch 426 RMD160 6a94e138421e65484337827e3ddd8e0d257af5ec SHA1 9a9e64864c7f47ac23b8a9c792de1d8ee2e2c8be SHA256 ca178782cf9b7b84a6b81a90f654ed0078a8dee76b7275895098c41208762a7d AUX uim-1.5.7-kde4.patch 6397 RMD160 df19bf38df9146c7adaadbb3c590c8670b716a49 SHA1 1bc8ed999a17831360d083478bee91f5cc3a8aa3 SHA256 f587331dd97031e94e11dff08f64bb2ef4aee7bccf7d7d970ddfdc0590b73ee1 AUX uim-1.5.7-qt4.7.patch 478 RMD160 823e323e03d514b529d8c70ce871b7264d71378b SHA1 320dd7576788aba98c87313d60f1bcdf7f5224e7 SHA256 f2b57414e3c8f2189d279df4e15b86f0166196714505a7307b28be4784e794c6 +AUX uim-1.6.0-gentoo.patch 381 RMD160 b1be11c6cda393fac0c9d7848d52c0421e7fee77 SHA1 be3ab78b9262862f7b8e461f118dfd5e94700757 SHA256 c44e97d8c4d2125e17fe0d8107ce3d258c930b9dda3329eec170cfb291ae6c80 AUX uim-disable-notify.diff 1738 RMD160 a19b315a0b5f1408c543535886665562e90dd666 SHA1 023ce4cb996ddcd50ce19892a202c6d09dcab522 SHA256 05325e441d0c7d6ae241976ac0e432e4cb7f56c9c4b2d37eddfd081e45490848 DIST uim-1.4.2.tar.bz2 2723523 RMD160 7f0c6a93fb31799643f6c1e594896fc817b2e7f9 SHA1 2ece459ac14e95b2bb2be6135c1a134354dcef09 SHA256 381a4981d942ad5aae01eb711318170706c1cd8ac91a45ab5c733906699d25c2 DIST uim-1.5.6.tar.bz2 3343584 RMD160 01774ff38e64436945290a5c3b2e1dc1a14d6771 SHA1 24b33991db4813fe82af7862c5e0d0f6d6b284dd SHA256 ce6b7218c3b79e5d100d52fa745e51abc83a1fe7668b3b759584b9ec7a00c28f DIST uim-1.5.7.tar.bz2 3330555 RMD160 037677cd583c2b69293fbbc1c0393756d7c7adac SHA1 fbea2590286ddc857a7824d8544cb08842f4299f SHA256 f404b274c4b7e71b4b912912c758606585af476fcc5f3d602a08564187ad4e46 +DIST uim-1.6.0.tar.bz2 6154925 RMD160 14881fe9ff1af64cee1317d0b51af69294377e47 SHA1 d27f2ca8136da0702c82f0522911d06b2b8f8ea7 SHA256 2a34dca2091eb6d61f05dabd8512c6658d8cefa8db14b7a684fbb10caea4a3aa EBUILD uim-1.4.2.ebuild 3999 RMD160 43c80abb4398057ef4530d51b1cbc592d3d7ba3e SHA1 39939cf9710cd84f2304d346f97a3d2f0021227a SHA256 49ab526a6383f7922802d4b721543745e2dd987408ac4fa2a7effd5f76da378d EBUILD uim-1.5.6-r1.ebuild 5169 RMD160 e82f2e8c8f34bc4d791bb75d19e34c67a9982bd5 SHA1 701b76f6e22e3951d36b9f1c4e2da550c920b4dd SHA256 574c5354750de42007dd70e3fe8eecef4e4826ff665028e554d409b46e66891b EBUILD uim-1.5.6-r4.ebuild 5266 RMD160 3cef3cd7d431d22935bb172a95628a0ede220e73 SHA1 c3dd334ae92aca209ededf97ec522ca6edb706e6 SHA256 06adc9371af5449f669bc4f23e0bcb6d3e11b1b8288895a3dcbbeb54f78c4f13 EBUILD uim-1.5.7-r1.ebuild 5416 RMD160 804d1e87f0ef3fb4520cb0d07006c67d370bc267 SHA1 5c829d661aa9d4e0d6629b97562e276b4feacf07 SHA256 dc3230d6fe189071eba7bfde988359dd58ecf52832e73b0417979dbefe520e22 EBUILD uim-1.5.7.ebuild 5296 RMD160 23fb62b18eb84c7792b45d7951c97a1fe193b7cd SHA1 d81dfdd0169c9eae48c1328bb685d905f9d9a13e SHA256 95d7baf47b0c95a4c001d95e79da044343401aa50be2753a86059ab166937af5 -MISC ChangeLog 31153 RMD160 dce8a3ef1974461e77cc738562334d485b7a2e70 SHA1 009a10f9ea454b85375f7e2ed301aab501f7ccad SHA256 dafb49cd77f3b7e3af70af767eba5eeee70ee9f58738eef704baad6dbc7ea471 -MISC metadata.xml 815 RMD160 012fd0ff539fa5f7d943f2b2b955af2b1a51579f SHA1 1c035765a6908e1b767689d899a68876e44dc772 SHA256 a1f64b1559c0291cb60d8783c53482f9235f03802984816c827255f92d171d5e +EBUILD uim-1.6.0.ebuild 5780 RMD160 c8858eaa1c21d4a92baca01b92decffe74452dbe SHA1 052e6afa7763056ce4a075d876962978065be0c3 SHA256 f13017e064081072826086b0657c7d59ee25df278e40688e9d02f7320823f9d2 +MISC ChangeLog 31365 RMD160 b848cd308b252354f1194ff0285629cf3a439dea SHA1 996d69c7b8b0626cdc7fcafffbce1e99745b10a2 SHA256 2e57e5e4d658a939fde90664443390a0ec1249f2d3c710c0da1e1e8478f11892 +MISC metadata.xml 961 RMD160 74d29238a618f2307a09fc3061f0652ceb305073 SHA1 665044f11f9f9b7e16b6b580a379b4138ffd2f1c SHA256 f1ca51e0e41161ec077f759a0e139bf523ace99a60e769b51e6a67fd549f075a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkzCs/AACgkQ9/cejkQaxBATYQCeKX4hpu4e4malHlt5OUI4h3d7 -FEAAnjkxh4rkbYLl4foAuz34KqBmdp3y -=FfT0 +iQIcBAEBAgAGBQJM16KOAAoJECaGw+YFKA1pu9gP/0CVWa4z/+oYvj00I12GQWWK +kIF8bhASe3zHHCHueozoIvyxwNoft0dj/USVWTje4hEpFLGuo6bM0sLo1AvDVdTk +9gEHf8wF2A/Tge3fWO45MFp0ObUY0xW4JhtqCJn71pIo+dPkO+XQ4iCCgLv6bKDd +bn/PdV5Vz+ZIsn6UJamJYpOVmDPNMkI8aQD45tevyC7GgBOg2loeL9LlvuFi/6Yl +M4qOwPDE4RKb2KC8oMiFs3x5eRR++8NwGIvYkbBStwxhKIr9++BivLFzFDIyB/jq +lnYosBpUwxxeJPf+tjc+E2OFwD5Dh12U1dSdZucLaaF7QTP4qF1aJMoS/VJfmHZl +4u9tb/ktSfel0wHjZOEBG4UzT10o8tu8gnvPvo3fxPDZgZvGqeFvQpdPOsaYc7tO +0HcMQ3mGsGOgC6ZJpdp/sSIrjr9JRleJAwUb5jz/68GAQZ6kXdEyHOg98kvfSovd +ZSjropVAkYtkC/eDv6zmIN43T4rDSQZAoHa2wX6wOiPeTqTzfiUBs/6om+fXXRdn +M9BIepUMFsFDFL44Rs7zGgwrgjHRy0Cyc4nBTKdNl1ieVw8BzaYEtm6Y2a1jJYhZ +1zz3H/AxAYsScUHKyE8k6UsnR75r2eulndzhLRVVylrD1Ho5mpDcilCbA4NCyIFZ +hfIRl8omTXp7jPfNaQJV +=gsW3 -----END PGP SIGNATURE----- diff --git a/app-i18n/uim/files/uim-1.6.0-gentoo.patch b/app-i18n/uim/files/uim-1.6.0-gentoo.patch new file mode 100644 index 000000000000..206a1cdfb1e0 --- /dev/null +++ b/app-i18n/uim/files/uim-1.6.0-gentoo.patch @@ -0,0 +1,11 @@ +diff -Naur uim-1.6.0.orig/configure.ac uim-1.6.0/configure.ac +--- uim-1.6.0.orig/configure.ac 2010-08-02 09:30:14.000000000 +0900 ++++ uim-1.6.0/configure.ac 2010-08-14 08:30:34.000000000 +0900 +@@ -1696,6 +1696,7 @@ + + QT_CONFIG_OPTS="release" + fi ++QT_CONFIG_OPTS="$QT_CONFIG_OPTS nostrip" + + AC_ARG_ENABLE(warnings-into-error, + AC_HELP_STRING([--enable-warnings-into-error], diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml index 3088b509b74f..1d847239d5d0 100644 --- a/app-i18n/uim/metadata.xml +++ b/app-i18n/uim/metadata.xml @@ -13,6 +13,8 @@ <flag name='anthy'>Enable support for <pkg>app-i18n/anthy</pkg> input method </flag> <flag name='eb'>Enable support for <pkg>dev-libs/eb</pkg></flag> + <flag name='ffi'>Enable support for <pkg>virtual/libffi</pkg></flag> <flag name='prime'>Enable support for <pkg>app-i18n/prime</pkg></flag> + <flag name='skk'>Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag> </use> </pkgmetadata> diff --git a/app-i18n/uim/uim-1.6.0.ebuild b/app-i18n/uim/uim-1.6.0.ebuild new file mode 100644 index 000000000000..caa33697f082 --- /dev/null +++ b/app-i18n/uim/uim-1.6.0.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.6.0.ebuild,v 1.1 2010/11/08 07:10:58 matsuu Exp $ + +EAPI="3" +inherit autotools eutils multilib elisp-common flag-o-matic + +DESCRIPTION="Simple, secure and flexible input method library" +HOMEPAGE="http://code.google.com/p/uim/" +SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" + +LICENSE="BSD GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +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" + +RESTRICT="test" + +RDEPEND="X? ( + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXrender + ) + anthy? ( + unicode? ( >=app-i18n/anthy-8622 ) + !unicode? ( app-i18n/anthy ) + ) + canna? ( app-i18n/canna ) + curl? ( >=net-misc/curl-7.16.4 ) + eb? ( dev-libs/eb ) + emacs? ( virtual/emacs ) + ffi? ( virtual/libffi ) + gnome? ( >=gnome-base/gnome-panel-2.14 ) + gtk? ( >=x11-libs/gtk+-2.4:2 ) + kde? ( >=kde-base/kdelibs-4 ) + libedit? ( dev-libs/libedit ) + libnotify? ( >=x11-libs/libnotify-0.4 ) + m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) + ncurses? ( sys-libs/ncurses ) + nls? ( virtual/libintl ) + prime? ( app-i18n/prime ) + qt4? ( x11-libs/qt-gui:4[qt3support] ) + skk? ( app-i18n/skk-jisyo ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( dev-libs/openssl ) + !dev-scheme/sigscheme + !app-i18n/uim-svn + !<app-i18n/prime-0.9.4" +# >=dev-scheme/sigscheme-0.8.5 +# mana? ( app-i18n/mana ) +# scim? ( >=app-i18n/scim-1.3.0 ) # broken +# sj3? ( >=app-i18n/sj3-2.0.1.21 ) +# wnn? ( app-i18n/wnn ) + +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/gettext-0.15 + kde? ( dev-util/cmake ) + X? ( + x11-proto/xextproto + x11-proto/xproto + )" + +RDEPEND="${RDEPEND} + X? ( + media-fonts/font-sony-misc + linguas_zh_CN? ( + || ( media-fonts/font-isas-misc media-fonts/intlfonts ) + ) + linguas_zh_TW? ( + media-fonts/intlfonts + ) + linguas_ja? ( + || ( media-fonts/font-jis-misc media-fonts/intlfonts ) + ) + linguas_ko? ( + || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) + ) + )" +# test? ( dev-scheme/gauche ) + +SITEFILE=50${PN}-gentoo.el + +pkg_setup() { + # An arch specific config directory is used on multilib systems + has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" + GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/} +} + +src_prepare() { + epatch \ + "${FILESDIR}/${P}-gentoo.patch" \ + "${FILESDIR}/${PN}-1.5.4-zhTW.patch" + + # bug 275420 + sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die + eautoconf +} + +src_configure() { + local myconf + + if use gtk && (use anthy || use canna) ; then + myconf="${myconf} --enable-dict" + else + myconf="${myconf} --disable-dict" + fi + + if use gtk || use qt4 ; then + myconf="${myconf} --enable-pref" + else + myconf="${myconf} --disable-pref" + fi + + if use anthy ; then + if use unicode ; then + myconf="${myconf} --with-anthy-utf8" + else + myconf="${myconf} --with-anthy" + fi + else + myconf="${myconf} --without-anthy" + fi + + if use libnotify ; then + myconf="${myconf} --enable-notify=libnotify" + fi + + econf $(use_with X x) \ + $(use_with canna) \ + $(use_with curl) \ + $(use_with eb) \ + $(use_enable emacs) \ + $(use_with emacs lispdir "${SITELISP}") \ + $(use_with ffi) \ + $(use_enable gnome gnome-applet) \ + $(use_with gtk gtk2) \ + $(use_with libedit) \ + --disable-kde-applet \ + $(use_enable kde kde4-applet) \ + $(use_with m17n-lib m17nlib) \ + $(use_enable ncurses fep) \ + $(use_enable nls) \ + $(use_with prime) \ + --without-qt \ + --without-qt-immodule \ + $(use_with qt4 qt4) \ + $(use_with qt4 qt4-immodule) \ + $(use_with skk) \ + $(use_with sqlite sqlite3) \ + $(use_enable ssl openssl) \ + $(use_with xft) \ + ${myconf} + # $(use_enable qt4 qt4-qt3support) \ +} + +src_compile() { + emake || die "emake failed" + + if use emacs; then + cd emacs + elisp-compile *.el || die "elisp-compile failed" + fi +} + +src_install() { + # parallel make install b0rked, bug #222677 + emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die + if use emacs; then + elisp-install uim-el emacs/*.elc || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ + || die "elisp-site-file-install failed" + fi + + # collision with dev-scheme/sigscheme, bug #330975 + # find "${ED}" -name '*gcroots*' -delete || die +} + +pkg_postinst() { + elog + elog "New input method switcher has been introduced. You need to set" + elog + elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" + elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" + elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" + elog + elog "If you would like to use uim-anthy as default input method, put" + elog "(define default-im-name 'anthy)" + elog "to your ~/.uim." + elog + elog "All input methods can be found by running uim-im-switcher-gtk, " + elog "or uim-im-switcher-qt4." + elog + elog "If you upgrade from a version of uim older than 1.4.0," + elog "you should run revdep-rebuild." + + use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules" + if use emacs; then + elisp-site-regen + echo + elog "uim is autoloaded with Emacs with a minimal set of features:" + elog "There is no keybinding defined to call it directly, so please" + elog "create one yourself and choose an input method." + elog "Integration with LEIM is not done with this ebuild, please have" + elog "a look at the documentation how to achieve this." + fi +} + +pkg_postrm() { + use gtk && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules" + use emacs && elisp-site-regen +} |