commit: 48a15993318593dc8f0fcd5ff5f7052e3ea67c73 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon May 29 18:28:48 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon May 29 18:30:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48a15993
profiles/arch: replicate ruby settings for each stable arch Replicate the current base use.stable.mask and make.defaults settings for each arch with a stable ruby to allow ruby31 to be unmasked for each arch individually. Bug: https://bugs.gentoo.org/907377 Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/arch/amd64/make.defaults | 4 ++++ profiles/arch/amd64/use.stable.mask | 4 ++++ profiles/arch/arm/make.defaults | 4 ++++ profiles/arch/arm/use.stable.mask | 4 ++++ profiles/arch/arm64/make.defaults | 4 ++++ profiles/arch/arm64/use.stable.mask | 4 ++++ profiles/arch/hppa/make.defaults | 4 ++++ profiles/arch/hppa/use.stable.mask | 4 ++++ profiles/arch/powerpc/ppc32/make.defaults | 4 ++++ profiles/arch/powerpc/ppc32/use.stable.mask | 4 ++++ profiles/arch/powerpc/ppc64/make.defaults | 4 ++++ profiles/arch/powerpc/ppc64/use.stable.mask | 4 ++++ profiles/arch/sparc/make.defaults | 4 ++++ profiles/arch/sparc/use.stable.mask | 4 ++++ profiles/arch/x86/make.defaults | 4 ++++ profiles/arch/x86/use.stable.mask | 4 ++++ 16 files changed, 64 insertions(+) diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults index d6c83267206d..9fe223d705ba 100644 --- a/profiles/arch/amd64/make.defaults +++ b/profiles/arch/amd64/make.defaults @@ -63,3 +63,7 @@ IUSE_IMPLICIT="abi_x86_64" # Enable USE=libtirpc by default, to ease dependency resolution during # the stabilization of glibc-2.26. Bug 657148 USE="libtirpc" + +# Sam James <[email protected]> (2023-05-29) +# Temporarily use old default until bug #907377 is done for this arch +RUBY_TARGETS="ruby30" diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask index 2f7f7dbd0ebc..9d8bacb894af 100644 --- a/profiles/arch/amd64/use.stable.mask +++ b/profiles/arch/amd64/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Sam James <[email protected]> (2023-05-29) +# Temporary mask for bug #907377 +ruby_targets_ruby31 + # Andreas Sturmlechner <[email protected]> (2020-06-06) # sci-libs/mkl is not stable, needs online registration to even run pkg_setup mkl diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults index 4527d2144ae0..ab17ff0424e4 100644 --- a/profiles/arch/arm/make.defaults +++ b/profiles/arch/arm/make.defaults @@ -25,3 +25,7 @@ VIDEO_CARDS="exynos fbdev omap" # Michał Górny <[email protected]> (2017-03-14) # Unhide the ARM-specific USE_EXPANDs. USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" + +# Sam James <[email protected]> (2023-05-29) +# Temporarily use old default until bug #907377 is done for this arch +RUBY_TARGETS="ruby30" diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask index 106b7593e9af..596393361ade 100644 --- a/profiles/arch/arm/use.stable.mask +++ b/profiles/arch/arm/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Sam James <[email protected]> (2023-05-29) +# Temporary mask for bug #907377 +ruby_targets_ruby31 + # Sam James <[email protected]> (2022-01-16) # net-libs/gnome-online-accounts is not marked stable on arm yet gnome-online-accounts diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults index fd42ca3f2c69..0dbb617babae 100644 --- a/profiles/arch/arm64/make.defaults +++ b/profiles/arch/arm64/make.defaults @@ -28,3 +28,7 @@ USE="libtirpc" # Michał Górny <[email protected]> (2017-03-14) # Unhide the ARM-specific USE_EXPANDs. USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" + +# Sam James <[email protected]> (2023-05-29) +# Temporarily use old default until bug #907377 is done for this arch +RUBY_TARGETS="ruby30" diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask index d05e57dc0d65..2653a787e81f 100644 --- a/profiles/arch/arm64/use.stable.mask +++ b/profiles/arch/arm64/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Sam James <[email protected]> (2023-05-29) +# Temporary mask for bug #907377 +ruby_targets_ruby31 + # Ionen Wolkens <[email protected]> (2022-02-17) # x11-drivers/nvidia-drivers is not stable yet video_cards_nvidia diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults index 9d9c0c818bea..52aebec90836 100644 --- a/profiles/arch/hppa/make.defaults +++ b/profiles/arch/hppa/make.defaults @@ -22,3 +22,7 @@ CHOST_hppa="${CHOST}" # Donnie Berkholz <[email protected]> (2006-08-18) # Defaults for video drivers VIDEO_CARDS="fbdev" + +# Sam James <[email protected]> (2023-05-29) +# Temporarily use old default until bug #907377 is done for this arch +RUBY_TARGETS="ruby30" diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask index cc3e1b11d81b..d1c7e680c93a 100644 --- a/profiles/arch/hppa/use.stable.mask +++ b/profiles/arch/hppa/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Sam James <[email protected]> (2023-05-29) +# Temporary mask for bug #907377 +ruby_targets_ruby31 + # Rolf Eike Beer <[email protected]> (2021-11-12) # dev-libs/nspr and dev-libs/nss are not stable on hppa nss diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults index 12251d45c57d..a0ba4979f4df 100644 --- a/profiles/arch/powerpc/ppc32/make.defaults +++ b/profiles/arch/powerpc/ppc32/make.defaults @@ -31,3 +31,7 @@ IUSE_IMPLICIT="abi_ppc_32" # Enable abi_ppc_32 for packages that don't have it forced. ABI_PPC="32" + +# Sam James <[email protected]> (2023-05-29) +# Temporarily use old default until bug #907377 is done for this arch +RUBY_TARGETS="ruby30" diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask index f37bb699d2a5..33700d01c783 100644 --- a/profiles/arch/powerpc/ppc32/use.stable.mask +++ b/profiles/arch/powerpc/ppc32/use.stable.mask @@ -1,6 +1,10 @@ # Copyright 2014-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James <[email protected]> (2023-05-29) +# Temporary mask for bug #907377 +ruby_targets_ruby31 + # Sam James <[email protected]> (2022-03-03) # dev-lang/ocaml and dev-ml/* not marked stable here ocaml diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults index 93e2c5b69fad..96872299b26e 100644 --- a/profiles/arch/powerpc/ppc64/make.defaults +++ b/profiles/arch/powerpc/ppc64/make.defaults @@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mga r128 radeon" # Enable abi_ppc_64 for packages that don't have it forced. ABI_PPC="64" + +# Sam James <[email protected]> (2023-05-29) +# Temporarily use old default until bug #907377 is done for this arch +RUBY_TARGETS="ruby30" diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask index 762eccb758c1..6a7bb71566fa 100644 --- a/profiles/arch/powerpc/ppc64/use.stable.mask +++ b/profiles/arch/powerpc/ppc64/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Sam James <[email protected]> (2023-05-29) +# Temporary mask for bug #907377 +ruby_targets_ruby31 + # Michał Górny <[email protected]> (2021-12-31) # PyPy3 target is not ready for stable. python_targets_pypy3 diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults index 852a8fb95b8e..bc314dc140cc 100644 --- a/profiles/arch/sparc/make.defaults +++ b/profiles/arch/sparc/make.defaults @@ -42,3 +42,7 @@ 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 <[email protected]> (2023-05-29) +# Temporarily use old default until bug #907377 is done for this arch +RUBY_TARGETS="ruby30" diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask index 868e5ba4559f..6e7bdf7a7d54 100644 --- a/profiles/arch/sparc/use.stable.mask +++ b/profiles/arch/sparc/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Sam James <[email protected]> (2023-05-29) +# Temporary mask for bug #907377 +ruby_targets_ruby31 + # Sam James <[email protected]> (2021-04-27) # Clang and friends aren't (yet?) stable on sparc clang diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults index 2ff3ba0dff24..672f3ebcf4c4 100644 --- a/profiles/arch/x86/make.defaults +++ b/profiles/arch/x86/make.defaults @@ -43,3 +43,7 @@ ABI_X86="32" # Enable USE=libtirpc by default, to ease dependency resolution during # the stabilization of glibc-2.26. Bug 657148 USE="libtirpc" + +# Sam James <[email protected]> (2023-05-29) +# Temporarily use old default until bug #907377 is done for this arch +RUBY_TARGETS="ruby30" diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask index 5b5cab87da95..b2d5d5ab61ad 100644 --- a/profiles/arch/x86/use.stable.mask +++ b/profiles/arch/x86/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Sam James <[email protected]> (2023-05-29) +# Temporary mask for bug #907377 +ruby_targets_ruby31 + # Alfredo Tupone <[email protected]> (2023-2-2) # sys-devel/gcc:12 is not stable yet on x86 ada_target_gcc_12
