Added m17n-lib IUSE flag. Removed old version.

5 files changed, 29 insertions, 15 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 28d8c9acfee0..4ab8d5a4e055 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.56 2004/06/15 04:36:20 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.57 2004/06/16 04:23:09 usata Exp $
+
+*uim-0.3.9-r2 (16 Jun 2004)
+
+  16 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> -uim-0.3.6.ebuild,
+  +uim-0.3.9-r2.ebuild:
+  Added m17n-lib IUSE flag. Removed old version.
 
   15 Jun 2004; <matsuu@gentoo.org> uim-0.3.9-r1.ebuild:
   Added ~sparc to KEYWORDS.
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index b1957a7bdf08..40b5a1865124 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,13 +1,13 @@
-MD5 c4351e615f17cb9cac2d3c550381f0df ChangeLog 9413
-MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 3980253e6c80957dc5b6971d9dc4709c uim-0.3.9.ebuild 1470
+MD5 8529922d77858914e9440f14eaff39d1 uim-0.3.9-r1.ebuild 1651
 MD5 4a96e3961625fb0b32789e5a7c810e03 uim-0.3.8.ebuild 1468
 MD5 4594464a4ddde59451b5ce455c96abbd uim-0.3.4.2.ebuild 1639
-MD5 95dd21349c58d75f3ad619d7d85dc156 uim-0.3.6.ebuild 1460
-MD5 8529922d77858914e9440f14eaff39d1 uim-0.3.9-r1.ebuild 1651
-MD5 d815d9c3b5979e781fe0522731ee7ff6 files/digest-uim-0.3.9 61
-MD5 d815d9c3b5979e781fe0522731ee7ff6 files/digest-uim-0.3.9-r1 61
+MD5 21877ee9b1922caadb29e4f0dcd04187 ChangeLog 9554
+MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
+MD5 899b497b6ec0a81c2cea252e4adc52b8 uim-0.3.9-r2.ebuild 1710
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
-MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
-MD5 61774220fdc56646570cfd34624dfda2 files/digest-uim-0.3.6 61
+MD5 d815d9c3b5979e781fe0522731ee7ff6 files/digest-uim-0.3.9-r1 61
+MD5 d815d9c3b5979e781fe0522731ee7ff6 files/digest-uim-0.3.9-r2 61
 MD5 7bdf9e0d0dc5497df9b2df4d8d730674 files/digest-uim-0.3.8 61
+MD5 d815d9c3b5979e781fe0522731ee7ff6 files/digest-uim-0.3.9 61
+MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
diff --git a/app-i18n/uim/files/digest-uim-0.3.6 b/app-i18n/uim/files/digest-uim-0.3.6
deleted file mode 100644
index 786399b9a5d1..000000000000
--- a/app-i18n/uim/files/digest-uim-0.3.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbba7f3a19ced8fbdf1cbbe8c4890cfe uim-0.3.6.tar.gz 845243
diff --git a/app-i18n/uim/files/digest-uim-0.3.9-r2 b/app-i18n/uim/files/digest-uim-0.3.9-r2
new file mode 100644
index 000000000000..4b44783a811f
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.3.9-r2
@@ -0,0 +1 @@
+MD5 79a0ab78fe2806476d25b2c913fd6480 uim-0.3.9.tar.gz 903960
diff --git a/app-i18n/uim/uim-0.3.6.ebuild b/app-i18n/uim/uim-0.3.9-r2.ebuild
index a6d62b1d9990..a31088f10a19 100644
--- a/app-i18n/uim/uim-0.3.6.ebuild
+++ b/app-i18n/uim/uim-0.3.9-r2.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.6.ebuild,v 1.2 2004/05/18 05:43:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.9-r2.ebuild,v 1.1 2004/06/16 04:23:09 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,10 +10,12 @@ SRC_URI="http://freedesktop.org/Software/UimDownload/${P}.tar.gz"
 
 LICENSE="GPL-2 | BSD"
 SLOT="0"
-KEYWORDS="x86 alpha ppc"
-IUSE="gtk nls debug"
+KEYWORDS="~x86 ~alpha"
+IUSE="gtk nls debug X m17n-lib"
 
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+RDEPEND="X? ( virtual/x11 )
+	gtk? ( >=x11-libs/gtk+-2 )
+	m17n-lib? ( dev-libs/m17n-lib )
 	!app-i18n/uim-svn"
 DEPEND="${RDEPEND}
 	dev-lang/perl
@@ -25,19 +27,25 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
+	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
 }
 
 src_compile() {
 
 	use debug && append-flags -g
 	econf `use_enable nls` \
-		`use_with gtk gtk2` || die "econf failed"
+		`use_with X x` \
+		`use_with gtk gtk2` \
+		`use_with m17n-lib m17nlib` \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
+	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
+	use X && dodoc doc/XIM-SERVER
 }
 
 pkg_postinst() {