Version bumped. Marked previous versions stable

8 files changed, 52 insertions, 26 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 1079ff743068..5aeb225f258e 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.25 2003/12/08 13:57:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.26 2003/12/21 17:45:20 usata Exp $
+
+*uim-0.2.1 (22 Dec 2003)
+
+  22 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> uim-0.1.6.ebuild,
+  uim-0.1.7.ebuild, uim-0.2.0.ebuild, uim-0.2.1.ebuild,
+  files/uim-gtk-query-immodules-gentoo.diff:
+  Version bumped. Marked previous versions stable
 
 *uim-0.2.0 (08 Dec 2003)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index c34b6a923b1c..304c03322d9b 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,12 +1,11 @@
-MD5 b03a7db881ae2f4d76fb02002aa6f473 uim-0.2.0.ebuild 1398
-MD5 10f3795b4491329e7e64c03dfa45938c uim-0.1.6.ebuild 1340
-MD5 bcaaea03ab512c907a65caa91755d734 ChangeLog 4760
-MD5 fab04a1c860c01aafc12062468aea845 uim-0.1.7.ebuild 1398
-MD5 9974ec194b98cb97726683a9003adaac uim-0.2.1.ebuild 1406
+MD5 4d691921b72fd778498d82047bf17819 uim-0.2.0.ebuild 1396
+MD5 477448d30eb7ca67ee1c18bba5daa264 ChangeLog 5005
+MD5 b89308571caffbe1e4365803a61ab10e uim-0.1.7.ebuild 1396
+MD5 c8478004ee59ea02f22f187990a5dd1f uim-0.2.1.ebuild 1375
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 306e247b1cf63fc4153d697929ba5841 uim-0.1.3.ebuild 1349
 MD5 483765c64e409739665f68ce2c1fd722 files/digest-uim-0.2.0 61
-MD5 afcdfd3abc1e5cc12e2e4f1145baa41b files/digest-uim-0.1.6 61
 MD5 a1bc71ee3b455fd9b36cff079d30273e files/digest-uim-0.1.7 61
 MD5 3da6b58778418098f64abeb161f3b87b files/digest-uim-0.2.1 61
+MD5 0fdfd1869aaa7c8db627be05519051ce files/uim-gtk-query-immodules-gentoo.diff 709
 MD5 57f40f2a13e2ff92133d174e5b170b2f files/digest-uim-0.1.3 61
diff --git a/app-i18n/uim/files/digest-uim-0.1.6 b/app-i18n/uim/files/digest-uim-0.1.6
deleted file mode 100644
index 59f894eb4efc..000000000000
--- a/app-i18n/uim/files/digest-uim-0.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f6a72ed278e8b3ef756a5daa0595b093 uim-0.1.6.tar.gz 568670
diff --git a/app-i18n/uim/files/digest-uim-0.2.1 b/app-i18n/uim/files/digest-uim-0.2.1
new file mode 100644
index 000000000000..a6239192ab9e
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.2.1
@@ -0,0 +1 @@
+MD5 8c651e1d0c40a5d1ee52604fb0dce439 uim-0.2.1.tar.gz 643518
diff --git a/app-i18n/uim/files/uim-gtk-query-immodules-gentoo.diff b/app-i18n/uim/files/uim-gtk-query-immodules-gentoo.diff
new file mode 100644
index 000000000000..8eac36b6dc4a
--- /dev/null
+++ b/app-i18n/uim/files/uim-gtk-query-immodules-gentoo.diff
@@ -0,0 +1,17 @@
+diff -urN uim-0.2.1.ORIG/gtk/Makefile.in uim-0.2.1/gtk/Makefile.in
+--- uim-0.2.1.ORIG/gtk/Makefile.in	2003-12-21 23:58:14.000000000 +0900
++++ uim-0.2.1/gtk/Makefile.in	2003-12-22 02:24:26.000000000 +0900
+@@ -535,11 +535,11 @@
+ 
+ @GTK2_TRUE@install-data-hook:
+ @GTK2_TRUE@	if test -f $(GTK_IMMODULES); then \
+-@GTK2_TRUE@	gtk-query-immodules-2.0 > $(GTK_IMMODULES); \
++@GTK2_TRUE@	gtk-query-immodules-2.0 > ${DESTDIR}/$(GTK_IMMODULES); \
+ @GTK2_TRUE@	fi
+ @GTK2_TRUE@uninstall-hook:
+ @GTK2_TRUE@	if test -f $(GTK_IMMODULES); then \
+-@GTK2_TRUE@	gtk-query-immodules-2.0 > $(GTK_IMMODULES); \
++@GTK2_TRUE@	gtk-query-immodules-2.0 > ${DESTDIR}/$(GTK_IMMODULES); \
+ @GTK2_TRUE@	fi
+ @GTK2_FALSE@install-data-hook:
+ 
diff --git a/app-i18n/uim/uim-0.1.7.ebuild b/app-i18n/uim/uim-0.1.7.ebuild
index f59fec9aca55..1ea20938d58a 100644
--- a/app-i18n/uim/uim-0.1.7.ebuild
+++ b/app-i18n/uim/uim-0.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.7.ebuild,v 1.1 2003/12/01 11:09:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.1.7.ebuild,v 1.2 2003/12/21 17:45:20 usata Exp $
 
 IUSE="gtk nls debug"
 
