Fix dependency on m17n-db and m17n-contrib (they are run-time dependencies, not build-time ones); change econf call for gtk USE flag; document gtk USE flag in metadata.xml.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 30 insertions, 32 deletions

diff --git a/app-i18n/ibus-m17n/ChangeLog b/app-i18n/ibus-m17n/ChangeLog
index 15781b997567..b6adf1dba738 100644
--- a/app-i18n/ibus-m17n/ChangeLog
+++ b/app-i18n/ibus-m17n/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus-m17n
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-m17n/ChangeLog,v 1.16 2011/03/07 14:01:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-m17n/ChangeLog,v 1.17 2011/04/05 19:52:57 flameeyes Exp $
+
+  05 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> ibus-m17n-1.3.2.ebuild,
+  metadata.xml:
+  Fix dependency on m17n-db and m17n-contrib (they are run-time dependencies,
+  not build-time ones); change econf call for gtk USE flag; document gtk USE
+  flag in metadata.xml.
 
 *ibus-m17n-1.3.2 (07 Mar 2011)
 
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 972f96e12600..e80bb4155cd0 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -6,23 +6,13 @@ DIST ibus-m17n-1.3.1.tar.gz 404890 RMD160 44bb51299a053200d3a6a56d59db6ec6aeef81
 DIST ibus-m17n-1.3.2.tar.gz 414324 RMD160 f8a4499c0b0a48f56cc71264853f4a6987934c53 SHA1 b7d51ecaca8a88a28069dc9437b10a57ab3fe7af SHA256 c1e7529c63305bc5f2ddc4832550becd16e084beaf4217549bf1dd46a9b0e370
 EBUILD ibus-m17n-1.2.0.20091217.ebuild 785 RMD160 54cf77951519098e28ee0db04f5399158aea8f1e SHA1 b18afa88a6afb6e2d30293a46f0220fdc18b5906 SHA256 80bf21f54d2fa82dff713a8a09c9bc4dd47542c1fb23f3ec01072340b3d026bd
 EBUILD ibus-m17n-1.3.1.ebuild 801 RMD160 600d04be413962f47f8b909831891ff68d908f74 SHA1 ed427ed7035bead0e049582742a23e3b85110361 SHA256 081a644bf85f2173db90a2ed62f862f5bb79990e94806d8b430910ee295a44a6
