Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 27 Nov 2022 21:06:36
Message-Id: 1669583180.e9e69683de2a169a0ebba4790c50d7256257ee84.tupone@gentoo
1 commit: e9e69683de2a169a0ebba4790c50d7256257ee84
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 27 21:05:49 2022 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 27 21:06:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e69683
7
8 ada.eclass: drop gnat_2020 from ada.eclass
9
10 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
11
12 eclass/ada.eclass | 12 ++++--------
13 1 file changed, 4 insertions(+), 8 deletions(-)
14
15 diff --git a/eclass/ada.eclass b/eclass/ada.eclass
16 index 9139d5820a93..d8a456a96951 100644
17 --- a/eclass/ada.eclass
18 +++ b/eclass/ada.eclass
19 @@ -58,7 +58,7 @@ EXPORT_FUNCTIONS pkg_setup
20 # @DESCRIPTION:
21 # All supported Ada implementations, most preferred last.
22 _ADA_ALL_IMPLS=(
23 - gnat_2020 gnat_2021 gcc_12_2_0
24 + gnat_2021 gcc_12_2_0
25 )
26 readonly _ADA_ALL_IMPLS
27
28 @@ -83,7 +83,7 @@ _ada_impl_supported() {
29 # keep in sync with _ADA_ALL_IMPLS!
30 # (not using that list because inline patterns shall be faster)
31 case "${impl}" in
32 - gnat_202[01])
33 + gnat_2021)
34 return 0
35 ;;
36 gcc_12_2_0)
37 @@ -180,7 +180,7 @@ ada_export() {
38 local impl var
39
40 case "${1}" in
41 - gnat_202[01])
42 + gnat_2021)
43 impl=${1}
44 shift
45 ;;
46 @@ -200,10 +200,6 @@ ada_export() {
47 local gcc_pv
48 local slot
49 case "${impl}" in
50 - gnat_2020)
51 - gcc_pv=9.3.1
52 - slot=9.3.1
53 - ;;
54 gnat_2021)
55 gcc_pv=10
56 slot=10
57 @@ -258,7 +254,7 @@ ada_export() {
58 ;;
59 ADA_PKG_DEP)
60 case "${impl}" in
61 - gnat_202[01])
62 + gnat_2021)
63 ADA_PKG_DEP="dev-lang/gnat-gpl:${slot}[ada]"
64 ;;
65 *)