Version bumped. Ebuilds cleanup.

11 files changed, 22 insertions, 265 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 3cb4e847a4ee..2dcfba45289c 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.16 2004/06/20 15:31:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.17 2004/06/20 17:53:49 usata Exp $
+
+*scim-0.99.0 (21 Jun 2004)
+
+  21 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> +scim-0.99.0.ebuild,
+  -scim-0.99.0_pre20040614.ebuild, -scim-0.99.0_pre20040616.ebuild,
+  -scim-0.99.0_pre20040619.ebuild, -scim-0.99.0_pre20040620.ebuild:
+  Version bumped. Ebuilds cleanup.
 
 *scim-0.99.0_pre20040620 (21 Jun 2004)
 
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 05f95a665afe..bb097096a1ef 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -2,16 +2,10 @@ MD5 0366eb72cb9de759bffbfd4e0905dcd6 scim-0.9.7.ebuild 2141
 MD5 017a675d36baf7c6881248ac0bb08b44 scim-0.8.2.ebuild 1413
 MD5 f5b96067b5b55434fa9d595a10be7b95 ChangeLog 2795
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 bef415d52158581151f5ff91322fa4bf scim-0.99.0_pre20040614.ebuild 2371
-MD5 28b3b67980c8a22ab4fd16e090c5c763 scim-0.99.0_pre20040616.ebuild 2371
 MD5 fb64042d9a706ce6955e32a9bbe668aa scim-0.9.6.ebuild 2124
-MD5 8d6b069ac13228809c125cfbcc36ee31 scim-0.99.0_pre20040619.ebuild 2524
-MD5 8664cc14604b5725913f07a4216881f3 scim-0.99.0_pre20040620.ebuild 2512
+MD5 495dde590cdaa03b64b648bdd485a90d scim-0.99.0.ebuild 2437
 MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
 MD5 4b50ec45c69e938123b22d03e8049859 files/digest-scim-0.9.7 63
 MD5 43039c7f8ce06975e2c209d220dda81d files/digest-scim-0.8.2 63
-MD5 3fb63387b5b993fdc2a408a77adc452a files/digest-scim-0.99.0_pre20040614 73
-MD5 20674680ea4e4fc75c11d2899f2e46cd files/digest-scim-0.99.0_pre20040616 73
+MD5 522e889e7885640a41a00906202be96d files/digest-scim-0.99.0 64
 MD5 04cde4e146722fc34da8aa1c56c1b2e0 files/digest-scim-0.9.6 63
-MD5 28187595166a59de35b126b6ede3bcd0 files/digest-scim-0.99.0_pre20040619 73
-MD5 f8bbf3b14ac38ba0ad2b63a28be9eb9d files/digest-scim-0.99.0_pre20040620 72
diff --git a/app-i18n/scim/files/digest-scim-0.99.0 b/app-i18n/scim/files/digest-scim-0.99.0
new file mode 100644
index 000000000000..0ed63ea2aa75
--- /dev/null
+++ b/app-i18n/scim/files/digest-scim-0.99.0
@@ -0,0 +1 @@
+MD5 a2e72cd36193037268273285f40f0d1f scim-0.99.0.tar.gz 1945436
diff --git a/app-i18n/scim/files/digest-scim-0.99.0_pre20040614 b/app-i18n/scim/files/digest-scim-0.99.0_pre20040614
deleted file mode 100644
index 70101cfe67ec..000000000000
--- a/app-i18n/scim/files/digest-scim-0.99.0_pre20040614
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90d1feb80c3fd9b98dd29ba084449d18 scim-0.99.0-20040614.tar.gz 1370916
diff --git a/app-i18n/scim/files/digest-scim-0.99.0_pre20040616 b/app-i18n/scim/files/digest-scim-0.99.0_pre20040616
deleted file mode 100644
index 697449da95f4..000000000000
--- a/app-i18n/scim/files/digest-scim-0.99.0_pre20040616
+++ /dev/null
@@ -1 +0,0 @@
-MD5 225294e461272190ca806fb98d5b1939 scim-0.99.0-20040616.tar.gz 1385705
diff --git a/app-i18n/scim/files/digest-scim-0.99.0_pre20040619 b/app-i18n/scim/files/digest-scim-0.99.0_pre20040619
deleted file mode 100644
index b1b860392835..000000000000
--- a/app-i18n/scim/files/digest-scim-0.99.0_pre20040619
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9677da032cb8ec338980985213e0b5db scim-0.99.0-20040619.tar.gz 1533240
diff --git a/app-i18n/scim/files/digest-scim-0.99.0_pre20040620 b/app-i18n/scim/files/digest-scim-0.99.0_pre20040620
deleted file mode 100644
index b56400de0fb4..000000000000
--- a/app-i18n/scim/files/digest-scim-0.99.0_pre20040620
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15bc0d196f5d8d7aacaf01f69c913ce5 scim-0.99.0-20040620.tar.gz 903617
diff --git a/app-i18n/scim/scim-0.99.0_pre20040620.ebuild b/app-i18n/scim/scim-0.99.0.ebuild
index 932dbd9bcd3a..2a8935e8598c 100644
--- a/app-i18n/scim/scim-0.99.0_pre20040620.ebuild
+++ b/app-i18n/scim/scim-0.99.0.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.99.0_pre20040620.ebuild,v 1.1 2004/06/20 15:31:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.99.0.ebuild,v 1.1 2004/06/20 17:53:49 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"
-SRC_URI="mirror://gentoo/${P/_pre/-}.tar.gz
-	http://dev.gentoo.org/~usata/distfiles/${P/_pre/-}.tar.gz"
-S="${WORKDIR}/scim-lib"
+SRC_URI="http://freedesktop.org/~suzhe/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,13 +20,15 @@ RDEPEND="virtual/x11
 	>=x11-libs/gtk+-2
 	>=dev-libs/atk-1
 	>=x11-libs/pango-1
