Utilize REQUIRED_USE rather than confutils, and fix USE=-python build failure.

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

3 files changed, 26 insertions, 21 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 1cc75d58c583..d7ed28f62a1e 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.107 2012/03/28 21:52:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.108 2012/03/28 22:10:24 vapier Exp $
+
+  28 Mar 2012; Mike Frysinger <vapier@gentoo.org> ibus-1.4.1.ebuild:
+  Utilize REQUIRED_USE rather than confutils, and fix USE=-python build
+  failure.
 
   28 Mar 2012; Mike Frysinger <vapier@gentoo.org> ibus-1.4.1.ebuild:
   Add arm love.
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index f6c5319ce183..29e49a965571 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -6,23 +6,23 @@ AUX ibus-1.4.1-gir.patch 482 RMD160 025cafc4977f240f70b72173a6d73cc015938a68 SHA
 AUX ibus-1.4.1-no-gconf.patch 1002 RMD160 2da6aba617aa054000fe21dff49b5b1866748e6d SHA1 447a03e2bf43dbc2a1dc6ad69306bd70dcbea637 SHA256 7f136de585b41d4ae47e1d9cb58a982f8ab70dc142eb579702e60f67f7f093f2
 AUX ibus-gconf-2.m4.patch 1707 RMD160 c98d6caa7c956e3e04ef8664eb7b637485af7043 SHA1 b7cc4a18711f147365df1fbc15e95452ef3189f4 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0d7deda22f47de851c02954
 DIST ibus-1.4.1.tar.gz 1479412 RMD160 4003fc9392c59ce35048689aa50a941cfd151cff SHA1 4cc045553885d35a118ec4b44c2694910209509e SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6
-EBUILD ibus-1.4.1.ebuild 3932 RMD160 42469ab9a60e29e16f87aff79734290125220815 SHA1 dd1e3f2796628708a9974019e32c46ef6f334be4 SHA256 a9fc372376d1f6765611c0352b17ca38c848ecc981c36280dc48155aa0514171
-MISC ChangeLog 17597 RMD160 d4eadae5b4478c8778ee1521f92455dd62f9c50a SHA1 902051242faa27e445696003ade62ceca93534e7 SHA256 dc081719f5716888051cb1ac9da3df9401104de09303f19ad766e2289dbbdd63
+EBUILD ibus-1.4.1.ebuild 4023 RMD160 cab06d3bfd234a22e49bc96866c30b75e34da044 SHA1 185f7322a2eb2dd5db6b1e1633b0468cadc7fb19 SHA256 5397f4b38f4c467ac2b57f447fb9ff083e143f1fac08fd33decac6db18d72418
+MISC ChangeLog 17750 RMD160 3ace954a841bab11a5d829cb10444d31a4b0d484 SHA1 0c33dd5b118af7011e3e7e16993000cd090e46d6 SHA256 2f05a0b2bd958c6a06dea540a04e1791f9d2b425419ac7050737ad875f7735c7
 MISC metadata.xml 798 RMD160 00aebf0dab958b7d9a13d7456d9f19c07d247641 SHA1 9208222da6f4015ba64ce30f59ccf20069507159 SHA256 f8cfd5b99a00d0b8cef1a903818e00a957cebb4612dc482b4cb34ed19d73958d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPc4gQAAoJELEHsLL7fEFWvfcQAJsTMerBs7B8dfmIOY6SF5yN
