update patch from app-i18n/uim.

4 files changed, 40 insertions, 33 deletions

diff --git a/app-i18n/uim-svn/ChangeLog b/app-i18n/uim-svn/ChangeLog
index 7c828d228d41..826b796964c3 100644
--- a/app-i18n/uim-svn/ChangeLog
+++ b/app-i18n/uim-svn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/uim-svn
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.3 2004/01/28 09:44:54 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.4 2004/04/05 14:36:15 hattya Exp $
+
+  05 Apr 2004; Akinori Hattori <hattya@gentoo.org> uim-svn-20040124.ebuild,
+  files/uim-svn-gtk-query-immodules-gentoo.diff:
+  update patch from app-i18n/uim.
 
   28 Jan 2004; Akinori Hattori <hattya@gentoo.org uim-svn-20040124.ebuild:
   Blocks app-i18n/uim.
diff --git a/app-i18n/uim-svn/Manifest b/app-i18n/uim-svn/Manifest
index 948bbf15bc21..970c3d665d42 100644
--- a/app-i18n/uim-svn/Manifest
+++ b/app-i18n/uim-svn/Manifest
@@ -1,5 +1,5 @@
-MD5 6e0e2fa3a4002b594e7d9ab88084c4d0 ChangeLog 594
+MD5 bbe6f373b11b7bf7c984ba0979ae727d ChangeLog 754
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 3db51cc69ca73f6b1d3d8fc2cbb185b4 uim-svn-20040124.ebuild 1707
+MD5 e3189e4b0a4280cd40f5cd9980237e69 uim-svn-20040124.ebuild 1640
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-uim-svn-20040124 0
-MD5 0fdfd1869aaa7c8db627be05519051ce files/uim-svn-gtk-query-immodules-gentoo.diff 709
+MD5 43709db248e2be1d40952ce99d3cae00 files/uim-svn-gtk-query-immodules-gentoo.diff 552
diff --git a/app-i18n/uim-svn/files/uim-svn-gtk-query-immodules-gentoo.diff b/app-i18n/uim-svn/files/uim-svn-gtk-query-immodules-gentoo.diff
index 8eac36b6dc4a..99df5672eab1 100644
--- a/app-i18n/uim-svn/files/uim-svn-gtk-query-immodules-gentoo.diff
+++ b/app-i18n/uim-svn/files/uim-svn-gtk-query-immodules-gentoo.diff
@@ -1,17 +1,23 @@
-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 @@
+diff -urN uim-0.3.3.ORIG/gtk/Makefile.am uim-0.3.3/gtk/Makefile.am
+--- uim-0.3.3.ORIG/gtk/Makefile.am	2004-03-20 05:29:48.000000000 +0900
++++ uim-0.3.3/gtk/Makefile.am	2004-03-22 03:08:58.709699312 +0900
+@@ -19,16 +19,12 @@
+ IM_UIM_SOURCES = gtk-im-uim.c
  
- @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:
+ install-data-hook:
+-	if test -f $(GTK_IMMODULES); then \
+-	gtk-query-immodules-2.0 > $(GTK_IMMODULES); \
+-	fi
++
+ uninstall-hook:
+-	if test -f $(GTK_IMMODULES); then \
+-	gtk-query-immodules-2.0 > $(GTK_IMMODULES); \
+-	fi
++
+ else
+ install-data-hook:
  
+- uninstall-hook:
++uninstall-hook:
+ 
+ endif
diff --git a/app-i18n/uim-svn/uim-svn-20040124.ebuild b/app-i18n/uim-svn/uim-svn-20040124.ebuild
index 2636db222a41..729d6af1669c 100644
--- a/app-i18n/uim-svn/uim-svn-20040124.ebuild
+++ b/app-i18n/uim-svn/uim-svn-20040124.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-svn/uim-svn-20040124.ebuild,v 1.3 2004/01/28 09:44:54 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20040124.ebuild,v 1.4 2004/04/05 14:36:15 hattya Exp $
 
 inherit subversion
 
@@ -11,12 +11,11 @@ HOMEPAGE="http://anthy.sourceforge.jp/"
 SRC_URI=""
 ESVN_REPO_URI="http://freedesktop.org:8080/svn/uim/trunk"
 ESVN_BOOTSTRAP="autogen.sh"
+ESVN_PATCHES="*.diff"
 
 LICENSE="GPL-2 | BSD"
-SLOT="0"
 KEYWORDS="~x86"
-
-S="${WORKDIR}/${P}"
+SLOT="0"
 
 DEPEND="${RDEPEND}
 	dev-lang/perl
@@ -31,8 +30,6 @@ use debug && RESTRICT="nostrip"
 
 src_compile() {
 
-	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
-
 	if [ -n "`use gtk`" ] ; then
 		sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \
 			Makefile.in `echo */Makefile.in`
@@ -45,31 +42,31 @@ src_compile() {
 	use debug && export CFLAGS="${CFLAGS} -g"
 	econf `use_enable nls` || die
 	emake || die
+
 }
 
 src_install () {
 
-	if [ "`use gtk`" ] ; then
-		dodir /etc/gtk-2.0
-	fi
-
 	make DESTDIR=${D} install || die
 
-	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README*
+	dodoc [A-Z][A-Z]* ChangeLog* doc/[A-Z0-9][A-Z0-9]*
+
 }
 
 pkg_postinst() {
 
+	use gtk && gtk-query-immodules-2.0 > /etc/gtk-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."
 	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
+	use gtk && gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+
 }