-EBUILD ibus-m17n-1.3.2.ebuild 1080 RMD160 46301ff15902727144647ed35ab713d80ff50748 SHA1 4b5ccbd73b09ab9886969133c85fd2ff16a55adb SHA256 4b0e176110c6dfb00c88840d2a38323a0497f591f4a4689452a7e6ecf802b484
-MISC ChangeLog 2927 RMD160 87838a059963aa21eaa2b96d90589bc75d6dcff3 SHA1 273ac3f48960627f323d6f14e59c22ea01768d35 SHA256 366eec2285415404b3916886bbebf3e41e63ed59502b1b809f52311c40414a0d
-MISC metadata.xml 316 RMD160 8b0eab171db97c94f73c3086bc2637a89cb0f5ac SHA1 5139d3c33bd96b8c1ca82152afd6c65163add63c SHA256 85a6edd68f5495cd862711d3eead38640818fdc5dc4fa913f5b96681eaa64e5e
+EBUILD ibus-m17n-1.3.2.ebuild 994 RMD160 3ae9ec4cf760a44ac7be9ea4ec1b65f6c4f0918e SHA1 a8591de8e3baeae84227c0a8047608fe6ec501d2 SHA256 ae7a9088550702c433d1f685fac08434f377fd09b1929acaf166c59c8b0f8dbd
+MISC ChangeLog 3206 RMD160 4af0237a8354fd795e8372f34d58fd3f567e115d SHA1 c88e4d60a5ca2428e0a5f765848399ba32970b8d SHA256 7188adb0795e494f55eaa12ab31d3ff9545be711fa89b1e688e4f989ff5f563e
+MISC metadata.xml 470 RMD160 b4daf90f93a7edfca419d37ed9ba5d13e154f908 SHA1 59230ca785c0a09e734f330aba8c85460bb19842 SHA256 57f7866f48e1e45c82d45cdcefbc136bbb7c75e1eca300db063cd41121bf6114
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNdOVPAAoJECaGw+YFKA1pi90QAJu/VH7ca2KMQm3zz/jXNSFB
-xWJcOwRjdXxd/eN3RRJudP6K1J2LqAWvCeOVJzXuMBbWA3We59fhngf33Gf//he2
-mVbYqoPPSGwvQjcFN+bJUe/wgTGtoRNcC5yl7mG5ejKtOYp90cSAGsvZ2/Z3v/OE
-eX8Pc3X8bH6P+C2AqaXbzxaw4zVeCvzlRFiwR0khoIRxZPxdZJnIqIF6GDsDy0Ml
-/4v8R19MG8DLddWgXoX3MjIUgG1zlmc+/bn4RYZcjqKOrDxpk8VBIUFWDqcpyX/o
-9cMSnAa7oVhbTFKuLuqL/9ZbZI8utyhy4gqJR7eWMywoRFTkjOcWNPonS9TWEBOq
-jxqRvT7zPmGBRV7UElkjm72CBKOb5SKqTOMhBl+a0EWsGjItPW7uWIJXiB9El28I
-OCWQwUh/JFoRVWidEiChngcC0XSgN5c8D5LI+kuWeMVHkk5DzDma5wmdWYNtcYHE
-giUaGYmi7Hog5Y2Mu4zHhH0GB2q2jUUO0y7QnuyOm/XpZdGAJWAFN71Bl45aZZ7C
-7YoXIcqMBm5sf6NgZyrkLCsG+fy3BFNJDKEK5Q0cpQavtLgoxB6Ra//yycNiZVd5
-ejd6fjfEHIKwJIZulTqHIesSdGCcR++RY9NvtoDFa6fcQQ8zn0aAKgGzu6CZo2gT
-LBQIlAWzkfTwrsRWRgQh
-=ue6I
+iEYEARECAAYFAk2bcxwACgkQAiZjviIA2Xhb+QCgr54QKqprY5bcrwj0V1HJXZZ9
+aYAAoLPgm8nLNIjytl0IuWzQkqEm/8J7
+=w4Dd
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
index 34101b75d5fc..c8dcbf6da17c 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild,v 1.1 2011/03/07 14:01:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild,v 1.2 2011/04/05 19:52:57 flameeyes Exp $
 
 EAPI="3"
 
@@ -19,9 +19,10 @@ RDEPEND=">=app-i18n/ibus-1.3
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	dev-db/m17n-db
-	dev-db/m17n-contrib
 	>=sys-devel/gettext-0.16.1"
+RDEPEND="${RDEPEND}
+	dev-db/m17n-db
+	dev-db/m17n-contrib"
 #	gtk? (
 #		|| (
 #			>=x11-libs/gtk+-2.90.5:3
@@ -32,14 +33,8 @@ DEPEND="${RDEPEND}
 src_configure() {
 	local myconf
 
-	if use gtk ; then
-		myconf="${myconf} --with-gtk=2.0"
-		#myconf="${myconf} --with-gtk=3.0"
-	else
-		myconf="${myconf} --with-gtk=no"
-	fi
-
 	econf \
+		$(use_with gtk gtk 2.0) \
 		$(use_enable nls) \
 		${myconf} || die
 }
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index 8044b2d7aaeb..18a03aec64e4 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<longdescription lang="en">
-M17N engine for IBus input platform. It allows input of many launguaes using the input table maps from m17n-db.
-</longdescription>
-</pkgmetadata>
+  <herd>cjk</herd>
+  <longdescription lang="en">
+    M17N engine for IBus input platform. It allows input of many
+    launguaes using the input table maps from m17n-db.
+  </longdescription>
 
+  <use>
+    <flag name='gtk'>
+      Build the preference interfaces, based on
+      <pkg>x11-libs/gtk+</pkg> (GTK+ 2).
+    </flag>
+  </use>
+</pkgmetadata>