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 B662B158015 for ; Wed, 27 Dec 2023 20:57:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67D6F2BC022; Wed, 27 Dec 2023 20:57:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 5269A2BC022 for ; Wed, 27 Dec 2023 20:57:34 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 876C5341B52 for ; Wed, 27 Dec 2023 20:57:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBCE014B4 for ; Wed, 27 Dec 2023 20:57:31 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1703710627.41a10cf44b022f88604535fc5d4fd6c0c62cbf55.sam@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: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 41a10cf44b022f88604535fc5d4fd6c0c62cbf55 X-VCS-Branch: master Date: Wed, 27 Dec 2023 20:57:31 +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: 5100c914-fdef-4234-ae7a-dc287efc94bc X-Archives-Hash: 11908bef9c164f03e6e57cd73b4bed3e commit: 41a10cf44b022f88604535fc5d4fd6c0c62cbf55 Author: Sam James gentoo org> AuthorDate: Wed Dec 27 19:38:21 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 27 20:57:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a10cf4 autotools.eclass: treat 2.5 as 2.71 for now Having an unbound dependency (no slot) causes all sorts of problems. Add cases for each slot. I think we should really have the slots aligned to PV and slotmove as required but let's handle that another time. This would've hidden the original bug at least. Bug: https://bugs.gentoo.org/920822 Signed-off-by: Sam James gentoo.org> eclass/autotools.eclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 5eab543409a5..5c266c701e25 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -118,6 +118,8 @@ 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 none) # some packages don't require autoconf at all @@ -127,7 +129,13 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then _autoconf_atom=">=sys-devel/autoconf-2.13-r7:2.1" ;; 2.5) - _autoconf_atom=">=sys-devel/autoconf-2.71-r6" + _autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71" + ;; + 2.69) + _autoconf_atom=">=sys-devel/autoconf-2.69-r9:2.69" + ;; + 2.71) + _autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71" ;; latest) printf -v _autoconf_atom_tmp '>=sys-devel/autoconf-%s:%s ' ${_LATEST_AUTOCONF[@]/:/ }