Version bumped. Marked 0.3.3 stable on x86 and alpha. Removed old ebuilds.

8 files changed, 35 insertions, 119 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 0b2c50109f3a..5a7b386bea2b 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.44 2004/03/31 20:19:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.45 2004/04/07 01:21:46 usata Exp $
+
+*uim-0.3.4.1 (07 Apr 2004)
+
+  07 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> uim-0.2.4.ebuild,
+  uim-0.2.8.ebuild, uim-0.3.3.ebuild, uim-0.3.4.1.ebuild:
+  Version bumped. Marked 0.3.3 stable on x86 and alpha. Removed old ebuilds.
 
   01 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> uim-0.3.2.ebuild:
   Stable on x86 and alpha
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 5a64757f5442..42552dabc5a4 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,14 +1,16 @@
-MD5 1563053bea354145a8c78b8c5b464ced files/digest-uim-0.3.0.1 63
-MD5 7ad56353a9067b9ab9c5a01919ea6a70 files/digest-uim-0.3.2 61
-MD5 ac114af44de62a58cb42042c56a6d102 files/digest-uim-0.2.8 61
-MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
-MD5 d68e6315a5110d5a8f8ebef008f9c65e files/digest-uim-0.3.3 61
-MD5 0951d2cfbcd7f513bf069c58c96f746b files/uim-gtk24-gentoo.diff 839
-MD5 47ef2bd1b266781c77d8daa688453409 files/digest-uim-0.2.4 61
+MD5 ecb5a2abb5b64efb756eb0d6f04ef9ec uim-0.2.8.ebuild 1832
+MD5 01949c72e68d1016f89632509c215a9c uim-0.3.0.1.ebuild 1834
 MD5 a382bd6b6b23996dc5cd7d09050bf1fc ChangeLog 7615
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 01949c72e68d1016f89632509c215a9c uim-0.3.0.1.ebuild 1834
 MD5 46fa6f90b65911889569a9eeed935bab uim-0.3.2.ebuild 2072
-MD5 ecb5a2abb5b64efb756eb0d6f04ef9ec uim-0.2.8.ebuild 1832
 MD5 3c52d29c85e2f780aebe6bf23823d14e uim-0.3.3.ebuild 1828
 MD5 a19fd2d85d13710e71c931e2a85a5861 uim-0.2.4.ebuild 1724
