gtk3 support, bug #366157. Removed old versions.

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

5 files changed, 57 insertions, 36 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 3135bf4e8a25..15310603a0df 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.84 2011/04/24 03:06:25 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.85 2011/05/09 23:51:32 matsuu Exp $
+
+*ibus-1.3.99.20110419-r1 (09 May 2011)
+*ibus-1.3.9-r2 (09 May 2011)
+
+  09 May 2011; MATSUU Takuto <matsuu@gentoo.org> +ibus-1.3.9-r2.ebuild,
+  -ibus-1.3.99.20101118-r1.ebuild, -ibus-1.3.99.20110228.ebuild,
+  +ibus-1.3.99.20110419-r1.ebuild, metadata.xml:
+  gtk3 support, bug #366157. Removed old versions.
 
 *ibus-1.3.99.20110419 (24 Apr 2011)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index ff2de1051fe1..8f84f1f29885 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -3,31 +3,29 @@ Hash: SHA1
 
 DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
 DIST ibus-1.3.9.tar.gz 1380081 RMD160 8cf8712d29369bb1934c0d9d66ce5f15953a60d0 SHA1 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138 SHA256 b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d
-DIST ibus-1.3.99.20101118.tar.gz 1320315 RMD160 4f5b437a123811fc5e30eabcf39459e02ddfc3c9 SHA1 0d21016e51f7ec3b0fd2871dff64d31b2dc53ec4 SHA256 3cb4b4f36fae19271ae9d4fa50d19392f7f8ee28736b28a0b69edfa37b0ba173
-DIST ibus-1.3.99.20110228.tar.gz 1348307 RMD160 06226d2a417fe8127736e83eb6cebf3b63e4043a SHA1 50b862bd93268da3d70572bb1bf07fbec4138d26 SHA256 9f2e8dd5be08ddd75b36e87ec3f354a8009b9e16a43908d5601e6a92e7907354
 DIST ibus-1.3.99.20110419.tar.gz 1402824 RMD160 b8820544bd874674377e6a61494d097fbb3d9de5 SHA1 2cc0eea42862dac4d43076a33f5d21e47865f71d SHA256 1110c819b246f08a232985258d3c707191f64fc3695b9f5c634f14d6cfe82160
 EBUILD ibus-1.2.0.20100111.ebuild 2559 RMD160 efd0b291781b1b82bca04f9f1eac8104ca151e0c SHA1 6a449de6e9668b6129ae764a04305d39ec4a170e SHA256 d078fe38c54256397eab0599d6d61f3d27f92ca7b1e3b5cda02f412e5f1f6212
 EBUILD ibus-1.3.9-r1.ebuild 3499 RMD160 dfc5f28ae7b46887390a634ef15e473f5dd52382 SHA1 06eb904312b4ae3d11deb435a259fda371698d52 SHA256 114fe47aa0e75ad91484e57a50b1091c5e6945a4942ece6273e9507bb019d98c
+EBUILD ibus-1.3.9-r2.ebuild 3754 RMD160 6f41a1f2e1bf9b41473f8eaf733bf0f65516f4ad SHA1 01cc0ae366d4287521a7784ee0b66f727492ae1e SHA256 392c8ad10e5b4572ccd4a2a422d5c0dc59fa72fde9fa08abff142ec65dbabf53
 EBUILD ibus-1.3.9.ebuild 3262 RMD160 ca7a2feb0860633f6ec7a7be36cc0d0c02770766 SHA1 08a464833c04aba6ac113afa1c5ef8d45c166418 SHA256 6e5ed533707d97bf5415c65acfde3f4f9aed393b55a419a30b5e57c5143e28af
-EBUILD ibus-1.3.99.20101118-r1.ebuild 3509 RMD160 0744d636f964ec930ca88d4a85960501e8df942e SHA1 86ae6f6be2af49e8fb81e7aecf4a1c60a1b017c5 SHA256 46ff0db53be9d8073ffdb581e60816379978da96c5e047d039871c3105822973
-EBUILD ibus-1.3.99.20110228.ebuild 3506 RMD160 1080edec02bb7de22dbe9760ed7d890325581e0d SHA1 5d7afdbfa84ffd86e7901c431311f081b20fe8e8 SHA256 cc64fb891af20325a392ddf7d5e2e4c34ceb686575e697d920884023b1803048
+EBUILD ibus-1.3.99.20110419-r1.ebuild 3771 RMD160 ec4e71d909e7c5723a12d4c4bd1a66d7bee3b811 SHA1 698805f2d7e88a9b3f35dea9ff0580c14dbae1aa SHA256 432d089bd351883611a36a5db3c931713ef4640c986af6222e47e53ac03e9d03
 EBUILD ibus-1.3.99.20110419.ebuild 3466 RMD160 922d57ecde82de28a8585fc7a2760f6014f00f31 SHA1 a410dd51922ad995715c77b8310c610d6a5d2b18 SHA256 d0d42a6d99f9f035e90c1963e73ea2b537d36c8219d375d70552d6aeac719ba0
