Restore =uim-1.4.2 for app-i18n/scim-uim.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 151 insertions, 2 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 37111625078c..8c65b4d5961a 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,9 @@
 # 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.219 2010/02/04 16:33:10 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.220 2010/03/22 18:35:26 ssuominen Exp $
+
+  22 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +uim-1.4.2.ebuild:
+  Restore =uim-1.4.2 for app-i18n/scim-uim.
 
 *uim-1.5.7-r1 (04 Feb 2010)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index e56e8cdafd05..a3f403f0b692 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -6,11 +6,13 @@ 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-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
+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 5379 RMD160 8b2ae20f3c3f78397d2bbeb0b4a12ae8f104bbc8 SHA1 299e4a451f8eef7e46ea8d0ce078dbb40787e564 SHA256 e607ba17e742bdfafebad662c5b7cc9ed25d7687a83994700fac94911c04fdaa
 EBUILD uim-1.5.7.ebuild 5293 RMD160 ab406cce3bc4fa00c80331a928e312dcf2e9c107 SHA1 e270178e81d8b42ff7316f6544260d1e838262db SHA256 20e5c8a455c7c4da4d4c5ca57541e6bdf00c975abd673bbe9310aa86203c8d01
-MISC ChangeLog 30730 RMD160 47ba4b72952a61a035c47a456dd284903dd9dba6 SHA1 f791ab957b02c8e393c6cd90e33e9080c9a6541e SHA256 afb2fe589c59fba5a204f057ef765372f564b00f5a072c37804aadc4c2d96694
+MISC ChangeLog 30851 RMD160 9268b24ce36c5aa2ef8bd43201f2eaa52958cade SHA1 aea8c7f3e58fedae459d8df1ed5a831fac9ab0c3 SHA256 91d0c5c53c71b161bc0857532a4b241878f73ff26ae8e0acb56988e6e478d574
 MISC metadata.xml 815 RMD160 012fd0ff539fa5f7d943f2b2b955af2b1a51579f SHA1 1c035765a6908e1b767689d899a68876e44dc772 SHA256 a1f64b1559c0291cb60d8783c53482f9235f03802984816c827255f92d171d5e
diff --git a/app-i18n/uim/uim-1.4.2.ebuild b/app-i18n/uim/uim-1.4.2.ebuild
new file mode 100644
index 000000000000..c33bb3b0d199
--- /dev/null
+++ b/app-i18n/uim/uim-1.4.2.ebuild
@@ -0,0 +1,144 @@
+# 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.4.2.ebuild,v 1.15 2010/03/22 18:35:26 ssuominen Exp $
+
+EAPI=1
+inherit 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"
+IUSE="anthy canna eb emacs gnome gtk libedit m17n-lib ncurses nls prime X linguas_zh_CN linguas_ja linguas_ko"
+
+RDEPEND="X? ( x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender )
+	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
+	canna? ( app-i18n/canna )
+	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
+	gnome? ( >=gnome-base/gnome-panel-2.14 )
+	gtk? ( >=x11-libs/gtk+-2.4 )
+	libedit? ( dev-libs/libedit )
+	m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( virtual/libintl )
+	prime? ( app-i18n/prime )
+	!app-i18n/uim-svn
+	!<app-i18n/prime-0.9.4"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto
+		x11-proto/xproto )"
+
+RDEPEND="${RDEPEND}
+	X? (
+		media-fonts/font-sony-misc
+		linguas_zh_CN? ( media-fonts/font-isas-misc )
+		linguas_ja? ( media-fonts/font-jis-misc )
+		linguas_ko? ( media-fonts/font-daewoo-misc )
+	)"
+#		linguas_zh_TW? ( media-fonts/taipeifonts )
+
+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_compile() {
+	local myconf
+
+	if use gtk && (use anthy || use canna); then
+		myconf="${myconf} --enable-dict"
+	else
+		myconf="${myconf} --disable-dict"
+	fi
+
+	if use gtk; then
+		myconf="${myconf} --enable-pref"
+	else
+		myconf="${myconf} --disable-pref"
+	fi
+
+	econf $(use_with X x) \
+		$(use_with anthy) \
+		$(use_with canna) \
+		$(use_with eb) \
+		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
+		$(use_enable gnome gnome-applet) \
+		$(use_with gtk gtk2) \
+		$(use_with libedit) \
+		--disable-kde-applet \
+		$(use_with m17n-lib m17nlib) \
+		$(use_enable ncurses fep) \
+		$(use_enable nls) \
+		--without-qt \
+		--without-qt-immodule \
+		${myconf}
+	emake -j1 || die "emake failed"
+
+	if use emacs; then
+		cd emacs
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog* NEWS README RELNOTE
+	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
+}
+
+pkg_postinst() {
+	elog
+	elog "To use uim-skk you should emerge app-i18n/skk-jisyo."
+	elog
+
+	elog
+	elog "New input method switcher has been introduced. You need to set"
+	elog
+	elog "% GTK_IM_MODULE=uim ; export GTK_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
+	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
+}