diff options
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/python-r1.eclass | 6 | ||||
| -rw-r--r-- | eclass/python-single-r1.eclass | 13 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 7 |
4 files changed, 18 insertions, 15 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8f6dc354296e..6678be044c0a 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.987 2013/09/25 15:18:28 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.988 2013/09/26 11:24:30 mgorny Exp $ + + 26 Sep 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass, + python-single-r1.eclass, python-utils-r1.eclass: + Fix EAPI=4 on python-exec:2 since that is what pkgcore will require (the only + EAPI=4 consumer right now). 25 Sep 2013; Christoph Junghans <ottxor@gentoo.org> texlive-module.eclass: Require EAPI>=2, add prefix support diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 03f2f586c75a..750fa910254b 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.61 2013/09/17 13:33:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.62 2013/09/26 11:24:30 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -204,11 +204,11 @@ _python_set_globals() { # 2) python-exec should be built with all targets forced anyway # 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 :0 for now since := deps are not supported. + # just fix :2 since := deps are not supported. if [[ ${EAPI} != 4 ]]; then PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]" else - PYTHON_DEPS+="dev-python/python-exec:0[${PYTHON_USEDEP}]" + PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]" fi } _python_set_globals diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index e3670bf75f06..30bbab45c162 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.21 2013/09/17 13:33:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.22 2013/09/26 11:24:30 mgorny Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -31,12 +31,11 @@ # http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml case "${EAPI:-0}" in - 0|1|2|3|4) + 0|1|2|3) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;; - 5) - # EAPI=5 is required for meaningful USE default deps - # on USE_EXPAND flags + 4|5) + # EAPI=4 is required for USE default deps on USE_EXPAND flags ;; *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" @@ -194,11 +193,11 @@ _python_single_set_globals() { # 2) python-exec should be built with all targets forced anyway # 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 :0 for now since := deps are not supported. + # just fix :2 since := deps are not supported. if [[ ${EAPI} != 4 ]]; then PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]" else - PYTHON_DEPS+="dev-python/python-exec:0[${PYTHON_USEDEP}]" + PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]" fi } _python_single_set_globals diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 0329d07de3be..6e428c15c3a2 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-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-utils-r1.eclass,v 1.40 2013/09/17 19:40:56 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.41 2013/09/26 11:24:30 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -21,7 +21,6 @@ case "${EAPI:-0}" in 0|1|2|3|4|5) - # EAPI=4 makes die behavior clear ;; *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" @@ -1010,8 +1009,8 @@ python_is_python3() { _python_want_python_exec2() { debug-print-function ${FUNCNAME} "${@}" - # EAPI 4 lacks slot operators, so just fix it on python-exec:0. - [[ ${EAPI} == 4 ]] && return 1 + # EAPI 4 lacks slot operators, so just fix it on python-exec:2. + [[ ${EAPI} == 4 ]] && return 0 # Check if we cached the result, or someone put an override. if [[ ! ${_PYTHON_WANT_PYTHON_EXEC2+1} ]]; then |