Version bumped, closing bug #43263

5 files changed, 39 insertions, 12 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index b855d85a60a6..226eeccc5c35 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.37 2004/02/23 13:32:33 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.38 2004/02/29 14:55:55 usata Exp $
+
+*uim-0.3.1 (29 Feb 2004)
+
+  29 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> uim-0.3.1.ebuild:
+  Version bumped, closing bug #43263
 
 *uim-0.3.0.1 (23 Feb 2004)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 66d9a8dca0ba..be1aa12c15cb 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -3,9 +3,11 @@ MD5 f956885f70c21c1979de0f6fc6306a8f uim-0.3.0.1.ebuild 1871
 MD5 fb8b8edcb76deb59041eb9144ec055ce ChangeLog 6458
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 d1faaaeb72a9e66405a0f71ba4c4982d uim-0.1.3.ebuild 1368
+MD5 f956885f70c21c1979de0f6fc6306a8f uim-0.3.1.ebuild 1871
 MD5 29f1217aa21b6f67f9624adf8e1e71f1 uim-0.2.4.ebuild 1694
 MD5 0fdfd1869aaa7c8db627be05519051ce files/uim-gtk-query-immodules-gentoo.diff 709
 MD5 57f40f2a13e2ff92133d174e5b170b2f files/digest-uim-0.1.3 61
 MD5 ac114af44de62a58cb42042c56a6d102 files/digest-uim-0.2.8 61
 MD5 1563053bea354145a8c78b8c5b464ced files/digest-uim-0.3.0.1 63
+MD5 6e146fc17c03211151e18ac2dcb9b6f3 files/digest-uim-0.3.1 61
 MD5 47ef2bd1b266781c77d8daa688453409 files/digest-uim-0.2.4 61
diff --git a/app-i18n/uim/files/digest-uim-0.1.3 b/app-i18n/uim/files/digest-uim-0.1.3
deleted file mode 100644
index 9d17bec116f1..000000000000
--- a/app-i18n/uim/files/digest-uim-0.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5f0253c9805d58a7dbf7902fa7bd8ce uim-0.1.3.tar.gz 558432
diff --git a/app-i18n/uim/files/digest-uim-0.3.1 b/app-i18n/uim/files/digest-uim-0.3.1
new file mode 100644
index 000000000000..e771e751db51
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.3.1
@@ -0,0 +1 @@
+MD5 e22d733957f765c3aab421c4d26867d5 uim-0.3.1.tar.gz 812942
diff --git a/app-i18n/uim/uim-0.1.3.ebuild b/app-i18n/uim/uim-0.3.1.ebuild
index df0caecae657..130339ce8ee3 100644
--- a/app-i18n/uim/uim-0.1.3.ebuild
+++ b/app-i18n/uim/uim-0.3.1.ebuild
@@ -1,28 +1,37 @@
 # 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.1.3.ebuild,v 1.5 2004/01/27 09:23:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.1.ebuild,v 1.1 2004/02/29 14:55:56 usata Exp $
 
 IUSE="gtk nls debug"
 
 DESCRIPTION="UIM is a simple, secure and flexible input method library"
 HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/6572/${P}.tar.gz"
+SRC_URI="http://freedesktop.org/Software/UimDownload/${P}.tar.gz"
 
 LICENSE="GPL-2 | BSD"
 SLOT="0"
-KEYWORDS="x86 alpha ppc sparc"
+KEYWORDS="~x86 ~alpha"
 
 S="${WORKDIR}/${P}"
 
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+	dev-lang/perl
+	dev-perl/XML-Parser
+	>=sys-apps/sed-4
+	nls? ( sys-devel/gettext )"
 RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
 	!app-i18n/uim-svn"
 
 # for debugging use
 use debug && RESTRICT="nostrip"
 
-GTK_IMMODULES=/etc/gtk-2.0/gtk.immodules
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
+}
 
 src_compile() {
 
@@ -42,21 +51,32 @@ src_compile() {
 
 src_install () {
 
-	einstall || die
+	if [ "`use gtk`" ] ; then
+		dodir /etc/gtk-2.0
+	fi
+
+	make DESTDIR=${D} install || die
 
 	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README*
 }
 
 pkg_postinst() {
 
-	if [ -f ${GTK_IMMODULES} ] ; then
-		gtk-query-immodules-2.0 > ${GTK_IMMODULES}
+	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 [ -f ${GTK_IMMODULES} ] ; then
-		gtk-query-immodules-2.0 > ${GTK_IMMODULES}
+	if [ "`use gtk`" ] ; then
+		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
 	fi
 }