Version bumped. Marked 0.99.4 stable.

6 files changed, 117 insertions, 22 deletions

diff --git a/app-i18n/scim-tables/Manifest b/app-i18n/scim-tables/Manifest
index 8ee8f859332c..6aa39c227408 100644
--- a/app-i18n/scim-tables/Manifest
+++ b/app-i18n/scim-tables/Manifest
@@ -1,6 +1,8 @@
-MD5 e1ae04cbf9df992aa2b81c6047aecb22 scim-tables-0.4.0.ebuild 704
-MD5 51cf3ddcad0aae73fadc0d2a4249357b ChangeLog 2403
+MD5 babed3504afe02690a405c30d4f24961 ChangeLog 2532
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 478098402fa6ebf67c4962b4dfe3bbfb scim-tables-0.3.5.ebuild 696
-MD5 006044b089b0a67e08bd1eaf60f6e901 files/digest-scim-tables-0.4.0 70
+MD5 e1ae04cbf9df992aa2b81c6047aecb22 scim-tables-0.4.0.ebuild 704
+MD5 013e8ceb77c579bd42b9f9f0723130bc scim-tables-0.4.1.ebuild 706
 MD5 987a151995d448b5141b853c617ba74f files/digest-scim-tables-0.3.5 70
+MD5 006044b089b0a67e08bd1eaf60f6e901 files/digest-scim-tables-0.4.0 70
+MD5 a5eeb2aff54f0dfee4699685231ea261 files/digest-scim-tables-0.4.1 70
diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 5244e4b007ab..09fd35936b02 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.27 2004/08/09 18:58:30 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.28 2004/08/14 00:04:26 usata Exp $
+
+*scim-0.99.6 (14 Aug 2004)
+
+  14 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> scim-0.99.4.ebuild,
+  +scim-0.99.6.ebuild:
+  Version bumped. Marked 0.99.4 stable.
 
   09 Aug 2004; Tom Martin <slarti@gentoo.org> scim-0.99.5.ebuild:
   Marked ~amd64, bug 55845
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index a45fdbf69abe..7fa129fee77c 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 401f74ee91549cb2b8b2e9039afc1af9 ChangeLog 4498
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 dcf626221ffc7742b7a5c83803cfd430 scim-0.9.7.ebuild 2151
+MD5 ef63b0419970e3b59a79f7d653de6c82 scim-0.99.6.ebuild 2698
 MD5 8923e0ef3cfbb665222b60a8abcb42bc scim-0.99.3.ebuild 2689
+MD5 a01f0eabb8a49dcdb99bbe8be20abc1c scim-0.99.4.ebuild 2689
 MD5 472210936c4ee29d30b8d1f260576982 scim-0.99.5.ebuild 2699
-MD5 dcf626221ffc7742b7a5c83803cfd430 scim-0.9.7.ebuild 2151
-MD5 be64a2d654dac81296b57cb005216386 scim-0.99.4.ebuild 2691
-MD5 01d73058b186a520ef184bc8939f8b48 ChangeLog 4338
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
+MD5 4b50ec45c69e938123b22d03e8049859 files/digest-scim-0.9.7 63
+MD5 bd9ce46bfdc925e2a828879c00f545e4 files/digest-scim-0.99.6 64
 MD5 b71588a9e8ece4902533e78661265621 files/digest-scim-0.99.3 64
+MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
 MD5 cad55398c8797ef251c08810752d1c8e files/digest-scim-0.99.4 64
 MD5 ad856b4133ee70fef385843ce408c9a4 files/digest-scim-0.99.5 64
-MD5 4b50ec45c69e938123b22d03e8049859 files/digest-scim-0.9.7 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBF8u2CHk4+ZoBpvsRArw7AJ9/L4CkA8hUzRz5y5T5mW9vDLWiGQCgqfct
-E/u1n46bAhG1jpnOWK6fZ1I=
-=iRpq
------END PGP SIGNATURE-----
diff --git a/app-i18n/scim/files/digest-scim-0.99.6 b/app-i18n/scim/files/digest-scim-0.99.6
new file mode 100644
index 000000000000..90414cdaa0d8
--- /dev/null
+++ b/app-i18n/scim/files/digest-scim-0.99.6
@@ -0,0 +1 @@
+MD5 df8c165c4340427ac57687c141fc36b2 scim-0.99.6.tar.gz 2254643
diff --git a/app-i18n/scim/scim-0.99.4.ebuild b/app-i18n/scim/scim-0.99.4.ebuild
index eb2cb5c6861f..ae0503511f65 100644
--- a/app-i18n/scim/scim-0.99.4.ebuild
+++ b/app-i18n/scim/scim-0.99.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.99.4.ebuild,v 1.2 2004/08/03 18:41:23 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.99.4.ebuild,v 1.3 2004/08/14 00:04:26 usata Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://freedesktop.org/~suzhe/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 alpha"
 IUSE="gnome"
 
 RDEPEND="virtual/x11
diff --git a/app-i18n/scim/scim-0.99.6.ebuild b/app-i18n/scim/scim-0.99.6.ebuild
new file mode 100644
index 000000000000..91f030dc7d36
--- /dev/null
+++ b/app-i18n/scim/scim-0.99.6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.99.6.ebuild,v 1.1 2004/08/14 00:04:27 usata Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Smart Common Input Method (SCIM) is a Input Method (IM) development platform"
+HOMEPAGE="http://freedesktop.org/~suzhe/"
+SRC_URI="http://freedesktop.org/~suzhe/sources/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64"
+IUSE="gnome"
+
+RDEPEND="virtual/x11
+	gnome? ( >=gnome-base/gconf-1.2
+		>=dev-libs/libxml2-2.5
+		>=gnome-base/ORBit2-2.8 )
+	>=x11-libs/gtk+-2
+	>=dev-libs/atk-1
+	>=x11-libs/pango-1
+	>=dev-libs/glib-2
+	!app-i18n/scim-cvs
+	!<app-i18n/scim-chinese-0.4.0"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+PDEPEND="|| ( app-i18n/scim-m17n
+		app-i18n/scim-uim
+		>=app-i18n/scim-tables-0.4.0 )"
+
+ELTCONF="--reverse-deps"
+SCROLLKEEPER_UPDATE="0"
+USE_DESTDIR="1"
+
+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
+
+	#cd ${S}
+	#./bootstrap || die "bootstrap failed"
+
+	# 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"
+	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 "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
+
+	gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm() {
+
+	gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules
+}