From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1701033-garchives=archives.gentoo.org@lists.gentoo.org>
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 9FFE315802C
for <garchives@archives.gentoo.org>; Tue, 17 Dec 2024 17:34:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8B53CE086F;
Tue, 17 Dec 2024 17:34:31 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6F5F1E086F
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Dec 2024 17:34: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 6A7B733BF41
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Dec 2024 17:34:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 027B31A26
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Dec 2024 17:34:29 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1734456833.77810cba2a601d0c0870589850b9864ec59d9fe8.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/toolchain.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 77810cba2a601d0c0870589850b9864ec59d9fe8
X-VCS-Branch: master
Date: Tue, 17 Dec 2024 17:34:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dde84302-1417-490f-9b9e-5a1519e173e6
X-Archives-Hash: 0f26bc61f3538c4509dd381e21b1a5e5
commit: 77810cba2a601d0c0870589850b9864ec59d9fe8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 17:33:53 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 17:33:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77810cba
toolchain.eclass: allow existing slot in has_version check for ada-bootstrap too
Followup to 14e674bb7a8cb8aa50498582e392d0ecd21f2d4a.
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/toolchain.eclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b74984fc8ea8..8659a78be17e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -983,7 +983,9 @@ toolchain_setup_ada() {
# As a penultimate resort, try dev-lang/ada-bootstrap.
if ver_test ${ada_bootstrap} -gt ${PV} || [[ -z ${ada_bootstrap} ]] ; then
ebegin "Testing fallback dev-lang/ada-bootstrap for Ada"
- if has_version -b "<dev-lang/ada-bootstrap-${SLOT}" ; then
+ # XXX: This can be cleaned up like BDEPEND for tc_use_major_version_only
+ # once we only support such versions.
+ if has_version -b "=dev-lang/ada-bootstrap-${SLOT}*" || has_version -b "<dev-lang/ada-bootstrap-${SLOT}" ; then
# Workaround the old scheme
if has_version -b "=dev-lang/ada-bootstrap-0_p2021*" ; then
ada_bootstrap=10