From 5f359655316bd5d4e90fdb323502e7c972af28a7 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 29 Nov 2015 09:16:59 +0100 Subject: 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 13e9d38c4ec2..3dfac9ed0082 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} " - 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} -- cgit v1.2.3-65-gdbad