diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-11-30 22:57:26 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-11-30 22:57:26 +0000 |
| commit | b1421b015d51fa783803052487ab303263d7fd8d (patch) | |
| tree | 443a31e090dbd5a1e7a67991dca045c54b03f5f1 | |
| parent | Initial commit, bug 333367 (diff) | |
| download | gentoo-2-b1421b015d51fa783803052487ab303263d7fd8d.tar.gz gentoo-2-b1421b015d51fa783803052487ab303263d7fd8d.tar.bz2 gentoo-2-b1421b015d51fa783803052487ab303263d7fd8d.zip | |
Add missing REQUIRED_USE constraints to enforce PYTHON_SINGLE_TARGET being in PYTHON_TARGETS.
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/python-single-r1.eclass | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8a42c5531123..bb0bbf715066 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.531 2012/11/30 11:43:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.532 2012/11/30 22:57:26 mgorny Exp $ + + 30 Nov 2012; Michał Górny <mgorny@gentoo.org> python-single-r1.eclass: + Add missing REQUIRED_USE constraints to enforce PYTHON_SINGLE_TARGET being in + PYTHON_TARGETS. 30 Nov 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: Support all EAPIs. diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 8e9b3778d358..66915a1b2256 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -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/eclass/python-single-r1.eclass,v 1.5 2012/11/30 11:40:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.6 2012/11/30 22:57:26 mgorny Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -151,6 +151,11 @@ _python_single_set_globals() { PYTHON_DEPS="dev-python/python-exec[${PYTHON_USEDEP}]" local i for i in "${PYTHON_COMPAT[@]}"; do + # The chosen targets need to be in PYTHON_TARGETS as well. + # This is in order to enforce correct dependencies on packages + # supporting multiple implementations. + REQUIRED_USE+=" python_single_target_${i}? ( python_targets_${i} )" + local d case ${i} in python*) |