commit:     ed4479ac04b296d36f1aa8799c28cbfdc3680691
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 06:34:01 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 06:35:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4479ac

profiles/arch: unmask Ada for >=sys-devel/gcc-12 where possible

We now have dev-lang/ada-bootstrap for 12 and 13, not just 14, so we can
go backwards and unmask 12 onwards for sys-devel/gcc[ada]. In doing so,
we can then drop the ADA_TARGETS override for 14 and use the default
of 13 instead everywhere (except loong).

Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/arch/arm/make.defaults              | 6 ------
 profiles/arch/arm/package.use.mask           | 2 +-
 profiles/arch/arm/use.mask                   | 2 --
 profiles/arch/arm64/make.defaults            | 6 ------
 profiles/arch/arm64/package.use.mask         | 2 +-
 profiles/arch/arm64/use.mask                 | 2 --
 profiles/arch/hppa/hppa1.1/package.use.mask  | 2 +-
 profiles/arch/hppa/hppa2.0/package.use.mask  | 2 +-
 profiles/arch/hppa/make.defaults             | 6 ------
 profiles/arch/hppa/use.mask                  | 2 --
 profiles/arch/powerpc/make.defaults          | 6 ------
 profiles/arch/powerpc/ppc32/package.use.mask | 4 ++--
 profiles/arch/powerpc/ppc64/package.use.mask | 4 ++--
 profiles/arch/powerpc/use.mask               | 2 --
 profiles/arch/sparc/make.defaults            | 6 ------
 profiles/arch/sparc/package.use.mask         | 2 +-
 profiles/arch/sparc/use.mask                 | 2 --
 17 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 02cf9e76f0d9..a701cf86fa52 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -25,9 +25,3 @@ VIDEO_CARDS="exynos fbdev omap"
 # Michał Górny <mgo...@gentoo.org> (2017-03-14)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
-
-# Sam James <s...@gentoo.org> (2025-01-05)
-# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
-# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
-# entry can be dropped once the global one is >= gcc_14.
-ADA_TARGET="gcc_14"

diff --git a/profiles/arch/arm/package.use.mask 
b/profiles/arch/arm/package.use.mask
index e1fe33c51cef..ff943f1965ec 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -7,7 +7,7 @@ x11-misc/xdg-utils plasma
 
 # Sam James <s...@gentoo.org> (2024-12-17)
 # dev-lang/ada-bootstrap exists here
->=sys-devel/gcc-14 -ada
+>=sys-devel/gcc-12 -ada
 
 # Andreas Sturmlechner <ast...@gentoo.org> (2024-12-10)
 # Depends on kde-plasma/kdesu-gui which is not keyworded here.

diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index e33a92c846c6..edfc08209a8c 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -7,8 +7,6 @@
 # Sam James <s...@gentoo.org> (2025-01-05)
 # Older targets don't have an old enough dev-lang/ada-bootstrap available
 ada_target_gnat_2021
-ada_target_gcc_12
-ada_target_gcc_13
 
 # Sam James <s...@gentoo.org> (2024-06-13)
 # Needs as-yet-unkeyworded KF6 (bug #934215)

diff --git a/profiles/arch/arm64/make.defaults 
b/profiles/arch/arm64/make.defaults
index e7b9c1371a6f..2bf1c06cab64 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -20,12 +20,6 @@ LIBDIR_arm64="lib64"
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
 
-# Sam James <s...@gentoo.org> (2025-01-05)
-# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
-# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
-# entry can be dropped once the global one is >= gcc_14.
-ADA_TARGET="gcc_14"
-
 # Mart Raudsepp <l...@gentoo.org> (2018-06-05)
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148

diff --git a/profiles/arch/arm64/package.use.mask 
b/profiles/arch/arm64/package.use.mask
index c8a4ee1e7d0d..97f90526922e 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -12,7 +12,7 @@ dev-python/qtpy remoteobjects
 
 # Sam James <s...@gentoo.org> (2024-12-17)
 # dev-lang/ada-bootstrap exists here
->=sys-devel/gcc-14 -ada
+>=sys-devel/gcc-12 -ada
 
 # Alexey Shvetsov <ale...@gentoo.org> (2024-11-21)
 # sci-libs/caffe2 is not keyworded on arm64

diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 0dd10cef4fb9..7e6739b8e047 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -7,8 +7,6 @@
 # Sam James <s...@gentoo.org> (2025-01-05)
 # Older targets don't have an old enough dev-lang/ada-bootstrap available
 ada_target_gnat_2021
-ada_target_gcc_12
-ada_target_gcc_13
 
 # Paul Zander <negril.nx+gen...@gmail.com> (2024-03-28)
 # dev-libs/optix works on arm64

diff --git a/profiles/arch/hppa/hppa1.1/package.use.mask 
b/profiles/arch/hppa/hppa1.1/package.use.mask
index 5ec523e8927a..6258dc68a098 100644
--- a/profiles/arch/hppa/hppa1.1/package.use.mask
+++ b/profiles/arch/hppa/hppa1.1/package.use.mask
@@ -3,4 +3,4 @@
 
 # Sam James <s...@gentoo.org> (2025-01-01)
 # dev-lang/ada-bootstrap exists here
->=sys-devel/gcc-14 -ada
+>=sys-devel/gcc-12 -ada

