Don't call python_set_active version if python is disabled.

(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)

5 files changed, 15 insertions, 12 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/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() {