[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     5f359655316bd5d4e90fdb323502e7c972af28a7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 08:16:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 08:19:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f359655

python-utils-r1.eclass: Reduce python_do*/new* ban to EAPI < 4

Fix python_do* and python_new* helper ban to EAPIs older than 4. That
was the original intent, and restricting it to 5+ breaks old
dev-lang/python ebuilds.

 eclass/python-utils-r1.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 13e9d38..3dfac9e 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -666,8 +666,8 @@ python_newexe() {
 
        [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is 
null).'
        [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
-       if [[ ${EAPI:-0} == [01234] ]]; then
-               die "python_do* and python_new* helpers are banned in EAPIs 
older than 5."
+       if [[ ${EAPI:-0} == [0123] ]]; then
+               die "python_do* and python_new* helpers are banned in EAPIs 
older than 4."
        fi
 
        local wrapd=${python_scriptroot:-${DESTTREE}/bin}
@@ -796,8 +796,8 @@ python_domodule() {
        debug-print-function ${FUNCNAME} "${@}"
 
        [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is 
null).'
-       if [[ ${EAPI:-0} == [01234] ]]; then
-               die "python_do* and python_new* helpers are banned in EAPIs 
older than 5."
+       if [[ ${EAPI:-0} == [0123] ]]; then
+               die "python_do* and python_new* helpers are banned in EAPIs 
older than 4."
        fi
 
        local d
@@ -837,8 +837,8 @@ python_doheader() {
        debug-print-function ${FUNCNAME} "${@}"
 
        [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is 
null).'
-       if [[ ${EAPI:-0} == [01234] ]]; then
-               die "python_do* and python_new* helpers are banned in EAPIs 
older than 5."
+       if [[ ${EAPI:-0} == [0123] ]]; then
+               die "python_do* and python_new* helpers are banned in EAPIs 
older than 4."
        fi
 
        local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}