diff --git a/profiles/arch/hppa/hppa2.0/package.use.mask 
b/profiles/arch/hppa/hppa2.0/package.use.mask
index 5ec523e8927a..6258dc68a098 100644
--- a/profiles/arch/hppa/hppa2.0/package.use.mask
+++ b/profiles/arch/hppa/hppa2.0/package.use.mask
@@ -3,4 +3,4 @@
 
 # Sam James <s...@gentoo.org> (2025-01-01)
 # dev-lang/ada-bootstrap exists here
->=sys-devel/gcc-14 -ada
+>=sys-devel/gcc-12 -ada

diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 3330405919e4..dc3189796375 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -10,12 +10,6 @@ CXXFLAGS="${CFLAGS}"
 
 FEATURES="sandbox sfperms strict"
 
-# Sam James <s...@gentoo.org> (2025-01-05)
-# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
-# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
-# entry can be dropped once the global one is >= gcc_14.
-ADA_TARGET="gcc_14"
-
 # Michał Górny <mgo...@gentoo.org> (2014-07-01)
 # Set ABI & DEFAULT_ABI consistently with ${ARCH}, to make ebuild
 # checks simpler.

diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index ab4e4a87102b..36be9cd9cdf7 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -10,8 +10,6 @@
 # Sam James <s...@gentoo.org> (2025-01-05)
 # Older targets don't have an old enough dev-lang/ada-bootstrap available
 ada_target_gnat_2021
-ada_target_gcc_12
-ada_target_gcc_13
 
 # Sam James <s...@gentoo.org> (2023-09-11)
 # wayland hasn't been tested on hppa

diff --git a/profiles/arch/powerpc/make.defaults 
b/profiles/arch/powerpc/make.defaults
index f5392d8be424..13092cf1ed3e 100644
--- a/profiles/arch/powerpc/make.defaults
+++ b/profiles/arch/powerpc/make.defaults
@@ -4,12 +4,6 @@
 # All extra USE/etc should be specified in sub-profiles.
 # DO NOT POLLUTE USE ON THIS PROFILE.
 
-# Sam James <s...@gentoo.org> (2025-01-05)
-# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
-# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
-# entry can be dropped once the global one is >= gcc_14.
-ADA_TARGET="gcc_14"
-
 # Georgy Yakovlev <gyakov...@gentoo.org> (2019-08-30)
 # Unhide PPC specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_PPC"

diff --git a/profiles/arch/powerpc/ppc32/package.use.mask 
b/profiles/arch/powerpc/ppc32/package.use.mask
index 0ae14a15d594..b784bcb40638 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <s...@gentoo.org> (2024-12-17)
 # dev-lang/ada-bootstrap exists here
->=sys-devel/gcc-14 -ada
+>=sys-devel/gcc-12 -ada
 
 # Ionen Wolkens <io...@gentoo.org> (2024-12-02)
 # net-wireless/neard is not keyworded here.

diff --git a/profiles/arch/powerpc/ppc64/package.use.mask 
b/profiles/arch/powerpc/ppc64/package.use.mask
index a0a349ea0751..28886313cd82 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgo...@gentoo.org> (2024-12-24)
@@ -7,7 +7,7 @@ llvm-core/clang-runtime -offload
 
 # Sam James <s...@gentoo.org> (2024-12-17)
 # dev-lang/ada-bootstrap exists here
->=sys-devel/gcc-14 -ada
+>=sys-devel/gcc-12 -ada
 
 # David Roman <davidroma...@gmail.com> (2024-10-04)
 # dev-libs/libunibreak is not keyworded

diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 0a6d66483c1f..13667aa34e2a 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -7,8 +7,6 @@
 # Sam James <s...@gentoo.org> (2025-01-05)
 # Older targets don't have an old enough dev-lang/ada-bootstrap available
 ada_target_gnat_2021
-ada_target_gcc_12
-ada_target_gcc_13
 
 # matoro <matoro_gen...@matoro.tk> (2022-09-29)
 # dev-util/google-perftools is supported here

diff --git a/profiles/arch/sparc/make.defaults 
b/profiles/arch/sparc/make.defaults
index d3f218aa2673..9fcf0a8a58ce 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -42,9 +42,3 @@ VIDEO_CARDS="fbdev mga r128 radeon"
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
 USE="libtirpc"
-
-# Sam James <s...@gentoo.org> (2025-01-05)
-# Temporary USE until the global default catches up. dev-lang/ada-bootstrap
-# starts with sys-devel/gcc:14 so ADA_TARGET needs to be >= that. This
-# entry can be dropped once the global one is >= gcc_14.
-ADA_TARGET="gcc_14"

diff --git a/profiles/arch/sparc/package.use.mask 
b/profiles/arch/sparc/package.use.mask
index 82cb8c7de29f..6e948bf2eb25 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -12,7 +12,7 @@ dev-build/cmake gui
 
 # Sam James <s...@gentoo.org> (2024-12-17)
 # dev-lang/ada-bootstrap exists here
->=sys-devel/gcc-14 -ada
+>=sys-devel/gcc-12 -ada
 
 # Matt Jolly <kan...@gentoo.org> (2024-12-08)
 # dev-vcs/mercurial is not keyworded on sparc

diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index ba46a802cac9..8f8e9221f8fc 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -7,8 +7,6 @@
 # Sam James <s...@gentoo.org> (2025-01-05)
 # Older targets don't have an old enough dev-lang/ada-bootstrap available
 ada_target_gnat_2021
-ada_target_gcc_12
-ada_target_gcc_13
 
 # matoro <matoro_gen...@matoro.tk> (2024-06-11)
 # Extensive use of unaligned access, no plans to fix, #636552

Reply via email to