-	>=dev-libs/glib-2"
+	>=dev-libs/glib-2
+	!<app-i18n/scim-chinese-0.4.0"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	sys-devel/autoconf
 	sys-devel/automake"
-PDEPEND="app-i18n/scim-uim
-	app-i18n/scim-m17n"
+PDEPEND="|| ( app-i18n/scim-m17n
+		app-i18n/scim-uim
+		app-i18n/scim-tables )"
 
 ELTCONF="--reverse-deps"
 SCROLLKEEPER_UPDATE="0"
@@ -40,8 +39,9 @@ src_unpack() {
 	# 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"
+	#cd ${S}
+	#./bootstrap || die "bootstrap failed"
+
 	# workaround for problematic makefile
 	sed -i -e "s:^\(scim.*LDFLAGS.*\):\1 -ldl:g" \
 		${S}/src/Makefile.* || die
@@ -70,7 +70,7 @@ pkg_postinst() {
 	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 -e uim,m17n -c simple -d"
+	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
diff --git a/app-i18n/scim/scim-0.99.0_pre20040614.ebuild b/app-i18n/scim/scim-0.99.0_pre20040614.ebuild
deleted file mode 100644
index 099682d5fb94..000000000000
--- a/app-i18n/scim/scim-0.99.0_pre20040614.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.99.0_pre20040614.ebuild,v 1.1 2004/06/14 17:45:18 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"
-SRC_URI="mirror://gentoo/${P/_pre/-}.tar.gz"
-S="${WORKDIR}/scim-lib-${PV#*_pre}"
-
-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.8 )
-	>=x11-libs/gtk+-2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	>=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-PDEPEND="app-i18n/scim-uim
-	app-i18n/scim-m17n"
-
-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
-	# workaround for problematic makefile
-	sed -i -e "s:^\(scim_LDFLAGS.*\):\1 -ldl:" ${S}/src/Makefile.in
-	sed -i -e "s:^\(scim_config_agent_LDFLAGS = .*\):\1 -ldl:" ${S}/src/Makefile.in
-	sed -i -e "s:^\(scim_make_table_LDFLAGS.*\):\1 -ldl:" ${S}/modules/IMEngine/Makefile.in
-	sed -i -e "s:^LDFLAGS = :LDFLAGS = -ldl :" ${S}/tests/Makefile.in
-	sed -i -e "s:GTK_VERSION=2.3.5:GTK_VERSION=2.4.0:" ${S}/configure
-}
-
-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 -e uim,m17n -c simple -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
-}
diff --git a/app-i18n/scim/scim-0.99.0_pre20040616.ebuild b/app-i18n/scim/scim-0.99.0_pre20040616.ebuild
deleted file mode 100644
index e4a2bcadf255..000000000000
--- a/app-i18n/scim/scim-0.99.0_pre20040616.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.99.0_pre20040616.ebuild,v 1.1 2004/06/17 11:39:17 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"
-SRC_URI="mirror://gentoo/${P/_pre/-}.tar.gz"
-S="${WORKDIR}/scim-lib-${PV#*_pre}"
-
-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.8 )
-	>=x11-libs/gtk+-2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	>=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-PDEPEND="app-i18n/scim-uim
-	app-i18n/scim-m17n"
-
-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
-	# workaround for problematic makefile
-	sed -i -e "s:^\(scim_LDFLAGS.*\):\1 -ldl:" ${S}/src/Makefile.in
-	sed -i -e "s:^\(scim_config_agent_LDFLAGS = .*\):\1 -ldl:" ${S}/src/Makefile.in
-	sed -i -e "s:^\(scim_make_table_LDFLAGS.*\):\1 -ldl:" ${S}/modules/IMEngine/Makefile.in
-	sed -i -e "s:^LDFLAGS = :LDFLAGS = -ldl :" ${S}/tests/Makefile.in
-	sed -i -e "s:GTK_VERSION=2.3.5:GTK_VERSION=2.4.0:" ${S}/configure
-}
-
-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 -e uim,m17n -c simple -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
-}
diff --git a/app-i18n/scim/scim-0.99.0_pre20040619.ebuild b/app-i18n/scim/scim-0.99.0_pre20040619.ebuild
deleted file mode 100644
index 9be09e636f6a..000000000000
--- a/app-i18n/scim/scim-0.99.0_pre20040619.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-0.99.0_pre20040619.ebuild,v 1.1 2004/06/20 02:15:25 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"
-SRC_URI="mirror://gentoo/${P/_pre/-}.tar.gz
-	http://dev.gentoo.org/~usata/distfiles/${P/_pre/-}.tar.gz"
-S="${WORKDIR}/scim-lib-${PV#*_pre}"
-
-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.8 )
-	>=x11-libs/gtk+-2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	>=dev-libs/glib-2"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/autoconf
-	sys-devel/automake"
-PDEPEND="app-i18n/scim-uim
-	app-i18n/scim-m17n"
-
-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 -e uim,m17n -c simple -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
-}