Version bumped. Fix for uim-anthy. Added flag-o-matic.

9 files changed, 28 insertions, 110 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 5a7b386bea2b..3150774bb4aa 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.45 2004/04/07 01:21:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.46 2004/04/07 10:19:09 usata Exp $
+
+*uim-0.3.4.2 (07 Apr 2004)
+
+  07 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> uim-0.3.2.ebuild,
+  uim-0.3.3.ebuild, uim-0.3.4.2.ebuild:
+  Version bumped. Fix for uim-anthy. Added flag-o-matic.
 
 *uim-0.3.4.1 (07 Apr 2004)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 70b5799969d2..e215099db2f8 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,12 +1,14 @@
-MD5 01949c72e68d1016f89632509c215a9c uim-0.3.0.1.ebuild 1834
-MD5 505c406746e7ef29becb534a3f5ab4a0 ChangeLog 7846
-MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 46fa6f90b65911889569a9eeed935bab uim-0.3.2.ebuild 2072
 MD5 73e2a9c44f1efefda11fb9f71bff35a5 uim-0.3.3.ebuild 1825
+MD5 cae153e33b0d9822c5390db487c7d8ca uim-0.3.4.2.ebuild 1829
+MD5 46fa6f90b65911889569a9eeed935bab uim-0.3.2.ebuild 2072
+MD5 505c406746e7ef29becb534a3f5ab4a0 ChangeLog 7846
 MD5 cae153e33b0d9822c5390db487c7d8ca uim-0.3.4.1.ebuild 1829
+MD5 01949c72e68d1016f89632509c215a9c uim-0.3.0.1.ebuild 1834
+MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
+MD5 0951d2cfbcd7f513bf069c58c96f746b files/uim-gtk24-gentoo.diff 839
 MD5 7ad56353a9067b9ab9c5a01919ea6a70 files/digest-uim-0.3.2 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 1563053bea354145a8c78b8c5b464ced files/digest-uim-0.3.0.1 63
 MD5 a8931fd368f09d8518fcf94a86f26df1 files/digest-uim-0.3.4.1 63
+MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
diff --git a/app-i18n/uim/files/digest-uim-0.3.0.1 b/app-i18n/uim/files/digest-uim-0.3.0.1
deleted file mode 100644
index d9864416dc8e..000000000000
--- a/app-i18n/uim/files/digest-uim-0.3.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6801eb907dc7b33d2c4d9bd9e8079c4 uim-0.3.0.1.tar.gz 788117
diff --git a/app-i18n/uim/files/digest-uim-0.3.4.1 b/app-i18n/uim/files/digest-uim-0.3.4.1
deleted file mode 100644
index 663229552bab..000000000000
--- a/app-i18n/uim/files/digest-uim-0.3.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d21401e83c73e95533ef825fe77829c uim-0.3.4.1.tar.gz 824374
diff --git a/app-i18n/uim/files/digest-uim-0.3.4.2 b/app-i18n/uim/files/digest-uim-0.3.4.2
new file mode 100644
index 000000000000..53cbdd2c83b5
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.3.4.2
@@ -0,0 +1 @@
+MD5 f7f614845a872e1de46de0540388649a uim-0.3.4.2.tar.gz 824389
diff --git a/app-i18n/uim/uim-0.3.0.1.ebuild b/app-i18n/uim/uim-0.3.0.1.ebuild
deleted file mode 100644
index 038f8988587f..000000000000
--- a/app-i18n/uim/uim-0.3.0.1.ebuild
+++ /dev/null
@@ -1,80 +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.0.1.ebuild,v 1.5 2004/04/06 04:03:34 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"
-
-S="${WORKDIR}/${P}"
-
-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() {
-
-	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
-
-	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	fi
-}
-
-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.2.ebuild b/app-i18n/uim/uim-0.3.2.ebuild
index 6e97e9f5e126..015c36f24510 100644
--- a/app-i18n/uim/uim-0.3.2.ebuild
+++ b/app-i18n/uim/uim-0.3.2.ebuild
@@ -1,8 +1,8 @@
 # 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.2.ebuild,v 1.5 2004/04/06 04:03:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.2.ebuild,v 1.6 2004/04/07 10:19:09 usata Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 IUSE="gtk nls debug"
 
@@ -49,7 +49,7 @@ 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
 }
@@ -66,20 +66,17 @@ 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 "To use uim-prime you should emerge app-i18n/prime."
 	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
+		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 	fi
 }
 
 pkg_postrm() {
 
 	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+		gtk-query-immodules-2.0 > ${ROOT}/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 b803096ff02b..d7a302ebace6 100644
--- a/app-i18n/uim/uim-0.3.3.ebuild
+++ b/app-i18n/uim/uim-0.3.3.ebuild
@@ -1,8 +1,8 @@
 # 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.4 2004/04/07 01:21:46 usata Exp $
+# $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
+inherit eutils flag-o-matic
 
 DESCRIPTION="a simple, secure and flexible input method library"
 HOMEPAGE="http://uim.freedesktop.org/"
@@ -51,11 +51,8 @@ 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 "To use uim-prime you should emerge app-i18n/prime."
 	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."
 
 	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }
diff --git a/app-i18n/uim/uim-0.3.4.1.ebuild b/app-i18n/uim/uim-0.3.4.2.ebuild
index df47a183a6a4..200376b79718 100644
--- a/app-i18n/uim/uim-0.3.4.1.ebuild
+++ b/app-i18n/uim/uim-0.3.4.2.ebuild
@@ -1,8 +1,8 @@
 # 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.1.ebuild,v 1.1 2004/04/07 01:21:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.4.2.ebuild,v 1.1 2004/04/07 10:19:09 usata Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="a simple, secure and flexible input method library"
 HOMEPAGE="http://uim.freedesktop.org/"
@@ -51,11 +51,8 @@ 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 "To use uim-prime you should emerge app-i18n/prime."
 	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."
 
 	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
 }