summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-07 22:26:22 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-07 22:26:22 +0000
commit64f432bb22decc3c3dcdd66ff4991a4a6964996f (patch)
tree816dc18cc98c01eb386d3b09ae002789a9a79073 /net-print/cups
parentDisable automagic linking to x11-libs/libXxf86misc on request from scarabeus (diff)
downloadgentoo-2-64f432bb22decc3c3dcdd66ff4991a4a6964996f.tar.gz
gentoo-2-64f432bb22decc3c3dcdd66ff4991a4a6964996f.tar.bz2
gentoo-2-64f432bb22decc3c3dcdd66ff4991a4a6964996f.zip
QA: only try to set up active python version when python USE flag is enabled.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'net-print/cups')
-rw-r--r--net-print/cups/ChangeLog5
-rw-r--r--net-print/cups/cups-1.4.6.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 45a55f463f3c..02d7465eff28 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-print/cups
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.405 2011/03/19 17:54:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.406 2011/04/07 22:26:22 flameeyes Exp $
+
+ 07 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> cups-1.4.6.ebuild:
+ QA: only try to set up active python version when python USE flag is enabled.
19 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> cups-1.3.11-r4.ebuild,
cups-1.4.6.ebuild:
diff --git a/net-print/cups/cups-1.4.6.ebuild b/net-print/cups/cups-1.4.6.ebuild
index 8ba6d5195ecc..09331c95436d 100644
--- a/net-print/cups/cups-1.4.6.ebuild
+++ b/net-print/cups/cups-1.4.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6.ebuild,v 1.2 2011/03/19 17:54:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6.ebuild,v 1.3 2011/04/07 22:26:22 flameeyes Exp $
EAPI=3
@@ -74,8 +74,10 @@ pkg_setup() {
enewgroup lpadmin 106
# python 3 is no-go
- python_set_active_version 2
- python_pkg_setup
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
}
src_prepare() {