Stable on x86.

Package-Manager: portage-1.589-cvs

4 files changed, 17 insertions, 105 deletions

diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 48cd3af847e6..000d4d74098f 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,12 +1,20 @@
-MD5 4ccb50876b8b690cd906e2e802216e37 scim-1.2.2.ebuild 2593
-MD5 3e398fadef8dc667849e18d5c4f75e35 scim-1.4.2.ebuild 2766
-MD5 7301ddde378c8e3080f8246752268ece scim-1.2.3.ebuild 2594
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 384819251bb49eed2a451eb55356f10b ChangeLog 11312
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 da9127a01f569fefe5d56ba16e0ac2e3 scim-1.3.3.ebuild 2766
 MD5 08577eabe6b6c3a756ccec5e37c6baa0 scim-1.4.1.ebuild 2762
-MD5 d0dc438b971197894dc1b298d2101311 files/digest-scim-1.2.2 63
-MD5 99b3eee4a8cc881197b9b4ecb14a60d4 files/digest-scim-1.2.3 63
-MD5 82eea24cbbcb316453e8ba41d946532d files/digest-scim-1.3.3 63
+MD5 7301ddde378c8e3080f8246752268ece scim-1.2.3.ebuild 2594
+MD5 da9127a01f569fefe5d56ba16e0ac2e3 scim-1.3.3.ebuild 2766
+MD5 418d304d0f115f7f435094cf0dbcbb89 scim-1.4.2.ebuild 2765
 MD5 dd0aa4fefdd378f8a2e4fee1d27863fd files/digest-scim-1.4.1 63
+MD5 99b3eee4a8cc881197b9b4ecb14a60d4 files/digest-scim-1.2.3 63
 MD5 42cc5b9e5b9e0e4cb2fb6ab3c1d19a8f files/digest-scim-1.4.2 63
+MD5 82eea24cbbcb316453e8ba41d946532d files/digest-scim-1.3.3 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDO5J/1u6irqznjogRAlCrAJ0TnGUKeRgoGbyXq+Jtwn1pOWLQPwCfWD6V
+GxQnSY3fPDJa3b9JLUAQluQ=
+=hlIJ
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/scim/files/digest-scim-1.2.2 b/app-i18n/scim/files/digest-scim-1.2.2
deleted file mode 100644
index 85a87515f6b0..000000000000
--- a/app-i18n/scim/files/digest-scim-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 933c6ef4df156d05994a35d48cb90374 scim-1.2.2.tar.gz 2347254
diff --git a/app-i18n/scim/scim-1.2.2.ebuild b/app-i18n/scim/scim-1.2.2.ebuild
deleted file mode 100644
index 9993480977d1..000000000000
--- a/app-i18n/scim/scim-1.2.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.2.2.ebuild,v 1.6 2005/07/31 04:59:55 usata Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
-IUSE="gtk immqt immqt-bc"
-
-GTK_DEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	>=dev-libs/glib-2"
-RDEPEND="virtual/x11
-	gtk? ( ${GTK_DEPEND} )
-	immqt? ( ${GTK_DEPEND} )
-	immqt-bc? ( ${GTK_DEPEND} )
-	!app-i18n/scim-cvs
-	!<app-i18n/scim-chinese-0.4.0"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-has_gtk() {
-	if has_version '>=x11-libs/gtk+-2' ; then
-		true
-	else
-		false
-	fi
-}
-
-get_gtk_confdir() {
-	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
-	fi
-}
-
-src_compile() {
-	# bug #83625
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	use gtk || use immqt || use immqt-bc || myconf="${myconf} --disable-panel-gtk --disable-setup-ui"
-	has_gtk || myconf="${myconf} --disable-gtk2-immodule"
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
-	dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use SCIM with both GTK2 and XIM, you should use the following"
-	einfo "in your user startup scripts such as .gnomerc or .xinitrc:"
-	einfo
-	einfo "LANG='your_language' scim -d"
-	einfo "export XMODIFIERS=@im=SCIM"
-	einfo
-	einfo "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
-	einfo "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
-	einfo
-	einfo "If you prefer KDE/Qt interface, try emerge app-i18n/skim."
-	einfo
-	einfo "To use Chinese input methods:"
-	einfo "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
-	einfo "To use Korean input methods:"
-	einfo "	# emerge app-i18n/scim-hangul"
-	einfo "To use Japanese input methods:"
-	einfo "	# emerge app-i18n/scim-uim"
-	einfo "To use various input methods (more than 30 languages):"
-	einfo "	# emerge app-i18n/scim-m17n"
-	einfo
-	ewarn
-	ewarn "If you are upgrading from scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-	epause 10
-
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
-}
-
-pkg_postrm() {
-
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
-}
diff --git a/app-i18n/scim/scim-1.4.2.ebuild b/app-i18n/scim/scim-1.4.2.ebuild
index bf82f5439969..01399787e088 100644
--- a/app-i18n/scim/scim-1.4.2.ebuild
+++ b/app-i18n/scim/scim-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.2.ebuild,v 1.1 2005/08/17 10:26:14 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.2.ebuild,v 1.2 2005/09/29 07:22:10 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~sparc ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk immqt immqt-bc"
 
 GTK_DEPEND=">=x11-libs/gtk+-2