Version bumped; bug #77199.

(Portage version: 2.0.51-r15)

5 files changed, 109 insertions, 10 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 215bbe44bc78..3be0c4d64364 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.47 2005/02/05 12:55:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.48 2005/02/10 11:43:05 usata Exp $
+
+*scim-1.1.3 (10 Feb 2005)
+
+  10 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> scim-1.0.2.ebuild,
+  +scim-1.1.3.ebuild:
+  Version bumped; bug #77199.
 
   05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> scim-1.0.1-r1.ebuild:
   stable on amd64.
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 4ccb98748b0e..f7073b3e2c82 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,9 +1,11 @@
 MD5 3d6280a59a7ae3d91070c423317184d3 scim-1.0.1-r1.ebuild 3309
-MD5 53527b9ec63dc93e33eefbecbb5e7e3f scim-1.0.2.ebuild 3302
 MD5 0e59787dc1a51927db73ca84d3eb26d3 ChangeLog 7469
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 34f1e8bc32e1771f8d4670e36d3d8dc3 scim-1.0.1.ebuild 3123
+MD5 53527b9ec63dc93e33eefbecbb5e7e3f scim-1.0.2.ebuild 3302
+MD5 89cb1f9652ad5453f596f9fb6b9efbba scim-1.1.3.ebuild 2599
 MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
-MD5 2a235919f3066c4ffddb3f693ab8c0ce files/digest-scim-1.0.1-r1 63
 MD5 2a235919f3066c4ffddb3f693ab8c0ce files/digest-scim-1.0.1 63
+MD5 2a235919f3066c4ffddb3f693ab8c0ce files/digest-scim-1.0.1-r1 63
 MD5 5b9acefad166f2f6e0a8635ceadc9d08 files/digest-scim-1.0.2 63
+MD5 3dc49b9a8538f1ff713548928e05154b files/digest-scim-1.1.3 63
diff --git a/app-i18n/scim/files/digest-scim-1.1.3 b/app-i18n/scim/files/digest-scim-1.1.3
new file mode 100644
index 000000000000..46b28371a2a7
--- /dev/null
+++ b/app-i18n/scim/files/digest-scim-1.1.3
@@ -0,0 +1 @@
+MD5 cc76c6974ab965089d67ce92c911fec5 scim-1.1.3.tar.gz 2219273
diff --git a/app-i18n/scim/scim-1.0.2.ebuild b/app-i18n/scim/scim-1.0.2.ebuild
index da700ef9464a..f70e658746ac 100644
--- a/app-i18n/scim/scim-1.0.2.ebuild
+++ b/app-i18n/scim/scim-1.0.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.0.2.ebuild,v 1.2 2005/02/05 09:45:46 corsair Exp $
+# $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
 
@@ -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="gnome gtk immqt immqt-bc"
 
 GTK_DEPEND=">=x11-libs/gtk+-2
@@ -28,11 +28,6 @@ RDEPEND="virtual/x11
 	!<app-i18n/scim-chinese-0.4.0"
 DEPEND="${RDEPEND}
 	dev-lang/perl"
-PDEPEND="|| ( app-i18n/scim-m17n
-		app-i18n/scim-uim
-		app-i18n/scim-chinese
-		app-i18n/scim-hangul
-		app-i18n/scim-tables )"
 
 ELTCONF="--reverse-deps"
 SCROLLKEEPER_UPDATE="0"
diff --git a/app-i18n/scim/scim-1.1.3.ebuild b/app-i18n/scim/scim-1.1.3.ebuild
new file mode 100644
index 000000000000..6588a9ac3681
--- /dev/null
+++ b/app-i18n/scim/scim-1.1.3.ebuild
@@ -0,0 +1,95 @@
+# 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.1.3.ebuild,v 1.1 2005/02/10 11:43:05 usata Exp $
+
+inherit 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"
+
+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() {
+	use gnome || myconf="${myconf} --disable-config-gconf"
+	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-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
+	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
+}