Make sure not to call python_set_active_version to 2 if we're building with USE=-python.

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

4 files changed, 27 insertions, 8 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 99f693979064..05163bc57b28 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.170 2012/04/18 23:06:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.171 2012/04/26 05:04:11 flameeyes Exp $
+
+  26 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> libvirt-0.9.11.ebuild,
+  libvirt-9999.ebuild:
+  Make sure not to call python_set_active_version to 2 if we're building with
+  USE=-python.
 
   18 Apr 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-9999.ebuild:
   Accidently using backports instead of autotoolize for the live ebuild
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index ff095fc73f7e..a35a93d351bb 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libvirtd.confd-r2 1749 RMD160 30c662b9a14a3dc635674d0aee6452076da60102 SHA1 ae7a2b801ca0f9f610c015eb0fe06640596ac614 SHA256 93040599a7cb878b54b8b963ef4963e9450bc25e982e390cef3e5b7e8039757c
 AUX libvirtd.confd-r3 1757 RMD160 783aa7f62010d9903652483d95f0f3e324bd8b60 SHA1 e64c55b788da2406ad57ce72246250c7ac5a1263 SHA256 60f341dcf33ca8d55b6394ba6cf8e22f5133393e47f827b88cef1243c255f15c
 AUX libvirtd.init-r5 3572 RMD160 2899a3bc515856642eb6f0cfe6d0944454271460 SHA1 ea541974fb672621c3d75020bfa8ec4be77066e1 SHA256 6c04449123ebb5d5736e53a81325f66a0db52cc19c7a6c80ba5f599a3687569f
@@ -8,9 +11,20 @@ DIST libvirt-0.9.11.tar.gz 19519376 RMD160 752bbc5142ed24ea228172d60f248eb26db43
 DIST libvirt-0.9.6.tar.gz 17326676 RMD160 5e0837e8ee770e017e574fd002e9e489e448ca65 SHA1 9fd108e1a351d191c5d7f89458096fb35bd6413e SHA256 ce29b1cd3067b224aa834fec2a93d7613c0e72bc035760ad536a2142430bc02b
 DIST libvirt-0.9.8.tar.gz 18403525 RMD160 51bfb25dbd11a7cb5529c692d843f8ac2b1c9101 SHA1 09df699513af63b73444d776c2d02945dc9cee43 SHA256 31b20864e44bb18a2d01b7ac6569f114cbe1007689219bf24a07ddb7528abe0e
 EBUILD libvirt-0.9.10-r4.ebuild 8669 RMD160 a04e7d277c90ebe455ebc62ab72e08acc8e11ae8 SHA1 67f149e7363fb30eef0eff47d0f425b8ecb464aa SHA256 dce73810d1a16872212033ff6169dcf7b10af3f4b79b5f39de660769c40c422c
-EBUILD libvirt-0.9.11.ebuild 8672 RMD160 bfaa23b182beea885fe608e36bce4136ff0d050c SHA1 dcfe5ea8ce9f3a029c7f16a40c9204c544cff81e SHA256 ec6a5267e7d098f2c1fcfea6426cc87bb94cf68cb7899d2bbdac2ab4b085ea88
+EBUILD libvirt-0.9.11.ebuild 8689 RMD160 377c2c386790f285124eb00fd55238d507c368eb SHA1 098e3a1e53e4960b2b14c838c285df4aa532b92b SHA256 a5fe8e2dc83cff5b4cca052772c47ab063e17f0fa1545b6909eba337f28cdcdf
 EBUILD libvirt-0.9.6.ebuild 7907 RMD160 bf6ee27bc31c83544d172c639b05b59b3279c7dd SHA1 8ab9af963271485e43a656c2286cc431a3a15d09 SHA256 79b46ae24402a19f334fb6bdc02fab634f43c254dff0331c40aecc5b888ca04b
 EBUILD libvirt-0.9.8.ebuild 8154 RMD160 d52101e1834d48887c0e80cdcaf5b5ed09d9987f SHA1 6e6d17912fb5cddb42f6d7483547554e6c2ca130 SHA256 0c402fba43b77da77cd84bec8c606fe58b89510ccfda66756e30723b34531061
