Don't call python_set_active version if python is disabled.

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

6 files changed, 30 insertions, 17 deletions

diff --git a/net-libs/ldns/ChangeLog b/net-libs/ldns/ChangeLog
index 1b4c14b729da..1b625ab1118f 100644
--- a/net-libs/ldns/ChangeLog
+++ b/net-libs/ldns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/ldns
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.31 2012/07/13 14:14:48 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.32 2012/07/16 01:13:05 floppym Exp $
+
+  16 Jul 2012; Mike Gilbert <floppym@gentoo.org> ldns-1.6.11.ebuild,
+  ldns-1.6.12-r1.ebuild, ldns-1.6.12-r2.ebuild, ldns-1.6.12.ebuild:
+  Don't call python_set_active version if python is disabled.
 
   13 Jul 2012; Jeremy Olexa <darkside@gentoo.org> ldns-1.6.13-r1.ebuild:
   pkg_setup fixes regarding python
@@ -142,4 +146,3 @@
   21 Nov 2009; MATSUU Takuto <matsuu@gentoo.org> +ldns-1.6.2.ebuild,
   +metadata.xml:
   Initial import, bug #192728.
-
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 4289427c7525..3fd0b399dd72 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.6.12-cflags.patch 597 SHA256 3d892a2d8f99912375e491ee47c2f608c2d653d3a5b52fb18cfa768a520fd6c9 SHA512 9d769624d6462b0ebaa689eb224d6c2b1b86b37fb5ba630fffc649a17d7091b5a18a3235074fcb4d3ba45346e70fa458dfb290da914d84d8d0c0a9e78b3fd41a WHIRLPOOL dfcaf8ad1fc8df8f8bab6739043a1eedd04ea296ab627e9edce3e495cdb5d6e4f5a06afb33699197ac2aaecb6c57e40d39313691b931edb96fbd4d03083f300f
 DIST ldns-1.6.11.tar.gz 1018369 SHA256 6891b8ea8e9ded3e7d2caaaf494a8c2459bab729cdd1716f6db2ba375f628888 SHA512 be8453d4ce9e21e99950f28e66a72139321a320ba8629a4fcb5e00ccb241ca71deee331302a80785c2562cb93e4f3292d5051ff590c0192d1d514a335291a7b9 WHIRLPOOL 6f8741579506c7e3a5525207f8c1a91c03adbc346fe5d65c39ec44345959a343f189b41e33b12640651e28a1c0c337ba460afbf0989351a2d2491085031ef2af
 DIST ldns-1.6.12.tar.gz 1057607 SHA256 b966787510a169ca0ed78f9a8a5de01fb309909575e721ead92095d4677aa51c SHA512 f928be35a5c0bc2b918f005dd592cc531451f373ed9d77a54d5207a2a80b9d525faabf75bba75483d3476cfeff75a66ad4d9527a84a983216dae4fac30213773 WHIRLPOOL 0e8cf513991850b065144568ec1ea3188ddb6bbf6b3cf08490186552884b2b2dd42ae8ab8995f54c183a989976ab292772411f2582a5bd595d4d54d25e2b4096
 DIST ldns-1.6.13.tar.gz 1066139 SHA256 e50622f68908ac57eeef1b2f94bf2cf4d6b1dd309b4e613dce36139d89f15680 SHA512 35bc4cd673ea48dc5d08f22ec06b0ceaa1448c9171beeb3989a1a33c95e616694db3a515466e54f1364636dcf48425600cd42541397be9209f165adb445200e1 WHIRLPOOL 6dc945e72ed7415c38d21a7989f996977478b2a4b47a50733969a784c909a6d865be204acd0a2dd5290c8a32f5053a6ab0053618868d4bd71178e3d25b2c8db9