+MD5 3c52d29c85e2f780aebe6bf23823d14e uim-0.3.4.1.ebuild 1828
+MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
+MD5 7ad56353a9067b9ab9c5a01919ea6a70 files/digest-uim-0.3.2 61
+MD5 ac114af44de62a58cb42042c56a6d102 files/digest-uim-0.2.8 61
+MD5 1563053bea354145a8c78b8c5b464ced files/digest-uim-0.3.0.1 63
+MD5 d68e6315a5110d5a8f8ebef008f9c65e files/digest-uim-0.3.3 61
+MD5 0951d2cfbcd7f513bf069c58c96f746b files/uim-gtk24-gentoo.diff 839
+MD5 47ef2bd1b266781c77d8daa688453409 files/digest-uim-0.2.4 61
+MD5 a8931fd368f09d8518fcf94a86f26df1 files/digest-uim-0.3.4.1 63
diff --git a/app-i18n/uim/files/digest-uim-0.2.4 b/app-i18n/uim/files/digest-uim-0.2.4
deleted file mode 100644
index 2e7990121859..000000000000
--- a/app-i18n/uim/files/digest-uim-0.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c8c72dd472e4c1f1225d785549bfc106 uim-0.2.4.tar.gz 643215
diff --git a/app-i18n/uim/files/digest-uim-0.2.8 b/app-i18n/uim/files/digest-uim-0.2.8
deleted file mode 100644
index efa61195a322..000000000000
--- a/app-i18n/uim/files/digest-uim-0.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bdc727d0df3466f165e0f1933e8c07ed uim-0.2.8.tar.gz 653270
diff --git a/app-i18n/uim/files/digest-uim-0.3.4.1 b/app-i18n/uim/files/digest-uim-0.3.4.1
new file mode 100644
index 000000000000..663229552bab
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.3.4.1
@@ -0,0 +1 @@
+MD5 0d21401e83c73e95533ef825fe77829c uim-0.3.4.1.tar.gz 824374
diff --git a/app-i18n/uim/uim-0.2.4.ebuild b/app-i18n/uim/uim-0.2.4.ebuild
deleted file mode 100644
index 3da551cd10ca..000000000000
--- a/app-i18n/uim/uim-0.2.4.ebuild
+++ /dev/null
@@ -1,76 +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.2.4.ebuild,v 1.7 2004/04/06 04:03:21 vapier Exp $
-
-inherit eutils
-
-IUSE="gtk nls debug"
-
-DESCRIPTION="UIM is 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"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )"
-RDEPEND="gtk? ( =x11-libs/gtk+-2.2* )
-	!app-i18n/uim-svn"
-
-# for debugging use
-use debug && RESTRICT="nostrip"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
-}
-
-src_compile() {
-
-	if [ -n "`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 && export CFLAGS="${CFLAGS} -g"
-	econf `use_enable nls` || die
-	emake || die
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README*
-}
-
-pkg_postinst() {
-
-	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	fi
-	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."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-}
-
-pkg_postrm() {
-
-	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	fi
-}
diff --git a/app-i18n/uim/uim-0.3.3.ebuild b/app-i18n/uim/uim-0.3.3.ebuild
index 88cb88d3c667..b803096ff02b 100644
--- a/app-i18n/uim/uim-0.3.3.ebuild
+++ b/app-i18n/uim/uim-0.3.3.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.3.ebuild,v 1.3 2004/04/06 04:04:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.3.ebuild,v 1.4 2004/04/07 01:21:46 usata Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://freedesktop.org/Software/UimDownload/${P}.tar.gz"
 
 LICENSE="GPL-2 | BSD"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 alpha"
 IUSE="gtk nls debug"
 
 RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
diff --git a/app-i18n/uim/uim-0.2.8.ebuild b/app-i18n/uim/uim-0.3.4.1.ebuild
index f10ecdee75d6..df47a183a6a4 100644
--- a/app-i18n/uim/uim-0.2.8.ebuild
+++ b/app-i18n/uim/uim-0.3.4.1.ebuild
@@ -1,43 +1,34 @@
 # 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.2.8.ebuild,v 1.5 2004/04/06 04:03:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.4.1.ebuild,v 1.1 2004/04/07 01:21:46 usata Exp $
 
 inherit eutils
 
-IUSE="gtk nls debug"
-
-DESCRIPTION="UIM is a simple, secure and flexible input method library"
+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"
-
-S="${WORKDIR}/${P}"
+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 )"
-RDEPEND="gtk? ( =x11-libs/gtk+-2.2* )
-	!app-i18n/uim-svn"
-
-# for debugging use
-use debug && RESTRICT="nostrip"
 
 src_unpack() {
-
 	unpack ${A}
-
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
 }
 
 src_compile() {
-
-	if [ -n "`use gtk`" ] ; then
+	if use gtk ; then
 		sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \
 			Makefile.in `echo */Makefile.in`
 	else
@@ -46,35 +37,29 @@ src_compile() {
 		sed -i -e "/^SUBDIRS/s/gtk//" Makefile.in
 	fi
 
-	use debug && export CFLAGS="${CFLAGS} -g"
+	use debug && append-flags -g
 	econf `use_enable nls` || die
 	emake || die
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README*
+	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 and make sure you have"
 	einfo ">=dev-libs/suikyo-1.3.0."
 	einfo
+	ewarn "If you are upgrading from uim-0.3.1 and using uim-skk, please check your"
+	ewarn "~/.skk-uim-jisyo and remove katakana index entry if any."
 
-	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	fi
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }
 
 pkg_postrm() {
-
-	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	fi
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }