summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-04-26 05:04:11 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-04-26 05:04:11 +0000
commit3758903c927302b92a8c269db2e2bcdeffb957b1 (patch)
treed592b50c7b870c8341f7d90198d15b47b70b8e22 /app-emulation
parentForce serial building due to bug #403905, hoping for a fix. (diff)
downloadgentoo-2-3758903c927302b92a8c269db2e2bcdeffb957b1.tar.gz
gentoo-2-3758903c927302b92a8c269db2e2bcdeffb957b1.tar.bz2
gentoo-2-3758903c927302b92a8c269db2e2bcdeffb957b1.zip
Make sure not to call python_set_active_version to 2 if we're building with USE=-python.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/libvirt/ChangeLog7
-rw-r--r--app-emulation/libvirt/libvirt-0.9.11.ebuild4
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild4
3 files changed, 10 insertions, 5 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/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
}