[gentoo-dev] [PATCH 3/3] distutils-r1.eclass: Remove EAPI 7 support

[Michał Górny]

Signed-off-by: Michał Górny <mgo...@gentoo.org>
---
 eclass/distutils-r1.eclass | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index af88950ee52a..1d55f9426baa 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Author: Michał Górny <mgo...@gentoo.org>
 # Based on the work of: Krzysztof Pawlik <nelch...@gentoo.org>
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
 # @PROVIDES: python-r1 python-single-r1
 # @BLURB: A simple eclass to build Python packages using distutils.
 # @DESCRIPTION:
@@ -204,7 +204,7 @@ if [[ -z ${_DISTUTILS_R1_ECLASS} ]]; then
 _DISTUTILS_R1_ECLASS=1
 
 case ${EAPI} in
-       7|8) ;;
+       8) ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -605,7 +605,7 @@ esetup.py() {
                setup_py=( -c "from setuptools import setup; setup()" )
        fi
 
-       if [[ ${EAPI} != 7 && ${mydistutilsargs[@]} ]]; then
+       if [[ ${mydistutilsargs[@]} ]]; then
                die "mydistutilsargs is banned in EAPI ${EAPI} (use 
DISTUTILS_ARGS)"
        fi
 
@@ -665,8 +665,7 @@ _distutils-r1_check_all_phase_mismatch() {
                eqawarn "QA Notice: distutils-r1_python_${EBUILD_PHASE}_all 
called"
                eqawarn "from python_${EBUILD_PHASE}.  Did you mean to use"
                eqawarn "python_${EBUILD_PHASE}_all()?"
-               [[ ${EAPI} != 7 ]] &&
-                       die "distutils-r1_python_${EBUILD_PHASE}_all called 
from python_${EBUILD_PHASE}."
+               die "distutils-r1_python_${EBUILD_PHASE}_all called from 
python_${EBUILD_PHASE}."
        fi
 }
 
@@ -1299,9 +1298,7 @@ _distutils-r1_wrap_scripts() {
                        local basename=${f##*/}
 
                        debug-print "${FUNCNAME}: installing wrapper at 
${bindir}/${basename}"
-                       local dosym=dosym
-                       [[ ${EAPI} == 7 ]] && dosym=dosym8
-                       "${dosym}" -r /usr/lib/python-exec/python-exec2 \
+                       dosym -r /usr/lib/python-exec/python-exec2 \
                                "${bindir#${EPREFIX}}/${basename}"
                done