commit: 7f1ba932dc75585e05798e171d2ee2324e06b69e Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Jul 13 09:02:31 2021 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Jul 13 09:02:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7f1ba932
autotools.eclass: sync for EAPI=8 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> eclass/autotools.eclass | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 196d5075f4..5b4d4457ee 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -4,7 +4,7 @@ # @ECLASS: autotools.eclass # @MAINTAINER: # [email protected] -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: Regenerates auto* build scripts # @DESCRIPTION: # This eclass is for safely handling autotooled software packages that need to @@ -31,7 +31,7 @@ case ${EAPI} in # Needed for eqawarn inherit eutils ;; - 7) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; esac @@ -373,10 +373,21 @@ eautoconf() { die "No configure.{ac,in} present!" fi + if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then - 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" - eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." + case ${EAPI:-0} in + 0|1|2|3|4|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" + eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." + ;; + *) + # Move configure file to the new location only on newer EAPIs to ensure + # checks are done rather than retroactively breaking ebuilds. + eqawarn "Moving configure.in to configure.ac (bug #426262)" + mv configure.{in,ac} || die + ;; + esac fi # Install config.guess and config.sub which are required by many macros
