From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1461230-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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86430158020 for <garchives@archives.gentoo.org>; Sun, 27 Nov 2022 21:06:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9C5AE08F3; Sun, 27 Nov 2022 21:06:35 +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 8931EE08F3 for <gentoo-commits@lists.gentoo.org>; Sun, 27 Nov 2022 21:06:35 +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 5E65133E6A7 for <gentoo-commits@lists.gentoo.org>; Sun, 27 Nov 2022 21:06:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8ED0074E for <gentoo-commits@lists.gentoo.org>; Sun, 27 Nov 2022 21:06:32 +0000 (UTC) From: "Alfredo Tupone" <tupone@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, "Alfredo Tupone" <tupone@gentoo.org> Message-ID: <1669583180.e9e69683de2a169a0ebba4790c50d7256257ee84.tupone@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: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: e9e69683de2a169a0ebba4790c50d7256257ee84 X-VCS-Branch: master Date: Sun, 27 Nov 2022 21:06:32 +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: 075ef7d1-3713-46b8-960c-ddeceecedca4 X-Archives-Hash: bb2f05b83aacf79bf6139454973b077a commit: e9e69683de2a169a0ebba4790c50d7256257ee84 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sun Nov 27 21:05:49 2022 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sun Nov 27 21:06:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e69683 ada.eclass: drop gnat_2020 from ada.eclass Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> eclass/ada.eclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/eclass/ada.eclass b/eclass/ada.eclass index 9139d5820a93..d8a456a96951 100644 --- a/eclass/ada.eclass +++ b/eclass/ada.eclass @@ -58,7 +58,7 @@ EXPORT_FUNCTIONS pkg_setup # @DESCRIPTION: # All supported Ada implementations, most preferred last. _ADA_ALL_IMPLS=( - gnat_2020 gnat_2021 gcc_12_2_0 + gnat_2021 gcc_12_2_0 ) readonly _ADA_ALL_IMPLS @@ -83,7 +83,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_202[01]) + gnat_2021) return 0 ;; gcc_12_2_0) @@ -180,7 +180,7 @@ ada_export() { local impl var case "${1}" in - gnat_202[01]) + gnat_2021) impl=${1} shift ;; @@ -200,10 +200,6 @@ ada_export() { local gcc_pv local slot case "${impl}" in - gnat_2020) - gcc_pv=9.3.1 - slot=9.3.1 - ;; gnat_2021) gcc_pv=10 slot=10 @@ -258,7 +254,7 @@ ada_export() { ;; ADA_PKG_DEP) case "${impl}" in - gnat_202[01]) + gnat_2021) ADA_PKG_DEP="dev-lang/gnat-gpl:${slot}[ada]" ;; *)