Fix build with USE=-python and empty PYTHON_TARGETS; force non-empty PYTHON_TARGETS for USE=python

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x229E5838

3 files changed, 30 insertions, 11 deletions

diff --git a/net-libs/gtk-vnc/ChangeLog b/net-libs/gtk-vnc/ChangeLog
index f332d2006f54..173ec5acaa92 100644
--- a/net-libs/gtk-vnc/ChangeLog
+++ b/net-libs/gtk-vnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gtk-vnc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.106 2013/04/24 07:06:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.107 2013/06/01 23:47:24 abcd Exp $
+
+  01 Jun 2013; Jonathan Callen <abcd@gentoo.org> gtk-vnc-0.5.2.ebuild:
+  Fix build with USE=-python and empty PYTHON_TARGETS; force non-empty
+  PYTHON_TARGETS for USE=python
 
   24 Apr 2013; Justin Lecher <jlec@gentoo.org> gtk-vnc-0.5.2.ebuild,
   metadata.xml:
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 6a6dcf53e930..2f4b0e1c2475 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gtk-vnc-0.5.0-pod.patch 3441 SHA256 921b8347907bee39caff14c80c3b576618fe7ac2a7d679500769f797cab8fb66 SHA512 22a01832e04d3a6e5887e533d1477fa62593cfea2066d8a61e0856000897a6e481cbf4a692d2cf33f66a853583b07cb5d99465050c545605bbbaf4ab181b9404 WHIRLPOOL b44becccb00fd190c208596807b6b665acf5904e5c6bb461d99d0b4da8b1b3ec91bd9d8764faa286b9aa94f39073dda2b3399e6f7b39bb8e3a87b4626dd46c4c
 AUX gtk-vnc-0.5.0-pulseaudio-automagic.patch 2001 SHA256 5ea9f09c341b656efaf54e5c9114f6ce04ac056212615b01ba68911d0085f2aa SHA512 f91e5a5fe8223540eb964647d4ae409e243ff9f381fbae40eb6fb37e3a6634b7823025ce6a89329f4857f6d1b2a023189a66d6ab50581522498ec01cae00d80d WHIRLPOOL 13818a8d0230ae65035debb0a9ceaa7c3d3e0cb548d926696ed57682e75fed4299a4c821373bc7aebcce6401fee26a0d7385381d4b222172732e9e9916388f41
@@ -8,13 +8,23 @@ DIST gtk-vnc-0.5.1.tar.xz 413652 SHA256 1ad1847a23f8ea8fbf2396de46c51ec0900ee369
 DIST gtk-vnc-0.5.2.tar.xz 388112 SHA256 b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f SHA512 e58a0bbb4c5d1802d51936d5869ccad55cd405f6939f49445e224863866a33173e47e055d88f50e60b3f864a7e393faf0c78a219a08ee8a8c1fc8fe108f9824a WHIRLPOOL 339260787cb7970fde2a660186e46977d0a5f6e2966e859ebfb632cf29310c1957e0e3c9b0ac06a3d420caa4a20900ad168658c49ae0da0115cd40b8ece6990c
 EBUILD gtk-vnc-0.5.0-r1.ebuild 4541 SHA256 22011a079999c2b10422176a44e08acff21fd48492e55343731fdf83a576bbca SHA512 47acae813bf425cef0674bdacdc9632a83e9e8df934125fed921a4802e6e93e59559d00acc7dafb0e12eb8f5a9bbcb0e6d247d84f72f57db5484e61efea87515 WHIRLPOOL 47835bb624ecca13a0c9f5d1d79c08748accf804b47d601d79a5c28397033f237cb29208be8f7ad40c8e40535ff8c015d07a3a494ca7bc9e969ef947ea60b915
 EBUILD gtk-vnc-0.5.1.ebuild 3920 SHA256 8a1d9991867a636846e5689c6308a1448a23d587b5af358e8c149fb3ae43c70e SHA512 954a3d412dd09dbbd8d28b26c9f3d7bbf574ba82c3f43503592cf68f53a2452ccd36b1d3668d34b8272f219aa9849f60ba6c755e00faad42a296b9bebbb2b066 WHIRLPOOL 12ff1c69ed38ea2653430a8a806a2f89fbd49018c009a004f7991c135755942f487d4ad64a17b8cd0efa13c51331ca36ba8f59d8dbea4cbcfa0444ec24ea8f16