-MISC ChangeLog 13692 RMD160 ee39fec395c17409c2fdb6fbb9e448baeba28dcb SHA1 cc16f1b8ecc7ca6eb220add6e8cfc35ee332385b SHA256 ac32461653b6c5ee30adb42d35bf5e7adb12ae9f7eaaa2223a7c75da5888b0a5
-MISC metadata.xml 671 RMD160 a430d2733dbeb0c98d42b3a432cfadafb5f8c87a SHA1 bfc77eafdea87e34b5ae48e6a6652508c4a70204 SHA256 4184635ca1b44311db6031a7f00c5679582289862be1a550a4faf4dd9d5e6e59
+MISC ChangeLog 13999 RMD160 350305888ef592f82ad554b63ecf58499adb12d8 SHA1 f196f8d345893ab4519bb2f44f58aba2e5f65360 SHA256 3e599a55ddcb9c7c26ca9b85adfe8ffe888d91d65d6cc1e15655f21122427a50
+MISC metadata.xml 723 RMD160 d31d47e723adafe801a851aeacc97195bf133988 SHA1 90a3dfcb261747eb663fc8e6ad3612f919d3033e SHA256 4cbc8c17e6b95b36d48ad63e5fab15b0a52f1ef78bcc6f67044ab722fcef3156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNs5O7AAoJECaGw+YFKA1pFusQAKI8T+/5LAa9cuLq6ZHMeovr
-0eCLK7jS7dbfk/krIIcLxHYnh/UBK2t0JRdAt2hsGICVWc02EbTxF04IJug6RzGw
-TCoqw3E7L4avGwLvlh/ivA9/ODQjpWbtVTzfC+7M868ZZnRPv19o0MCILQcX1PS1
-mZLubYHpoB2YBKHHxvuIf0H1+ZOko0LRKf8sKtVYBVsjNMz7HFqwc1eVe4Z4i9Hv
-wzxLIoqvMNYWk/r1TZab3ud6iBDFqIBgF2+iLPSi4AnQCQkTU2tC7OKSKGtZNhuW
-A9/Q9E2kPUnfR/e/W1a/1U71/YFQdNxQZk36R5sPyFRDErgpyRj0sx9nt2fKvheN
-/Ele1NfP5XCd25W39U9xuZ+A+UdN8AwyPXJxintveYMo9tTHfMea9OXUp10RwaUO
-VCGnLRMpc68ByhWN6jnrTqs/4ndWCnJDGaPDNBq8wkZhzUagnt8F5aoyAaq/A/Rr
-TJHrWCLm+sl06iL2F9Li010xU32MOh7lbhxOxlJ/G8Rk7C/2PK+RdwCG+fYMKrfl
-OQP1JChrNH1Jr+GvzCQNzz3P4gDgGzQlI6xlD1IMQnxnIuyk6WK3a1ZLUPfRNGHN
-4azOVOQ+2uHDFMZaxixqOIONx9Drhgy1D4ZUDGEF7VVSy86O9GT50Vqf7i29ZVGT
-9A4f472s2K7i6//iUfx2
-=kcjG
+iQIcBAEBAgAGBQJNyH4OAAoJECaGw+YFKA1p4Y0P/0EAK4B5NjcIoeFTRXhrq8hr
+wE2UJ6OmvjtRtqFl2ohDhXqrNH/ADLkUUMb4qzGpB9aMcNlcgdVpzSv1eGBpQmy3
+F+1FaGgw+yGBnrKE28crWKh972VbOKwW/R1RolBFYMqW5zfgOTNoYGrEsfP5Vib8
+sJm+68ppd67d5Rzym9/gJ2JCe9UmffzyeAgjVeaKlTz/XjgwyKjz4f+izkNFiLDA
+yhoF1CdqF8gHvxaFsJWoTIugGXootHNjYkOObToY0MG/5QcuJCTsr4hjtdfTL3Tt
+pakoT3Du4AZLwCGLxSeeokdSqS1uY578L0fgmsoR8w91ekxIAu+afIY4J8mxV3+d
+xMSFMN1iZ8u/xwCy1aanH7S0wBQS/Ai6HDY8Og10/2zoJi2ovuIYqssRFTAseUa7
+C6wOuY7h1tgnHlP5twGIfESWp5lDwrHPXtypYXgJUScwE/T3EO/BsJgZBMn7TjMp
+0cM00TxOWMdlsVSiv/u21fQ6HOZyUtZoHEr4avRMR25YHFH4BznjFpquIoAzlWTN
+aS1xfDH6FBRMR9dYuN39eh7AWar/mhWTKXRwWU+Mj7vSW76zEdI9rG6tO1BuNTOH
+3vg8oX7XNfR2L+N3IK6vLfXb50cop7Z0pv5DKM3y6kcBFiQPxf+2iCdPqQZ5gAmu
+EOhXP1gzjDUJLVHDpvMA
+=JXax
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.3.99.20110228.ebuild b/app-i18n/ibus/ibus-1.3.9-r2.ebuild
index f5bbd87f55d5..bdc06597b61f 100644
--- a/app-i18n/ibus/ibus-1.3.99.20110228.ebuild
+++ b/app-i18n/ibus/ibus-1.3.9-r2.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/ibus-1.3.99.20110228.ebuild,v 1.3 2011/04/16 22:08:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9-r2.ebuild,v 1.1 2011/05/09 23:51:32 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -13,16 +13,15 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc +gconf gtk introspection nls +python vala X"
+IUSE="doc +gconf gtk gtk3 introspection nls +python vala X"
 