-uE+T2nohZ2zhTedIV+GYt9+CCcpRzPqRRSY5y64gNN60tSQFd4evE3Gt22jtZoPg
-JkaNqp1H7E9mXp5eoi6ziiaHCN/03vE2uczbjHAjS31/TggKO+qZXsEYM5VzzR4w
-LCdPFytNIAR4Q6pNPJnBf6ONxoumoxIrYzKjtgbbMEXPkupr+bygm1jegAY0KzUi
-BrEzdcl2q+Q7YvrS96DmzU70mfUraLfNRPOIs4btO5AhzIPlpnqmIylHn3J6tmc1
-4TryqYEmA+Y9FV6+Vwoix0XzNHr/43FrZlmfAH4AFX3m+SNQrVeNQ7ttbkYd/hDD
-RJpx/rkE0b6nH33d3dSD6KJg67/TwLxb88Iy0D4XW5Trq/DmsaRjsOsQzKgDW8s6
-eJvjRCun7e5jpHHEr73I6XHQKMbnhVyPRNRl0GBZRGMhoCS25wKQ5fkc0vEn108L
-wr22wb4OwT1uX6J/tBP3UGLIJuiXCTi/pngzGbTH8+rrQF4qZQPoW6GbgqSUWx13
-NdfBx+k0ZI6G13vq+pGWSjJNU+LMfi+zCqqOdRsmEC5dyYyqVsKpFUXQwHdyje2O
-uQP2ofNcPCeWd3LaBYg4kYYAG7TbGPoS67BorKc+XZEB73YThW8RUBO4EfattYLd
-lzY0B2FQmSaE75kToeAc
-=r3OF
+iQIcBAEBAgAGBQJPc4xYAAoJELEHsLL7fEFWGGoP/j3kEvKJE8NpvuJn1ovc5r59
+s86oPVyn+yLPwSnpSvb2UcLiG5d0XgdZSE3f2NC9FAXLiIN42sHBwA+sziPGJMha
+3eAPR7QkEOG8yXY+JHQDPsQpyUmOBLBWTZSO8mI9ero8kFyklihymoIkX6tK2XNi
+qxWn8O9kxNawcziHSKmwAYflKsubp0N26doQQ7O9E5f10IBtc990pE4c/bA3gZYP
+HG5ppBrrlkclUrZTrZuJ4kO1x6197jxC1A6s29exYE874OL38uP/vlhC/4cL8ZgV
+VRJOaJsGqqd4XBitBVVvJUOXxqkKGwQvDvb3LPA3zTxkQzvGUp4gO3Mw8xFfRNHm
+qIYgrXQD8T5EEFVtWgZaXeZmxstdhPsJSCIiFFk0hsi1wsCBOGDL89oCMcRTS+Zo
+r/+YTdQ7f/PJsWMKs3D+6mp9t1vUArzq8/NX4nmKLvWrGA75BQ9cLALbc0MNy4e1
+um0B7pq96qi5ctsMHP9G/l+cGIQoZnEr5X2zN6TF3JBcIJaB/upCXbQJeBI7/SZt
+mBedCT5lPM3eg5aZz01yOs/nmJqx3W71pnW86QLl2/cwr94ggoEVwrmcoispjaHu
+trNWTBM4+hqyYSphgLWRIU7HqEnP8lBh1Qwm308JQHaeuDH1ICAxuDZ+S39sFFle
+4j6jxv/2yjC7f3CpAcT7
+=4PBe
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.4.1.ebuild b/app-i18n/ibus/ibus-1.4.1.ebuild
index 1d87d565582c..c3fbec5a7ac0 100644
--- a/app-i18n/ibus/ibus-1.4.1.ebuild
+++ b/app-i18n/ibus/ibus-1.4.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.8 2012/03/28 21:52:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.1.ebuild,v 1.9 2012/03/28 22:10:24 vapier Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit confutils eutils gnome2-utils multilib python autotools
+inherit eutils gnome2-utils multilib python autotools
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="dconf doc +gconf gtk gtk3 +introspection nls +python vala X"
+REQUIRED_USE="|| ( gtk gtk3 X )" #342903
 
 RDEPEND=">=dev-libs/glib-2.26
 	dconf? ( >=gnome-base/dconf-0.7.5 )
@@ -73,8 +74,6 @@ update_gtk3_immodules() {
 }
 
 pkg_setup() {
-	# bug #342903
-	confutils_require_any X gtk gtk3
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
@@ -96,6 +95,8 @@ src_prepare() {
 }
 
 src_configure() {
+	# We cannot call $(PYTHON) if we haven't called python_pkg_setup
+	use python && PYTHON=$(PYTHON) || PYTHON=
 	econf \
 		$(use_enable dconf) \
 		$(use_enable doc gtk-doc) \
@@ -109,7 +110,7 @@ src_configure() {
 		$(use_enable python) \
 		$(use_enable vala) \
 		$(use_enable X xim) \
-		PYTHON="$(PYTHON)"
+		PYTHON="${PYTHON}"
 }
 
 src_install() {