From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 240EA158094 for ; Mon, 18 Jul 2022 16:04:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7C2EE0F93; Mon, 18 Jul 2022 16:04:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF2A4E0F93 for ; Mon, 18 Jul 2022 16:04:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7E75340F06 for ; Mon, 18 Jul 2022 16:04:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32E7B544 for ; Mon, 18 Jul 2022 16:04:29 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1658160248.50710f3d0e8f19fab5571d9596c336314e96b5cf.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/autotools.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 50710f3d0e8f19fab5571d9596c336314e96b5cf X-VCS-Branch: master Date: Mon, 18 Jul 2022 16:04:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 699dd55d-b83a-46de-b5f7-75b80cbb0ee0 X-Archives-Hash: c175a357212647c257edf293ff1887ee commit: 50710f3d0e8f19fab5571d9596c336314e96b5cf Author: Ulrich Müller gentoo org> AuthorDate: Thu May 26 15:15:58 2022 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Jul 18 16:04:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50710f3d autotools.eclass: Drop support for EAPI 5 Signed-off-by: Ulrich Müller gentoo.org> eclass/autotools.eclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 025a93d207a4..ab9040d99c73 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -4,7 +4,7 @@ # @ECLASS: autotools.eclass # @MAINTAINER: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: Regenerates auto* build scripts # @DESCRIPTION: # This eclass is for safely handling autotooled software packages that need to @@ -27,7 +27,7 @@ if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then _AUTOTOOLS_ECLASS=1 case ${EAPI} in - 5|6) + 6) # Needed for eqawarn inherit eutils ;; @@ -130,7 +130,7 @@ RDEPEND="" : ${AUTOTOOLS_AUTO_DEPEND:=yes} if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then case ${EAPI} in - 5|6) DEPEND=${AUTOTOOLS_DEPEND} ;; + 6) DEPEND=${AUTOTOOLS_DEPEND} ;; *) BDEPEND=${AUTOTOOLS_DEPEND} ;; esac fi @@ -336,7 +336,7 @@ eaclocal() { # - ${BROOT}/usr/share/aclocal # - ${ESYSROOT}/usr/share/aclocal # See bug #677002 - if [[ ${EAPI} != [56] ]] ; then + if [[ ${EAPI} != 6 ]] ; then if [[ ! -f "${T}"/aclocal/dirlist ]] ; then mkdir "${T}"/aclocal || die cat <<- EOF > "${T}"/aclocal/dirlist || die @@ -394,7 +394,7 @@ eautoconf() { if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then case ${EAPI} in - 5|6|7) + 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." @@ -485,7 +485,7 @@ config_rpath_update() { local dst src case ${EAPI} in - 5|6) + 6) src="${EPREFIX}/usr/share/gettext/config.rpath" ;; *) @@ -516,7 +516,7 @@ autotools_env_setup() { # Break on first hit to respect _LATEST_AUTOMAKE order. local hv_args="" case ${EAPI} in - 5|6) + 6) hv_args="--host-root" ;; *)