-EBUILD ldns-1.6.11.ebuild 1671 SHA256 f8270f95bcaeea21464fb055bfd3441edda1f5d977ea17985997091637c2585e SHA512 1dc714621194ca0c8aaf4850d943fca1612cb1c224b71aa611ba3e5ce359323546b1c27034ce07d9fa813b4f9857b08ab062edb7c1bbc8f0b67a029b5f4f686b WHIRLPOOL 5c4c159074e66337b9db5393307da0662039f71c8725f9986453999ff649d7655975744837f39b55fc41aff298ec9a2b7f9b5033617ba6d4e154ad72f3296df6
-EBUILD ldns-1.6.12-r1.ebuild 1682 SHA256 8db4f892029f95b00138ebfffc87819c80fdc2f25e8c3518a7d9382a043566fc SHA512 c31f0a49479c1dd9319c1873d5bace7bdd835438b30698697c9e6e36c883fd919473d9a9f333923c88d624ad20b7c610dc30dcde7140bd252fee1f38feb63b9e WHIRLPOOL 5668519b54b2f719673b5eacfb724f008bbdd38535daa05ab73c76e1313fca2b035d2aa7fdf765f20b4402846d6a5c09b1983ba14c30a2e6c15d25780564c286
-EBUILD ldns-1.6.12-r2.ebuild 1759 SHA256 62b6d0abdee757b29de3056a5943802aad11374c70988fac2e84af70c2409315 SHA512 b2bd979ecfdaf03dc1c7a08a330d40121f47aa795708557ddf5656613a53db138f49c632bcd9163ecb62c6e8a64978ae39cb45f6e45307dbcd42d6ad89a938d2 WHIRLPOOL 3ca6b2270e085221db773dedec95cdfdf65d909d2aa1769f850057f83b9217a78231b66e6d4eb381700c6079c4c95a08a61e2ce13c71113c7d1dcc7cd5f2d1e4
-EBUILD ldns-1.6.12.ebuild 1766 SHA256 6b6967732db1804624304200c44667fad57ce1d6e934f63345874f4f30578f01 SHA512 5013a75e2cfc52ebd067595f70418959250e3bbafee882fc5110d62cfd8af9484abd1f0d8e613c03ef4e790ecb59f3b8f7c39dddb266994942bd720e7796c69e WHIRLPOOL d95e4c24fbf819b1a1c8a50bf26df90c70429279acf460520039b2dfba59a8b5de682297ba77199cfc06fa9dea335379036c5caf73f9ab3ad2fe52cebec7af8f
+EBUILD ldns-1.6.11.ebuild 1685 SHA256 f53128a71c6a38b90b75227a75a18b505c40eda4618083714331d7a19822c3cb SHA512 eefd5fa6e6b4ef9b5e01071669385ac530fe86a195e862409bdf78d9e19d92dee8510deedf083b695f792e3a437534a8e93eeb1868778b2f6fc57b76a79c81cc WHIRLPOOL c72ae908359fc979be9ca3c403d4810f5532f3e851ecd8064c4fb98a3d3f62fc631738d6d033a232b79ffabe9ad2d9c05cd78cfc02dd64963704c4053ef06164
+EBUILD ldns-1.6.12-r1.ebuild 1714 SHA256 c75125d84cd3292ae831ab101a8ea2e5bfd34772132bdfbb70fb687ef815e998 SHA512 3ae4df1af4d6cf37e0c18ee510a51180fd7559c4ea707a222dd0b8b439f4ed4b396c39aedbdb0babd0664181950a70b69b0c4d2ea09f8b1e277c493460c20377 WHIRLPOOL 2fe0a93f985c2da48c6dc4e4ee3f4e1f0bdcef41a684bb77786e6186ee0eaa965585b41d6a4659354445f7d78833db1b31182ccf4fc3248ad21f51bf7851c23e
+EBUILD ldns-1.6.12-r2.ebuild 1785 SHA256 f98b528f760dad7e716f3e59a4793f4659fe5da0ea1fb3bed9190240ebb01680 SHA512 8dbbd3caafead0d64a801476b1e06d27a9d0396cf0686c61debf4a710f0af301c0a9a45f21c0b5fded3c08810dde592e66489923129d431d9366e3ffaf76c861 WHIRLPOOL 8cbeda35f39d7ff2c4009710852e1f3ab1512fbec1372c151d828296468da10b0abe3f0c0bd9804bfe87487379d29e936281fda615c31d9c7a40113ae0f8033f
+EBUILD ldns-1.6.12.ebuild 1777 SHA256 78ef8e10a57eddb4f6b6dd6cec08a266a808560360795686b37568848fe2321c SHA512 e16c81c489fb1232add1afa57804cc161b70e85bd539f9b48a75aad785a9b94795d969be81597629251645f6b3c33f1f0e57c6fb09dd5c83cd18443bb5995285 WHIRLPOOL b089a500d0babf9a3ac1f0e0efcb0a1e1fadad7543bc97e7157b4c75d8e22901c0740ada599150d890bdd57e91993103b25a92b041716300f0ba12a32621fe6c
 EBUILD ldns-1.6.13-r1.ebuild 2068 SHA256 d3e8b2a3ae099ef0be3f0bb807a82e27cdaa09a8d399807b9c1d2c1d2cfa5bb7 SHA512 fd93ce6e237f5b396e47598aa4835f9d60ca07b18f8d7849ea7475941e449bc80f7b6ee64eee2371b661227a91a742f88aced0785903179f8f8adb92e0a36d31 WHIRLPOOL c11fc2c6b46ce47f956eda58785fc9bf870ee20ca8875430b50fa31eba7e69b644f18f80c1b3fef9dd63674bc0045eebeae23f11d6cc19bc3d76be40d7e39244