-EBUILD libvirt-9999.ebuild 8670 RMD160 0bbe96ddb340ac94e2f7b4975d7f0dd5bd1a84b1 SHA1 186319c0b86411d41bab5698324001657bb5e04a SHA256 8f15054fc4b3e0c9b74c3547fc7496802b34ab2a26a7703159f2048fbcee487b
-MISC ChangeLog 34549 RMD160 059b8c2d93f304e4defcb6e57d1e91e1fa5b27a0 SHA1 7105edfd81c85f5ec9ce0f0b63adb0ec0921be96 SHA256 8d6eeb9441cab8e30a1818835b1601e6c0d44206167d6c003045b96a2856b09b
+EBUILD libvirt-9999.ebuild 8687 RMD160 901e313b5e4d041a18a45913ee0ac225ab29575f SHA1 6cb459b94d42e98f92cc47327bcf17a3d62bb3a7 SHA256 3e7783c0483ad204be60f6b8b15c51cfdd96793c7e0e36fd9f070f4ba7ba7d5f
+MISC ChangeLog 34748 RMD160 007f3f3191a44a2abc934a89d3500e723d3520e8 SHA1 06b50b8eede18a18eb18478cfceecadaa7a24777 SHA256 34b0c6a1f4ac8328e10918362a579076e62bb60bdf169325de2d101eb66c842b
 MISC metadata.xml 3132 RMD160 066870c02fd835f9a633b69328367737d4cc0b71 SHA1 940cc910ef4d1a75947afef95d73a3026bb91527 SHA256 e0eb882799f41f51c9930a1142cf5427061bdacf629a028ac4e8b65c1cf67ea4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPmNdSAAoJEBqCrVe7WSRDX3AH/3FHeHaM7frXkpgzf9P+RTx/
+EUIBaln4WEN+SqZUVFBpASVkMgJyg+fXFU5M36UqOgNW2JT6COKwrqbr+lbDhSQy
+948kS5lXScposyahc31qwmavH1lExKoUbDzesSPpxQUZs87fIycQjsKUhr1yIgBf
+vfF7NmVIzP6MUN1naweZy/v3x+I2h1L5dh74udt0Btfq5FtqRivfMVlCb2FSuTMl
+X4STvkn8P9h7bgnC7Gf8tTTJIHkVvJqdoSaMExjEo/z47sMhdweJ+obDE4NcV8ZL
+AwJxkk/S75RRDp0gijg5gLuL4yrnOHfDoACUgRtlzjmIv1kLdO8fwLP/Hocw4tk=
+=gXHZ
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.9.11.ebuild b/app-emulation/libvirt/libvirt-0.9.11.ebuild
index 802603aeb081..fd72b47913d2 100644
--- a/app-emulation/libvirt/libvirt-0.9.11.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.ebuild,v 1.1 2012/04/18 23:04:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.ebuild,v 1.2 2012/04/26 05:04:11 flameeyes Exp $
 
 EAPI=4
 
@@ -91,7 +91,7 @@ DEPEND="${RDEPEND}
 	app-text/xhtml1"
 
 pkg_setup() {
-	python_set_active_version 2
+	use python && python_set_active_version 2
 	python_pkg_setup
 }
 
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 7a8e87c8a36b..f6f11f806299 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.27 2012/04/18 23:06:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.28 2012/04/26 05:04:11 flameeyes Exp $
 
 EAPI=4
 
@@ -91,7 +91,7 @@ DEPEND="${RDEPEND}
 	app-text/xhtml1"
 
 pkg_setup() {
-	python_set_active_version 2
+	use python && python_set_active_version 2
 	python_pkg_setup
 }