Version bumped. Added to ~alpha. Removed old ebuild.

6 files changed, 95 insertions, 54 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index c4ed788b465c..35775136fb7a 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.18 2004/06/24 21:53:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.19 2004/06/26 10:19:28 usata Exp $
+
+*scim-0.99.1 (26 Jun 2004)
+
+  26 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> -scim-0.8.2.ebuild,
+  +scim-0.99.1.ebuild:
+  Version bumped. Added to ~alpha. Removed old ebuild.
 
 *scim-0.99.0 (21 Jun 2004)
 
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 6e68aa43e560..9b4fc0983924 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,3 +1,4 @@
+MD5 7ffdb3c3f989eda8cb9a4edf435c658f scim-0.99.1.ebuild 2420
 MD5 4503313fbeafc4c09fb58b7da43c24d1 scim-0.9.6.ebuild 2119
 MD5 7ffdb3c3f989eda8cb9a4edf435c658f scim-0.99.0.ebuild 2420
 MD5 bb51689296fc111e549c56931e72fe9a scim-0.8.2.ebuild 1403
@@ -6,6 +7,7 @@ MD5 bf2c62f4a71dcd189797124d624c0334 ChangeLog 3060
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
 MD5 522e889e7885640a41a00906202be96d files/digest-scim-0.99.0 64
+MD5 af2bb44400f5691ab07923518e85b5a3 files/digest-scim-0.99.1 64
 MD5 43039c7f8ce06975e2c209d220dda81d files/digest-scim-0.8.2 63
 MD5 04cde4e146722fc34da8aa1c56c1b2e0 files/digest-scim-0.9.6 63
 MD5 4b50ec45c69e938123b22d03e8049859 files/digest-scim-0.9.7 63
diff --git a/app-i18n/scim/files/digest-scim-0.8.2 b/app-i18n/scim/files/digest-scim-0.8.2
deleted file mode 100644
index c85800f3ab47..000000000000
--- a/app-i18n/scim/files/digest-scim-0.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b45348b2fe48811d4d6b8aaaa1a68b63 scim-0.8.2.tar.gz 1309071
diff --git a/app-i18n/scim/files/digest-scim-0.99.1 b/app-i18n/scim/files/digest-scim-0.99.1
new file mode 100644
index 000000000000..5b94cddbc6cc
--- /dev/null
+++ b/app-i18n/scim/files/digest-scim-0.99.1
@@ -0,0 +1 @@
+MD5 98042ab330fa4fa8eb37808181fc0015 scim-0.99.1.tar.gz 1946928
diff --git a/app-i18n/scim/scim-0.8.2.ebuild b/app-i18n/scim/scim-0.8.2.ebuild
deleted file mode 100644
index 19272540735c..000000000000
--- a/app-i18n/scim/scim-0.8.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.8.2.ebuild,v 1.5 2004/06/24 21:53:20 agriffis Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) is a Input Method (IM) development platform"
-HOMEPAGE="http://www.turbolinux.com.cn/~suzhe/scim/"
-SRC_URI="http://www.turbolinux.com.cn/~suzhe/scim/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="gnome"
-
-RDEPEND="virtual/x11
-	gnome? ( >=gnome-base/gconf-1.2
-		>=dev-libs/libxml2-2.5
-		>=gnome-base/ORBit2-2
-		>=net-libs/linc-0.5 )
-	>=x11-libs/gtk+-2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	>=dev-libs/glib-2"
-
-PDEPEND=">=app-i18n/scim-tables-0.3.0"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-ELTCONF="--reverse-deps"
-G2CONF="${G2CONF} `use_enable gnome config-gconf`"
-SCROLLKEEPER_UPDATE="0"
-
-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
-	cd ${S}/src
-	sed -i	-e "s:^\(scim_LDFLAGS.*\):\1 -ldl:" Makefile.in
-	cd ${S}/modules/Server
-	sed -i	-e "s:^\(scim_make_table_LDFLAGS.*\):\1 -ldl:" Makefile.in
-}
-
-src_install() {
-	gnome2_src_install || die "install failed"
-	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
-	dohtml -r docs/html/*
-}
-
-
diff --git a/app-i18n/scim/scim-0.99.1.ebuild b/app-i18n/scim/scim-0.99.1.ebuild
new file mode 100644
index 000000000000..03d998ab5146
--- /dev/null
+++ b/app-i18n/scim/scim-0.99.1.ebuild
@@ -0,0 +1,85 @@
+# 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.1.ebuild,v 1.1 2004/06/26 10:19:28 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"
+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-chinese-0.4.0"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+PDEPEND="|| ( app-i18n/scim-m17n
+		app-i18n/scim-uim
+		app-i18n/scim-tables )"
+
+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 -f socket -ne socket -d"
+	einfo "LANG='your_language' scim -f x11 -e socket -c socket -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
+
+	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
+}