-EBUILD gtk-vnc-0.5.2.ebuild 4840 SHA256 d688d0f0f398584a15657f51a8a5e70d29f64c77f23f54e8262782aac396497e SHA512 92e5ede91f95386ef2661fa9b9534bb7407b100e2cc3d9fb5e881ccbabbcc80e753c20896008256412cae260912d7420c7e2c06c66a537fae22d8c81abced449 WHIRLPOOL 25198641c4dcf1748b0bccad1227e0ffeba6509b756aa12abd111e78b84c60ff39cf393a64000a8f4d720a542e7793304300105cd47d957643f80ce930bbb38c
-MISC ChangeLog 15645 SHA256 533e589783891b07cd6008d0ccc484e8597604c66d0aaa3a736976be0f060dd8 SHA512 c60bb57c2c59e4e1575d7d5c365db39607d85bf689d035af6881d92d67445d04bf7b49f8edf1d3853ddf9db9e660cf36cfaaf7f8744ab80c31b069a0d65b21fc WHIRLPOOL 71358cf942d0d0b473386994bf02122bebf6a124b81ce587a46f3c61eec87dc1ad0dd5923922d1a22fb9066c93ad838de35156fad656764d59feb3754810f978
+EBUILD gtk-vnc-0.5.2.ebuild 4905 SHA256 bac3795b481f5f4ad5d1e525321a28b1c7d4fbfa31da2d617fbbf8a4c0c1b068 SHA512 600a820a3c6126d77b2d319d8bc68d773161b44a728f8339e6b103f25a4d02882984f626c3deb923b9821b9b5a67808af0ee58b8430458795c533985b3eb266d WHIRLPOOL dac6da394b98ab8ee5a885d6b1a5646e263c77364305852e5c17d70a63578eb176eab25bc9187fe92a57ef638ee40c59883181cdda26719cc4836778ea251331
+MISC ChangeLog 15820 SHA256 52a0034d69cfbb25086899069def031ca15bf60274bc05252aa9ab89ae49a5c0 SHA512 31f10d0f8c4b677eb818a2d68ee9d791bb1f194a3984a41ac3819117f2b5e4e1d6d4a8eda56c811c4a15011ffe4adca5d9b40fdb1ef9f4282bee3885d95e6e4e WHIRLPOOL 09de62ec7a2cfa5e002cfd953add276735a2e40cf266818b087d8eba6e2ebff4d05d35febbdfcb84dc94972a3fa4db2b24ead4c60be2afbd5e04947ffe1a261c
 MISC metadata.xml 437 SHA256 12e7181f2d8a5bbe8c21a5c7cd2d346e4c6af226fd138d1935314b6dac644ce3 SHA512 faaafd28513949435c063d9945c861f7ee792e1ba1bd09518ec735142e7bf61b676dcd858026989d377feb8503a129d9649f542153ff5a273bf8bdc68f0d3c12 WHIRLPOOL f55bcb48a6a6b81cbcca890feec882dd5e6552adccf93df264b66399e5640173ff3624c5e2d3d3ca7c52a5a8c5213f1fb972b4c29e44813271ca6924c5ad45de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlF3hGQACgkQgAnW8HDreRZ+SgCfWauh5eGW30OVDAp2aIFSWJ1f
-GrsAoMa5sYUwPl+CVqiw7SqRjoAXR/T6
-=yhvm
+iQIcBAEBCAAGBQJRqogSAAoJELHSF2kinlg4fqoP/3uq8ViGM0/2jdUjSy97J36J
+pz0OctW+L/Ufho5Tzm7mRG2ijsEgpbn8Ui26o/gOE7sGwVGz4dviNWdzTvn2lx9I
+Ko28+0yANOmeOg+wb4GNFdmmCkethVl8DinLUrwr1XGb+wX/8047fZErtYgx6E6z
+SKnTiEIuEQuSR7g2gdi3f6r0eM8cs3/qy16du2BFrI6MFu8io4c3iNqsISJ98920
+2dNmBt6IPyICAmdJ6Q+025NK6b3LdQl2A4O6ROsmrHxwwrDVwqe1GtQVhd+8hhEh
+mQ7g3qp7r365kKBU7YPD5zntqBrUYqYz+BmnH+MdcJ243ygxCyGk/+kJAzh/H5KT
+nM2LbPyXCDjxb9poCCQT6KVqsBHCn/8NOOKg60pwRXjrH477CpKrcIXYe3mX9xhB
+dAx66jl8hXB+yFh6jfR632SG1caJlKy49OggF9am7FStZUutz2IHXkKh2/XspiQo
+laFz+6Lzfs4GYLBQUVBlyKb232NgspmwVRyO93koCHhltMhyt0LXgG3qHKJ5TTvu
+rnKKtHik8HM88YslLJ/p9J1kmHLYvyCQEHi20Tnd5E7K+vdyJ/om2rIInOY5sVyj
+ZJUTRvpGgZFyLNh1FmI5RxU/mS+q31i2GVLs+GtUEmVqSRRc1gzVzPDoRNIxI1M8
+V5izw7hd1/3dwhnCjewo
+=FrxZ
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild
index 5f2ecf6ac701..c5388f3233ed 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild,v 1.3 2013/04/24 07:06:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild,v 1.4 2013/06/01 23:47:24 abcd Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -16,7 +16,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="examples gtk3 +introspection pulseaudio python sasl vala"
-REQUIRED_USE="vala? ( gtk3 introspection )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vala? ( gtk3 introspection )
+"
 
 # libview is used in examples/gvncviewer -- no need
 # glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
@@ -57,7 +60,9 @@ src_prepare() {
 	prepare_python() {
 		mkdir -p "${BUILD_DIR}" || die
 	}
-	python_foreach_impl prepare_python
+	if use python; then
+		python_foreach_impl prepare_python
+	fi
 
 	# Remove a few files that were autogenerated during distcheck.
 	# Having these around in srcdir breaks out of tree build since they're