diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-11-30 17:57:11 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-11-30 17:57:11 +0000 |
| commit | 137542e88d853fef4c6f609b0f6b8647032eed23 (patch) | |
| tree | fe56d3bbab1d6cde06e84439ef5194258583e3ae /eclass | |
| parent | Version bump (bug #492918) (diff) | |
| download | gentoo-2-137542e88d853fef4c6f609b0f6b8647032eed23.tar.gz gentoo-2-137542e88d853fef4c6f609b0f6b8647032eed23.tar.bz2 gentoo-2-137542e88d853fef4c6f609b0f6b8647032eed23.zip | |
Depend on dev-lang/python-exec:0 if _PYTHON_WANT_PYTHON_EXEC2 is 0, bug 489646.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/python-r1.eclass | 6 | ||||
| -rw-r--r-- | eclass/python-single-r1.eclass | 6 |
3 files changed, 14 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8c887eb147f3..2586766fa21c 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1072 2013/11/25 23:22:57 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1073 2013/11/30 17:57:11 floppym Exp $ + + 30 Nov 2013; Mike Gilbert <floppym@gentoo.org> python-r1.eclass, + python-single-r1.eclass: + Depend on dev-lang/python-exec:0 if _PYTHON_WANT_PYTHON_EXEC2 is 0, bug + 489646. 26 Nov 2013; Matti Bickel <mabi@gentoo.org> php-pear-r1.eclass: export pkg_setup and default PHP_PEAR_CHANNEL to ${FILESDIR}/channel.xml (all 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}]" diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 113ccd8a8e2d..7ce57c6c6b30 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-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-single-r1.eclass,v 1.24 2013/10/30 19:14:02 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.25 2013/11/30 17:57:11 floppym Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -194,7 +194,9 @@ _python_single_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}]" |