Version bumped.

(Portage version: 2.0.51.22-r1)

8 files changed, 20 insertions, 128 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index a659343444f1..e16753f83c9a 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.65 2005/06/17 20:31:41 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.66 2005/06/18 15:47:20 usata Exp $
+
+*scim-1.3.1 (18 Jun 2005)
+
+  18 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> -scim-1.0.2.ebuild,
+  -scim-1.2.1.ebuild, scim-1.2.3.ebuild, +scim-1.3.1.ebuild:
+  Version bumped.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> scim-1.2.2.ebuild:
   Stable on ppc.
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 17a65cd34dab..c8075910bc04 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,15 +1,13 @@
-MD5 7e0a9fd036262c62a63f805e2669944d scim-1.2.0.ebuild 2489
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 54c8cd33cca380dbfa2c46b0fa27958d scim-1.2.2.ebuild 2595
+MD5 4e247dcf723a177ff0cb63558393d492 scim-1.2.3.ebuild 2598
 MD5 84358fb280d8190bc49975034c0be795 ChangeLog 9481
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 7e0a9fd036262c62a63f805e2669944d scim-1.2.0.ebuild 2489
+MD5 50cafdc2f8953a363c32d909e9c4356b scim-1.3.1.ebuild 2608
 MD5 50cafdc2f8953a363c32d909e9c4356b scim-1.3.0.ebuild 2608
-MD5 4e247dcf723a177ff0cb63558393d492 scim-1.2.3.ebuild 2598
-MD5 0e0a7413cf59150da462f5e1c9d6384d scim-1.0.2.ebuild 3172
-MD5 c6b1364b529201a0f41f5862dbb74697 scim-1.2.1.ebuild 2595
+MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
 MD5 84ed66110ce84283b196dd1a5c918400 files/digest-scim-1.2.0 63
-MD5 99b3eee4a8cc881197b9b4ecb14a60d4 files/digest-scim-1.2.3 63
-MD5 25e3b9780cc08a1a0913829ec829ed1f files/digest-scim-1.2.1 63
 MD5 d0dc438b971197894dc1b298d2101311 files/digest-scim-1.2.2 63
-MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
+MD5 5bff3f4db560d307ec7a44ad06bc9b0f files/digest-scim-1.3.1 63
+MD5 99b3eee4a8cc881197b9b4ecb14a60d4 files/digest-scim-1.2.3 63
 MD5 73e036752da810bff56db45dc7542fa7 files/digest-scim-1.3.0 63
-MD5 5b9acefad166f2f6e0a8635ceadc9d08 files/digest-scim-1.0.2 63
diff --git a/app-i18n/scim/files/digest-scim-1.0.2 b/app-i18n/scim/files/digest-scim-1.0.2
deleted file mode 100644
index 38fc46b45fdf..000000000000
--- a/app-i18n/scim/files/digest-scim-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa31acc70b8fc98f6874a4fa67745142 scim-1.0.2.tar.gz 2403219
diff --git a/app-i18n/scim/files/digest-scim-1.2.1 b/app-i18n/scim/files/digest-scim-1.2.1
deleted file mode 100644
index 026c4b55b829..000000000000
--- a/app-i18n/scim/files/digest-scim-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88469118178df981f992a673e0378ab2 scim-1.2.1.tar.gz 2281804
diff --git a/app-i18n/scim/files/digest-scim-1.3.1 b/app-i18n/scim/files/digest-scim-1.3.1
new file mode 100644
index 000000000000..5081666553aa
--- /dev/null
+++ b/app-i18n/scim/files/digest-scim-1.3.1
@@ -0,0 +1 @@
+MD5 8b7d7b4b2e3c4948bc09a94ebc508667 scim-1.3.1.tar.gz 2548021
diff --git a/app-i18n/scim/scim-1.0.2.ebuild b/app-i18n/scim/scim-1.0.2.ebuild
deleted file mode 100644
index f70e658746ac..000000000000
--- a/app-i18n/scim/scim-1.0.2.ebuild
+++ /dev/null
@@ -1,111 +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.0.2.ebuild,v 1.3 2005/02/10 11:43:05 usata Exp $
-
-inherit gnome2 eutils
-
-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="x86 ~alpha ppc ~amd64 ~sparc ppc64"
-IUSE="gnome 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
-	gnome? ( >=gnome-base/gconf-1.2
-		>=dev-libs/libxml2-2.5
-		>=gnome-base/orbit-2.8 )
-	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"
-
-ELTCONF="--reverse-deps"
-SCROLLKEEPER_UPDATE="0"
-USE_DESTDIR="1"
-
-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_unpack() {
-	unpack ${A}
-	# use scim gtk2 IM module only for chinese/japanese/korean
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.6.1-gtk2immodule.patch
-
-	# workaround for problematic makefile
-	sed -i -e "s:^\(scim.*LDFLAGS.*\):\1 -ldl:g" \
-		${S}/src/Makefile.* || die
-	sed -i -e "s:^\(scim_make_table_LDFLAGS.*\):\1 -ldl:" \
-		${S}/modules/IMEngine/Makefile.* || die
-	sed -i -e "s:^LDFLAGS = :LDFLAGS = -ldl :g" \
-		-e "s:^\(test.*LDFLAGS.*\):\1 -ldl:g" \
-		${S}/tests/Makefile.* || die
-	sed -i -e "s:GTK_VERSION=2.3.5:GTK_VERSION=2.4.0:" \
-		${S}/configure || die
-}
-
-src_compile() {
-	use gnome || G2CONF="${G2CONF} --disable-config-gconf"
-	use gtk || use immqt || use immqt-bc || G2CONF="${G2CONF} --disable-panel-gtk --disable-setup-ui"
-	has_gtk || G2CONF="${G2CONF} --disable-gtk2-immodule"
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install || die "install failed"
-	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-chinese"
-	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
-
-	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.2.3.ebuild b/app-i18n/scim/scim-1.2.3.ebuild
index 412a6f7b7943..7124a3ab2957 100644
--- a/app-i18n/scim/scim-1.2.3.ebuild
+++ b/app-i18n/scim/scim-1.2.3.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.2.3.ebuild,v 1.1 2005/05/27 15:42:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.2.3.ebuild,v 1.2 2005/06/18 15:47:20 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="x86 ~alpha ~ppc ~amd64 ~sparc ~ppc64"
 IUSE="gtk immqt immqt-bc"
 
 GTK_DEPEND=">=x11-libs/gtk+-2
diff --git a/app-i18n/scim/scim-1.2.1.ebuild b/app-i18n/scim/scim-1.3.1.ebuild
index 3bca3dec6d94..ad7d3f379d58 100644
--- a/app-i18n/scim/scim-1.2.1.ebuild
+++ b/app-i18n/scim/scim-1.3.1.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.2.1.ebuild,v 1.6 2005/05/22 14:34:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.3.1.ebuild,v 1.1 2005/06/18 15:47:20 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="~x86 ~alpha ~ppc ~amd64 ~sparc ~ppc64"
 IUSE="gtk immqt immqt-bc"
 
 GTK_DEPEND=">=x11-libs/gtk+-2
@@ -82,7 +82,7 @@ pkg_postinst() {
 	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 "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
 	ewarn
 	epause 10