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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 81EA215813A for ; Fri, 17 Jan 2025 21:32:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CFB7E08F0; Fri, 17 Jan 2025 21:32:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E271DE08E5 for ; Fri, 17 Jan 2025 21:32:03 +0000 (UTC) From: Mike Gilbert To: gentoo-dev@lists.gentoo.org Cc: base-system@gentoo.org, Mike Gilbert Subject: [gentoo-dev] [PATCH] autotools.eclass: simplify WANT_AUTOCONF logic Date: Fri, 17 Jan 2025 16:32:00 -0500 Message-ID: <20250117213200.3137745-1-floppym@gentoo.org> X-Mailer: git-send-email 2.48.0 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: e3cdb58b-0afd-44e0-a5c0-b5421d206254 X-Archives-Hash: 5a8d4cdbdd088bee0d1e8bbd22d01cd7 Update WANT_AUTOMAKE atoms to match. Drop 2.71 from _LATEST_AUTOCONF since 2.72 is stable. Closes: https://bugs.gentoo.org/948125 Signed-off-by: Mike Gilbert --- PR: https://github.com/gentoo/gentoo/pull/40187 eclass/autotools.eclass | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 518f6addcc50..a36b6ba859be 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: autotools.eclass @@ -71,7 +71,7 @@ inherit gnuconfig libtool # Do NOT change this variable in your ebuilds! # If you want to force a newer minor version, you can specify the correct # WANT value by using a colon: : -_LATEST_AUTOCONF=( 2.72-r1:2.72 2.71-r6:2.71 ) +_LATEST_AUTOCONF=( 2.72-r1:2.72 ) # @ECLASS_VARIABLE: _LATEST_AUTOMAKE # @INTERNAL @@ -109,14 +109,13 @@ if [[ -n ${WANT_AUTOMAKE} ]] ; then unset _automake_atom_tmp ;; *) - _automake_atom="=dev-build/automake-${WANT_AUTOMAKE}*" + _automake_atom="dev-build/automake:${WANT_AUTOMAKE}" ;; esac export WANT_AUTOMAKE fi if [[ -n ${WANT_AUTOCONF} ]] ; then - # TODO: Fix the slot mess here and just have proper PV-as-SLOT? # TODO: Make _LATEST_AUTOCONF an assoc. array and instead iterate over # its keys. case ${WANT_AUTOCONF} in @@ -124,25 +123,13 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then # some packages don't require autoconf at all _autoconf_atom="" ;; - 2.1) - _autoconf_atom=">=dev-build/autoconf-2.13-r7:2.1" - ;; - 2.5) - _autoconf_atom=">=dev-build/autoconf-2.71-r6:2.71" - ;; - 2.69) - _autoconf_atom=">=dev-build/autoconf-2.69-r9:2.69" - ;; - 2.71) - _autoconf_atom=">=dev-build/autoconf-2.71-r6:2.71" - ;; latest) printf -v _autoconf_atom_tmp '>=dev-build/autoconf-%s:%s ' ${_LATEST_AUTOCONF[@]/:/ } _autoconf_atom="|| ( ${_autoconf_atom_tmp} )" unset _autoconf_atom_tmp ;; *) - die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" + _autoconf_atom="dev-build/autoconf:${WANT_AUTOCONF}" ;; esac export WANT_AUTOCONF -- 2.48.0