Version bumped. Removed old ebuilds and marked 0.3.6 stable.

8 files changed, 20 insertions, 86 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index cc77e6edb868..4972462793b7 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.50 2004/05/05 17:49:44 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.51 2004/05/18 05:43:59 usata Exp $
+
+*uim-0.3.8 (18 May 2004)
+
+  18 May 2004; Mamoru KOMACHI <usata@gentoo.org> uim-0.3.3.ebuild,
+  uim-0.3.4.2.ebuild, uim-0.3.6.ebuild, uim-0.3.8.ebuild:
+  Version bumped. Removed old ebuilds and marked 0.3.6 stable.
 
 *uim-0.3.6 (06 May 2004)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index c5cca11b59f3..b58d090df111 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,9 +1,7 @@
-MD5 8daba43fc64c91042bc4c83641edc2e6 uim-0.3.4.2.ebuild 1643
-MD5 dd8dfccd1dd4eb37957629aa8499c1df ChangeLog 8580
+MD5 78d5e0236e890dae97805286a0c5dda6 uim-0.3.8.ebuild 1464
+MD5 46ceeb29ca3407b3f8cba0edfad9dc7d ChangeLog 8795
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 03a14ab0294b990bfe1f02257e5a685a uim-0.3.6.ebuild 1464
-MD5 b49f2b50980bbbe2a8519b71fe2854f0 uim-0.3.3.ebuild 1634
+MD5 cf3da54dfcde43c97a77a410890b6d7c uim-0.3.6.ebuild 1461
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
 MD5 61774220fdc56646570cfd34624dfda2 files/digest-uim-0.3.6 61
-MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
-MD5 d68e6315a5110d5a8f8ebef008f9c65e files/digest-uim-0.3.3 61
+MD5 7bdf9e0d0dc5497df9b2df4d8d730674 files/digest-uim-0.3.8 61
diff --git a/app-i18n/uim/files/digest-uim-0.3.3 b/app-i18n/uim/files/digest-uim-0.3.3
deleted file mode 100644
index 65378b079370..000000000000
--- a/app-i18n/uim/files/digest-uim-0.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8efb5a44b7f7ef246b52a3887d3dc1a uim-0.3.3.tar.gz 815632
diff --git a/app-i18n/uim/files/digest-uim-0.3.4.2 b/app-i18n/uim/files/digest-uim-0.3.4.2
deleted file mode 100644
index 53cbdd2c83b5..000000000000
--- a/app-i18n/uim/files/digest-uim-0.3.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7f614845a872e1de46de0540388649a uim-0.3.4.2.tar.gz 824389
diff --git a/app-i18n/uim/files/digest-uim-0.3.8 b/app-i18n/uim/files/digest-uim-0.3.8
new file mode 100644
index 000000000000..4e06183f92ea
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.3.8
@@ -0,0 +1 @@
+MD5 b8c16431b55db500e317fcf0598b8ea5 uim-0.3.8.tar.gz 895255
diff --git a/app-i18n/uim/uim-0.3.3.ebuild b/app-i18n/uim/uim-0.3.3.ebuild
deleted file mode 100644
index d7a302ebace6..000000000000
--- a/app-i18n/uim/uim-0.3.3.ebuild
+++ /dev/null
@@ -1,62 +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/uim/uim-0.3.3.ebuild,v 1.5 2004/04/07 10:19:09 usata Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="a simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://freedesktop.org/Software/UimDownload/${P}.tar.gz"
-
-LICENSE="GPL-2 | BSD"
-SLOT="0"
-KEYWORDS="x86 alpha"
-IUSE="gtk nls debug"
-
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
-	!app-i18n/uim-svn"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
-}
-
-src_compile() {
-	if use gtk ; then
-		sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \
-			Makefile.in `echo */Makefile.in`
-	else
-		sed -i -e "s:@GTK2_TRUE@:#:g" -e "s:@GTK2_FALSE@::g" \
-			Makefile.in `echo */Makefile.in`
-		sed -i -e "/^SUBDIRS/s/gtk//" Makefile.in
-	fi
-
-	use debug && append-flags -g
-	econf `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo (uim doesn't support skkserv)."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
diff --git a/app-i18n/uim/uim-0.3.6.ebuild b/app-i18n/uim/uim-0.3.6.ebuild
index 4522cbfec055..a6d62b1d9990 100644
--- a/app-i18n/uim/uim-0.3.6.ebuild
+++ b/app-i18n/uim/uim-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.6.ebuild,v 1.1 2004/05/05 17:49:44 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.6.ebuild,v 1.2 2004/05/18 05:43:59 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://freedesktop.org/Software/UimDownload/${P}.tar.gz"
 
 LICENSE="GPL-2 | BSD"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc"
+KEYWORDS="x86 alpha ppc"
 IUSE="gtk nls debug"
 
 RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
diff --git a/app-i18n/uim/uim-0.3.4.2.ebuild b/app-i18n/uim/uim-0.3.8.ebuild
index 75ba35171c7d..6ea3a0a92d8b 100644
--- a/app-i18n/uim/uim-0.3.4.2.ebuild
+++ b/app-i18n/uim/uim-0.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.4.2.ebuild,v 1.2 2004/04/07 12:13:35 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.8.ebuild,v 1.1 2004/05/18 05:43:59 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -28,22 +28,15 @@ src_unpack() {
 }
 
 src_compile() {
-	if use gtk ; then
-		sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \
-			Makefile.in `echo */Makefile.in`
-	else
-		sed -i -e "s:@GTK2_TRUE@:#:g" -e "s:@GTK2_FALSE@::g" \
-			Makefile.in `echo */Makefile.in`
-		sed -i -e "/^SUBDIRS/s/gtk//" Makefile.in
-	fi
 
 	use debug && append-flags -g
-	econf `use_enable nls` || die
-	emake || die
+	econf `use_enable nls` \
+		`use_with gtk gtk2` || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
 }
 
@@ -51,7 +44,7 @@ pkg_postinst() {
 	einfo
 	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
 	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo (uim doesn't support skkserv)."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
+	einfo "To use uim-prime you should emerge >=app-i18n/prime-0.8."
 	einfo
 
 	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules