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

[Michał Górny]

commit:     a2c3f26426b435b090b19057d52ceec5364b19ed
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:41:29 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 19:09:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c3f264

python-utils-r1.eclass: Ban installation helpers in EAPIs < 5

Ban python_do* and python_new* helpers in EAPIs older than 5. We should
ban them in python-any-r1 uses, actually but that would break
dev-python/pypy* ebuilds as they are written now.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index f27fdf0..236df89 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -665,6 +665,9 @@ 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."
+       fi
 
        local wrapd=${python_scriptroot:-${DESTTREE}/bin}
 
@@ -792,6 +795,9 @@ 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."
+       fi
 
        local d
        if [[ ${python_moduleroot} == /* ]]; then
@@ -830,6 +836,9 @@ 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."
+       fi
 
        local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
        [[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR