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 270221581FB for ; Tue, 27 Aug 2024 15:19:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8300AE2A8A; Tue, 27 Aug 2024 15:16:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 4505BE2A87 for ; Tue, 27 Aug 2024 15:16:27 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 12/50] gnuconfig.eclass: drop support for EAPI 6 Date: Tue, 27 Aug 2024 17:14:57 +0200 Message-ID: <20240827151553.210835-12-soap@gentoo.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827151553.210835-1-soap@gentoo.org> References: <20240827151553.210835-1-soap@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 7ef6ec07-362d-45bf-80f1-824115340700 X-Archives-Hash: 77f7e47be00794bde1045adc0a57ce7a Signed-off-by: David Seifert --- eclass/gnuconfig.eclass | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass index fb73087aeacf..c0747d55d1e6 100644 --- a/eclass/gnuconfig.eclass +++ b/eclass/gnuconfig.eclass @@ -6,7 +6,7 @@ # Sam James # @AUTHOR: # Will Woods -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Refresh bundled gnuconfig files (config.guess, config.sub) # @DESCRIPTION: # This eclass is used to automatically update files that typically come with @@ -16,8 +16,8 @@ # other files that come with automake, e.g. depcomp, mkinstalldirs, etc. # -case ${EAPI:-0} in - 6|7|8) ;; +case ${EAPI} in + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -37,12 +37,7 @@ GNUCONFIG_DEPEND="sys-devel/gnuconfig" # ebuilds form conditional depends by using ${GNUCONFIG_DEPEND} in # their own DEPEND string. : "${GNUCONFIG_AUTO_DEPEND:=yes}" -if [[ ${GNUCONFIG_AUTO_DEPEND} != "no" ]] ; then - case ${EAPI} in - 6) DEPEND=${GNUCONFIG_DEPEND} ;; - *) BDEPEND=${GNUCONFIG_DEPEND} ;; - esac -fi +[[ ${GNUCONFIG_AUTO_DEPEND} != "no" ]] && BDEPEND=${GNUCONFIG_DEPEND} # @FUNCTION: gnuconfig_update # @USAGE: [file1 file2 ...] @@ -118,23 +113,11 @@ gnuconfig_do_update() { # This searches the standard locations for the newest config.{sub|guess}, and # returns the directory where they can be found. gnuconfig_findnewest() { - local locations=() - local prefix - - case ${EAPI} in - 6) - prefix="${EPREFIX}" - ;; - *) - prefix="${BROOT}" - ;; - esac - - locations+=( - "${prefix}"/usr/share/misc/config.sub - "${prefix}"/usr/share/gnuconfig/config.sub - "${prefix}"/usr/share/automake*/config.sub - "${prefix}"/usr/share/libtool/config.sub + local locations=( + "${BROOT}"/usr/share/misc/config.sub + "${BROOT}"/usr/share/gnuconfig/config.sub + "${BROOT}"/usr/share/automake*/config.sub + "${BROOT}"/usr/share/libtool/config.sub ) grep -s '^timestamp' "${locations[@]}" | \ -- 2.46.0