-RDEPEND=">=dev-libs/glib-2.26:2
+RDEPEND=">=dev-libs/glib-2.18:2
 	gconf? ( >=gnome-base/gconf-2.12:2 )
 	gnome-base/librsvg:2
 	sys-apps/dbus
 	app-text/iso-codes
-	gtk? (
-		x11-libs/gtk+:2
-	)
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	X? (
 		x11-libs/libX11
 		x11-libs/gtk+:2
@@ -61,9 +60,15 @@ update_gtk_immodules() {
 	fi
 }
 
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
 pkg_setup() {
 	# bug #342903
-	confutils_require_any X gtk
+	confutils_require_any X gtk gtk3
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
@@ -85,11 +90,11 @@ src_configure() {
 		$(use_enable gconf) \
 		$(use_enable gtk gtk2) \
 		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
 		$(use_enable nls) \
 		$(use_enable python) \
 		$(use_enable vala) \
 		$(use_enable X xim)
-		#$(use_enable gtk gtk3) \
 }
 
 src_install() {
@@ -112,6 +117,7 @@ pkg_preinst() {
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_optimize /usr/share/${PN}
 	gnome2_icon_cache_update
 
@@ -135,6 +141,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_cleanup /usr/share/${PN}
 	gnome2_icon_cache_update
 }
diff --git a/app-i18n/ibus/ibus-1.3.99.20101118-r1.ebuild b/app-i18n/ibus/ibus-1.3.99.20110419-r1.ebuild
index 7d0d1015f561..a61bc84b6435 100644
--- a/app-i18n/ibus/ibus-1.3.99.20101118-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.3.99.20110419-r1.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/ibus-1.3.99.20101118-r1.ebuild,v 1.5 2011/04/16 22:08:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20110419-r1.ebuild,v 1.1 2011/05/09 23:51:32 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -13,16 +13,15 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc +gconf gtk introspection nls +python vala X"
+IUSE="doc +gconf gtk gtk3 introspection nls +python vala X"
 
 RDEPEND=">=dev-libs/glib-2.26:2
 	gconf? ( >=gnome-base/gconf-2.12:2 )
 	gnome-base/librsvg:2
 	sys-apps/dbus
 	app-text/iso-codes
-	gtk? (
-		x11-libs/gtk+:2
-	)
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	X? (
 		x11-libs/libX11
 		x11-libs/gtk+:2
@@ -61,9 +60,15 @@ update_gtk_immodules() {
 	fi
 }
 
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
 pkg_setup() {
 	# bug #342903
-	confutils_require_any X gtk
+	confutils_require_any X gtk gtk3
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
@@ -85,11 +90,11 @@ src_configure() {
 		$(use_enable gconf) \
 		$(use_enable gtk gtk2) \
 		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
 		$(use_enable nls) \
 		$(use_enable python) \
 		$(use_enable vala) \
-		$(use_enable X xim)
-		#$(use_enable gtk gtk3) \
+		$(use_enable X xim) || die
 }
 
 src_install() {
@@ -112,6 +117,7 @@ pkg_preinst() {
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_optimize /usr/share/${PN}
 	gnome2_icon_cache_update
 
@@ -135,6 +141,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_cleanup /usr/share/${PN}
 	gnome2_icon_cache_update
 }
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 2f6ee4e46e09..9984e3072cc8 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -9,6 +9,7 @@ developers to develop input method easily.
 </longdescription>
 <use>
   <flag name='gconf'>Enable support for <pkg>gnome-base/gconf</pkg></flag>
+  <flag name='gtk3'>Enable support for gtk+3</flag>
   <flag name='vala'>Enable support for <pkg>dev-lang/vala</pkg></flag>
   <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
 </use>