-MISC ChangeLog 4848 SHA256 c4196259317491f30a1201474746a273134ed757636df863d6e5130437d2bde9 SHA512 3e2e121eedfdb3223602fcb6adb17194bf6a91e40b4c43266bce304b7257dc71f411296deacd720fdb4f459f76821cf1966805ef2569c510574ea284908ccd45 WHIRLPOOL 7d344550bc8ea06ca4792301423dcae31df088c6baa2d5f1db739ad567ea0c1f917a609f9075499b253844005127a99706812242513343ea152412e9e22449bf
+MISC ChangeLog 5046 SHA256 b9423a311dce259f6a98b7c54ba8cd2a07d19751c38f1ce7d4f13811a9030c9a SHA512 c04a40e95775c0c92260aebf4d5b70cf90d1151513d8f8fde5e07cb18912957de963f2fd07b3a3795dfed632c8c6da307c9c3ceeb5ef176a7e239985e153a929 WHIRLPOOL 09733a9b78e3656b44d3b843cee50db6403f74c3b960ffcb5092b87fbc3473dc8893eed289057509d388070b55bac3d676bb7aeb59b20e2591c4457020e6c08a
 MISC metadata.xml 571 SHA256 236a39641ff6696702b8eb369158d2136157f5c353ef908db7443eb4cd6fa67f SHA512 a14d0d873c20ee38b07f86de61d530e5d7dba0c65f01bea0774a681057895bc8ed12597ab8835a2ff1454864cb7c40e8d79cc28fd515789795969af8cdcca5b3 WHIRLPOOL ae393dbd7ffe8d539820f426fc801c6a8d6fa221a94dbd72ed9f83b5b7e67e6a76bea0e34079639a3b7f991fcb400fd1de93a267c7e1ceb5c8ae61aa6a45a476
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlADaqsACgkQC77qH+pIQ6R0nQEAn/mHuU65Hb/S/2N/HU4ALcdj
+c/6VsG+FAX7brGWDG6kBAKBrIwCpVWSJZnrDEXDISlHP8Rte+cjVx8/AG0aQlm0l
+=Btae
+-----END PGP SIGNATURE-----
diff --git a/net-libs/ldns/ldns-1.6.11.ebuild b/net-libs/ldns/ldns-1.6.11.ebuild
index 6f7d5e099a75..277d06927860 100644
--- a/net-libs/ldns/ldns-1.6.11.ebuild
+++ b/net-libs/ldns/ldns-1.6.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/net-libs/ldns/ldns-1.6.11.ebuild,v 1.4 2012/02/10 03:09:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.11.ebuild,v 1.5 2012/07/16 01:13:05 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 pkg_setup() {
-	python_set_active_version 2
+	use python && python_set_active_version 2
 }
 
 src_configure() {
diff --git a/net-libs/ldns/ldns-1.6.12-r1.ebuild b/net-libs/ldns/ldns-1.6.12-r1.ebuild
index 7005692caf49..3109e45e936e 100644
--- a/net-libs/ldns/ldns-1.6.12-r1.ebuild
+++ b/net-libs/ldns/ldns-1.6.12-r1.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/net-libs/ldns/ldns-1.6.12-r1.ebuild,v 1.1 2012/05/31 05:43:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.12-r1.ebuild,v 1.2 2012/07/16 01:13:05 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.5"
@@ -25,8 +25,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	use python && python_set_active_version 2
+	use python && python_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-libs/ldns/ldns-1.6.12-r2.ebuild b/net-libs/ldns/ldns-1.6.12-r2.ebuild
index 4ffb3dd49418..b111ef0e4de5 100644
--- a/net-libs/ldns/ldns-1.6.12-r2.ebuild
+++ b/net-libs/ldns/ldns-1.6.12-r2.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/net-libs/ldns/ldns-1.6.12-r2.ebuild,v 1.2 2012/06/04 18:52:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.12-r2.ebuild,v 1.3 2012/07/16 01:13:05 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2:2.5"
@@ -25,8 +25,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	use python && python_set_active_version 2
+	use python && python_pkg_setup
 }
 
 src_prepare() {
diff --git a/net-libs/ldns/ldns-1.6.12.ebuild b/net-libs/ldns/ldns-1.6.12.ebuild
index fad665a11172..bd500e1a3574 100644
--- a/net-libs/ldns/ldns-1.6.12.ebuild
+++ b/net-libs/ldns/ldns-1.6.12.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/net-libs/ldns/ldns-1.6.12.ebuild,v 1.4 2012/05/21 09:53:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.12.ebuild,v 1.5 2012/07/16 01:13:05 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 pkg_setup() {
-	python_set_active_version 2
+	use python && python_set_active_version 2
 }
 
 src_prepare() {