From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1726153-garchives=archives.gentoo.org@lists.gentoo.org>
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 finch.gentoo.org (Postfix) with ESMTPS id 3279C1582EF
for <garchives@archives.gentoo.org>; Mon, 10 Mar 2025 01:55:57 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(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)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 1E163343120
for <garchives@archives.gentoo.org>; Mon, 10 Mar 2025 01:55:57 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 928751103C8;
Mon, 10 Mar 2025 01:55:46 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 891051103C7
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Mar 2025 01:55:46 +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 40DC734311E
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Mar 2025 01:55:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 73B7828BB
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Mar 2025 01:55:43 +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: <1741571669.50d9cf48986effb0baf5d92103137e7902d6ae5d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/ada.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 50d9cf48986effb0baf5d92103137e7902d6ae5d
X-VCS-Branch: master
Date: Mon, 10 Mar 2025 01:55:43 +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: 1604f764-6b0b-4d64-bdf3-c1c310581f29
X-Archives-Hash: c4dd7021f613154570ba7c84922ee62e
commit: 50d9cf48986effb0baf5d92103137e7902d6ae5d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 10 00:03:17 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 01:54:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d9cf48
ada.eclass: drop gnat_2021 (dev-lang/gnat-gpl) support
dev-lang/gnat-gpl is being last-rited.
Bug: https://bugs.gentoo.org/951054
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/ada.eclass | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index 3d22dd5d2a61..2732b4f57afd 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: ada.eclass
@@ -49,7 +49,7 @@ _ADA_ECLASS=1
# Example value:
# @CODE
# ada_target_gcc_12? ( sys-devel/gcc:12[ada] )
-# ada_target_gnat_2021? ( dev-lang/gnat-gps:2021[ada] )
+# ada_target_gcc_13? ( sys-devel/gcc:13[ada] )
# @CODE
# @ECLASS_VARIABLE: _ADA_ALL_IMPLS
@@ -57,7 +57,7 @@ _ADA_ECLASS=1
# @DESCRIPTION:
# All supported Ada implementations, most preferred last.
_ADA_ALL_IMPLS=(
- gnat_2021 gcc_12 gcc_13 gcc_14 gcc_15
+ gcc_12 gcc_13 gcc_14 gcc_15
)
readonly _ADA_ALL_IMPLS
@@ -77,7 +77,7 @@ readonly _ADA_ALL_IMPLS
#
# Example value:
# @CODE
-# ^^ ( ada_target_gnat_2021 ada_target_gcc_12 )
+# ^^ ( ada_target_gcc_12 ada_target_gcc_13 )
# @CODE
# @ECLASS_VARIABLE: ADA_USEDEP
@@ -119,7 +119,7 @@ _ada_impl_supported() {
# keep in sync with _ADA_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- gnat_2021|gcc_12|gcc_13|gcc_14|gcc_15)
+ gcc_12|gcc_13|gcc_14|gcc_15)
return 0
;;
*)
@@ -213,7 +213,7 @@ ada_export() {
local impl var
case "${1}" in
- gnat_2021|gcc_12|gcc_13|gcc_14|gcc_15)
+ gcc_12|gcc_13|gcc_14|gcc_15)
impl=${1}
shift
;;
@@ -229,10 +229,6 @@ ada_export() {
local gcc_pv
local slot
case "${impl}" in
- gnat_2021)
- gcc_pv=10
- slot=10
- ;;
gcc_12)
gcc_pv=12
slot=12
@@ -299,9 +295,6 @@ ada_export() {
;;
ADA_PKG_DEP)
case "${impl}" in
- gnat_2021)
- ADA_PKG_DEP="dev-lang/gnat-gpl:${slot}[ada]"
- ;;
gcc_12|gcc_13|gcc_14|gcc_15)
ADA_PKG_DEP="sys-devel/gcc:${slot}[ada]"
;;