summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-11-30 17:57:11 +0000
committerMike Gilbert <floppym@gentoo.org>2013-11-30 17:57:11 +0000
commit3a301fc8d695a4cdf04a45c7770b2ddee11f8349 (patch)
tree4f72260410bc89c153c10f8948ffa8ae422aa228 /eclass/python-r1.eclass
parentVersion bump (bug #492918) (diff)
downloadhistorical-3a301fc8d695a4cdf04a45c7770b2ddee11f8349.tar.gz
historical-3a301fc8d695a4cdf04a45c7770b2ddee11f8349.tar.bz2
historical-3a301fc8d695a4cdf04a45c7770b2ddee11f8349.zip
Depend on dev-lang/python-exec:0 if _PYTHON_WANT_PYTHON_EXEC2 is 0, bug 489646.
Diffstat (limited to 'eclass/python-r1.eclass')
-rw-r--r--eclass/python-r1.eclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 7d9f3b5c4dd0..1950725ebcea 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.64 2013/10/30 19:14:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.65 2013/11/30 17:57:11 floppym Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -205,7 +205,9 @@ _python_set_globals() {
# but if new targets were added, we may need to force a rebuild
# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
# just fix :2 since := deps are not supported.
- if [[ ${EAPI} != 4 ]]; then
+ if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then
+ PYTHON_DEPS+="dev-lang/python-exec:0[${PYTHON_USEDEP}]"
+ elif [[ ${EAPI} != 4 ]]; then
PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]"
else
PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"