autotools-utils.eclass: Remove EAPI 2&3 support

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index f8d2c7fdc247f39444a1f677b33eb7466352dee2..b0047048662d49eb07eefa5d6f484b9b6b7152d3 100644 (file)
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: autotools-utils.eclass
@@ -89,7 +89,7 @@
 
 case ${EAPI:-0} in
        6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
-       2|3|4|5) ;;
+       4|5) ;;
        *) die "EAPI=${EAPI} is not supported" ;;
 esac
 
@@ -281,8 +281,6 @@ autotools-utils_src_configure() {
        [[ -z ${myeconfargs+1} || $(declare -p myeconfargs) == 'declare -a'* ]] \
                || die 'autotools-utils.eclass: myeconfargs has to be an array.'
 
-       [[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX=
-
        # Common args
        local econfargs=()
 
@@ -338,31 +336,12 @@ autotools-utils_src_install() {
        emake DESTDIR="${D}" "$@" install || die "emake install failed"
        popd > /dev/null || die
 
-       # Move docs installed by autotools (in EAPI < 4).
-       if [[ ${EAPI} == [23] ]] \
-                       && path_exists "${D}${EPREFIX}"/usr/share/doc/${PF}/*; then
-               if [[ $(find "${D}${EPREFIX}"/usr/share/doc/${PF}/* -type d) ]]; then
-                       eqawarn "autotools-utils: directories in docdir require at least EAPI 4"
-               else
-                       mkdir "${T}"/temp-docdir
-                       mv "${D}${EPREFIX}"/usr/share/doc/${PF}/* "${T}"/temp-docdir/ \
-                               || die "moving docs to tempdir failed"
-
-                       dodoc "${T}"/temp-docdir/* || die "docdir dodoc failed"
-                       rm -r "${T}"/temp-docdir || die
-               fi
-       fi
-
        # XXX: support installing them from builddir as well?
        if declare -p DOCS &>/dev/null; then
                # an empty list == don't install anything
                if [[ ${DOCS[@]} ]]; then
-                       if [[ ${EAPI} == [23] ]]; then
-                               dodoc "${DOCS[@]}" || die
-                       else
-                               # dies by itself
-                               dodoc -r "${DOCS[@]}"
-                       fi
+                       # dies by itself
+                       dodoc -r "${DOCS[@]}"
                fi
        else
                local f