Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH v2 7/8] autotools-utils.eclass: Remove EAPI 2&3 support
Date: Thu, 09 Aug 2018 15:21:44
Message-Id: 20180809151602.11147-8-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH v2 0/8] eutils/path_exists removal by "Michał Górny"
---
 eclass/autotools-utils.eclass | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index f8d2c7fdc247..b0047048662d 100644
--- 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
-- 
2.18.0