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

[Sam James]

commit:     5b663febf4634ea75ef9e7ab433a2e16e9fde975
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 31 23:49:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 21:00:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b663feb

autotools.eclass: drop obsolete EAPI 0 compatibility code

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/autotools.eclass | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 4a963d78db5..e01e72e69b6 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -26,7 +26,7 @@ fi
 if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then
 _AUTOTOOLS_ECLASS=1
 
-case ${EAPI:-0} in
+case ${EAPI} in
        5|6)
                # Needed for eqawarn
                inherit eutils
@@ -84,15 +84,8 @@ if [[ -n ${WANT_AUTOMAKE} ]] ; then
                # on it because we run aclocal to process m4 macros.  This 
matches
                # the autoreconf tool, so this requirement is correct, bug 
#401605.
                none) ;;
-               latest)
-                       # Use SLOT deps if we can.  For EAPI=0, we get pretty 
close.
-                       if [[ ${EAPI:-0} != 0 ]] ; then
-                               _automake_atom="|| ( `printf 
'>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )"
-                       else
-                               _automake_atom="|| ( `printf 
'>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )"
-                       fi
-                       ;;
-               *)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" 
;;
+               latest) _automake_atom="|| ( `printf 
'>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )" ;;
+               *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*";;
        esac
        export WANT_AUTOMAKE
 fi
@@ -138,8 +131,8 @@ RDEPEND=""
 # their own DEPEND string.
 : ${AUTOTOOLS_AUTO_DEPEND:=yes}
 if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
-       case ${EAPI:-0} in
-               4|5|6) DEPEND=${AUTOTOOLS_DEPEND} ;;
+       case ${EAPI} in
+               5|6) DEPEND=${AUTOTOOLS_DEPEND} ;;
                7) BDEPEND=${AUTOTOOLS_DEPEND} ;;
        esac
 fi
@@ -383,7 +376,7 @@ eautoconf() {
        fi
 
        if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then
-               case ${EAPI:-0} in
+               case ${EAPI} in
                        5|6|7)
                                eqawarn "This package has a configure.in file 
which has long been deprecated.  Please"
                                eqawarn "update it to use configure.ac instead 
as newer versions of autotools will die"
@@ -474,8 +467,8 @@ eautopoint() {
 config_rpath_update() {
        local dst src
 
-       case ${EAPI:-0} in
-               4|5|6)
+       case ${EAPI} in
+               5|6)
                        src="${EPREFIX}/usr/share/gettext/config.rpath"
                        ;;
                *)
@@ -505,7 +498,7 @@ autotools_env_setup() {
                for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do
                        # Break on first hit to respect _LATEST_AUTOMAKE order.
                        local hv_args=""
-                       case ${EAPI:-0} in
+                       case ${EAPI} in
                                5|6)
                                        hv_args="--host-root"
                                        ;;