diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-09-26 11:24:30 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-09-26 11:24:30 +0000 |
| commit | 5466770888e0d2f906c126644551ea56e43f4292 (patch) | |
| tree | e6bd4483987fd1bf5c21d26a42b5c20fcb79b5f0 /eclass/python-utils-r1.eclass | |
| parent | Add myself to maintainers (okayed by lu_zero in IRC). (diff) | |
| download | gentoo-2-5466770888e0d2f906c126644551ea56e43f4292.tar.gz gentoo-2-5466770888e0d2f906c126644551ea56e43f4292.tar.bz2 gentoo-2-5466770888e0d2f906c126644551ea56e43f4292.zip | |
Fix EAPI=4 on python-exec:2 since that is what pkgcore will require (the only EAPI=4 consumer right now).
Diffstat (limited to 'eclass/python-utils-r1.eclass')
| -rw-r--r-- | eclass/python-utils-r1.eclass | 7 |
1 files changed, 3 insertions, 4 deletions
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 |