@@ -10,7 +10,7 @@ SRC_URI="http://freedesktop.org/Software/uim/${P}.tar.gz"
 
 LICENSE="GPL-2 | BSD"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 alpha"
 
 S="${WORKDIR}/${P}"
 
diff --git a/app-i18n/uim/uim-0.2.0.ebuild b/app-i18n/uim/uim-0.2.0.ebuild
index af1687d7ba59..996111649ed7 100644
--- a/app-i18n/uim/uim-0.2.0.ebuild
+++ b/app-i18n/uim/uim-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.0.ebuild,v 1.1 2003/12/08 13:57:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.0.ebuild,v 1.2 2003/12/21 17:45:20 usata Exp $
 
 IUSE="gtk nls debug"
 
@@ -10,7 +10,7 @@ SRC_URI="http://freedesktop.org/Software/uim/${P}.tar.gz"
 
 LICENSE="GPL-2 | BSD"
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 alpha"
 
 S="${WORKDIR}/${P}"
 
diff --git a/app-i18n/uim/uim-0.1.6.ebuild b/app-i18n/uim/uim-0.2.1.ebuild
index 719fee2348bb..025d0f9970b0 100644
--- a/app-i18n/uim/uim-0.1.6.ebuild
+++ b/app-i18n/uim/uim-0.2.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2003 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.6.ebuild,v 1.2 2003/12/01 11:09:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.1.ebuild,v 1.1 2003/12/21 17:45:20 usata Exp $
 
 IUSE="gtk nls debug"
 
 DESCRIPTION="UIM is a simple, secure and flexible input method library"
 HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="http://freedesktop.org/Software/uim/${P}.tar.gz"
+SRC_URI="http://freedesktop.org/Software/UimDownload/${P}.tar.gz"
 
 LICENSE="GPL-2 | BSD"
 SLOT="0"
-KEYWORDS="x86 alpha"
+KEYWORDS="~x86 ~alpha"
 
 S="${WORKDIR}/${P}"
 
@@ -21,7 +21,13 @@ RDEPEND="gtk? ( >=x11-libs/gtk+-2 )"
 # 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() {
 
@@ -41,21 +47,18 @@ src_compile() {
 
 src_install () {
 
-	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README*
-}
+	if [ "`use gtk`" ] ; then
+		dodir /etc/gtk-2.0
+	fi
 
-pkg_postinst() {
+	make DESTDIR=${D} install || die
 
-	if [ -f ${GTK_IMMODULES} ] ; then
-		gtk-query-immodules-2.0 > ${GTK_IMMODULES}
-	fi
+	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README*
 }
 
 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
 }