Version bumped.

Package-Manager: portage-2.1.9.40/cvs/Linux x86_64

4 files changed, 49 insertions, 66 deletions

diff --git a/app-i18n/ibus-m17n/ChangeLog b/app-i18n/ibus-m17n/ChangeLog
index bd196656fe2d..15781b997567 100644
--- a/app-i18n/ibus-m17n/ChangeLog
+++ b/app-i18n/ibus-m17n/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/ibus-m17n
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-m17n/ChangeLog,v 1.15 2010/09/20 02:47:09 matsuu Exp $
+# 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 $
+
+*ibus-m17n-1.3.2 (07 Mar 2011)
+
+  07 Mar 2011; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-m17n-1.1.0.20090211.ebuild, -ibus-m17n-1.3.0.ebuild,
+  +ibus-m17n-1.3.2.ebuild:
+  Version bumped. Removed old versions.
 
 *ibus-m17n-1.3.1 (20 Sep 2010)
 
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index 7384d74daf63..972f96e12600 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,30 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ibus-m17n-1.1.0.20090211.tar.gz 388106 RMD160 8df3741d7fd313609490cbf0d18156050f9270ac SHA1 10fab4c5ae433244673b664dbe67021c8e160880 SHA256 8388584ff58bb6775027cb4433de732bf0ee890588795a71656d86306ccf9989
 DIST ibus-m17n-1.2.0.20091217.tar.gz 389820 RMD160 f888dcdc6dd724e4623ae0f131b4d739a1bbc1f5 SHA1 03ede5c896e0ba1b10389ca74c029598191a32bd SHA256 92b8983d99078f5918ea6fcf931231687e9dab67eef30692b495b5a7e8371cc2
-DIST ibus-m17n-1.3.0.tar.gz 391768 RMD160 211842368b6779a64e9eb17b9bb079a94312d2fb SHA1 2f205c07aef8f85204d990656914ddf7f69c5882 SHA256 1ff7c870fa91f7fc207eab4e76bac3b6b54ea1e6fd9c0e745751425f5548c6bd
 DIST ibus-m17n-1.3.1.tar.gz 404890 RMD160 44bb51299a053200d3a6a56d59db6ec6aeef81d0 SHA1 95733c4c78b273103c99ff2a17f3d2e6692bba4a SHA256 65b19e5b50b8431a1faa1c48a7ca3b94cb5bc20bfaa9d71c8dd78bc8a1e88187
-EBUILD ibus-m17n-1.1.0.20090211.ebuild 1012 RMD160 4feb5ba518961373d6bceaaf14b532666ce64a27 SHA1 4346a8a393a6d0c863674b60a666981517872b35 SHA256 b2eb07502dc46dd3951ba438ed08ef388cff354dc8584a15212a451b15af92da
+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.0.ebuild 784 RMD160 775ed0f5191e1f08fd2168f8b10d95510254f136 SHA1 54bc58d1ed23be64e6bcf8d7d284ef2035df8956 SHA256 33ea4eec10ca25aa5251b49fddb5ab8fc9b04c527619824219d5fc521cd9bbfe
 EBUILD ibus-m17n-1.3.1.ebuild 801 RMD160 600d04be413962f47f8b909831891ff68d908f74 SHA1 ed427ed7035bead0e049582742a23e3b85110361 SHA256 081a644bf85f2173db90a2ed62f862f5bb79990e94806d8b430910ee295a44a6
-MISC ChangeLog 2717 RMD160 348204a189c365ea91bb1beeb0ba19e3865362b5 SHA1 7eb36720397a951f71577c8e07c77cd60ea2a07d SHA256 50e4aa13e988a15fc8f89c983bca72f98061ebc3bf42ec857ff8affd55889223
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMlsszAAoJECaGw+YFKA1pDowP/2LCJE1jowf/ySK6Az5nizsG
-PFkFgYNUgbaP2LYpMfjG5ei9JNj0yCgIgAq7DLmnMKFfVQkI/WraYcZjUqhFSL47
-iXt+lOKPgATim4w34lGOKUzEr+hLZO0cSz9RtAU+e82mw39w20hJTseKj8M1X0D7
-tlmBpIFqDATaaDLr8pUVstxk5riyS0ZDyFQy37LAwPM2BN7QuUPODR6hkMdgpCg2
-S65aTXzT/7YEFAON5NHTuifV5QG9sgRYPcnCwWqQeFWxyJmPG8RBO/6gX1Oby10f
-9unpFx3/J3G005pXyvi3lBPgQgJPwPQ3laEGin5s/9PVU3Ec14ZPhcKP1vllTUOs
-Rjg2V13RxcHd1KHfRa+hrRX6zuy6LYpk5zjkcULAf/bzacU3We2pHLTVqXHEAhS9
-za7qyc6zO5X2ouu8iStoXoPFvQ1KLj8/OXDTOPihRbI7MKZeyrWqQWETC25yLiqa
-y/kdYetsJvuDjYqSUzlKMLKGZRbt1iih4rJGaFHz5kAW7XBk3kaqZQNtlUSe62mK
-zewNDmHa0i+fkTfd1FFUtojDzmahmWGYPz/5P3dAxX71scXRVQvP3zSoIISl+U7j
-75iMlhmZASZOiENNkEC9S7MOIypt7mkgfFVxlHKwVJGSwU8BRuXEtSJmqBcZgoy7
-0ffKEOivglk5nhQIY5rB
-=yjEa
+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
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.1.0.20090211.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.1.0.20090211.ebuild
deleted file mode 100644
index 4b207f115f2e..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.1.0.20090211.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 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.1.0.20090211.ebuild,v 1.1 2009/02/12 14:56:19 matsuu Exp $
-
-DESCRIPTION="The M17N engine IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.1
-	dev-libs/m17n-lib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-db/m17n-db
-	dev-db/m17n-contrib
-	>=sys-devel/gettext-0.16.1"
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ewarn "This package is very experimental, please report your bugs to"
-	ewarn "http://ibus.googlecode.com/issues/list"
-	elog
-	elog "You should run ibus-setup and enable IM Engines you want to use!"
-	elog
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.3.0.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
index 8d80f29d04f9..34101b75d5fc 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.0.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2010/04/13 15:56:36 matsuu Exp $
+# $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 $
 
-EAPI="2"
+EAPI="3"
 
 DESCRIPTION="The M17N engine IMEngine for IBus Framework"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -11,9 +11,10 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nls"
+IUSE="gtk nls"
 
 RDEPEND=">=app-i18n/ibus-1.3
+	gtk? ( >=x11-libs/gtk+-2.12.12:2 )
 	dev-libs/m17n-lib
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
@@ -21,9 +22,26 @@ DEPEND="${RDEPEND}
 	dev-db/m17n-db
 	dev-db/m17n-contrib
 	>=sys-devel/gettext-0.16.1"
+#	gtk? (
+#		|| (
+#			>=x11-libs/gtk+-2.90.5:3
+#			>=x11-libs/gtk+-2.12.12:2
+#		)
+#	)
 
 src_configure() {
-	econf $(use_enable nls) || die
+	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_enable nls) \
+		${myconf} || die
 }
 
 src_install() {