commit: 17e84550fb1a7c1b48dfc28ba4d809e751d8e89e Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sat May 31 07:01:58 2025 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sat May 31 07:01:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e84550
profiles/*: move ruby33 mask and make defaults to profile settings This will allow each arch to stable ruby33 at their own pace. See bug #956881 for details. Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> profiles/arch/amd64/make.defaults | 6 +++++- 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/powerpc/ppc32/make.defaults | 6 +++++- profiles/arch/powerpc/ppc32/use.stable.mask | 4 ++++ profiles/arch/powerpc/ppc64/make.defaults | 6 +++++- 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 | 6 +++++- profiles/arch/x86/use.stable.mask | 4 ++++ profiles/base/make.defaults | 4 ++-- profiles/base/use.stable.mask | 1 - 16 files changed, 62 insertions(+), 7 deletions(-) diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults index 945288214711..f8fbdeac4580 100644 --- a/profiles/arch/amd64/make.defaults +++ b/profiles/arch/amd64/make.defaults @@ -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 ARCH="amd64" @@ -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" + +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +RUBY_TARGETS="ruby32" diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask index ab8fa42f22ab..fde1e6ddf3cc 100644 --- a/profiles/arch/amd64/use.stable.mask +++ b/profiles/arch/amd64/use.stable.mask @@ -4,6 +4,10 @@ # New entries go on top. # Please use the same syntax as in use.mask. +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +ruby_targets_ruby33 + # Paul Zander <[email protected]> (2023-11-17) # ROCm/HIP is not suitable for stabilization. hip diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults index a701cf86fa52..bf42767b72e6 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" + +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +RUBY_TARGETS="ruby32" diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask index 3837abbd1800..f3e7b29cea8a 100644 --- a/profiles/arch/arm/use.stable.mask +++ b/profiles/arch/arm/use.stable.mask @@ -4,6 +4,10 @@ # New entries go on top. # Please use the same syntax as in use.mask. +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +ruby_targets_ruby33 + # 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 2bf1c06cab64..6015dfc3b83a 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" + +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +RUBY_TARGETS="ruby32" diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask index 56c4ef768116..0fc05a69016c 100644 --- a/profiles/arch/arm64/use.stable.mask +++ b/profiles/arch/arm64/use.stable.mask @@ -5,6 +5,10 @@ # New entries go on top. # Please use the same syntax as in use.mask. +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +ruby_targets_ruby33 + # Matt Turner <[email protected]> (2024-05-10) # x11-drivers/xf86-video-vmware is not stable yet video_cards_vmware diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults index ef55cded6dbb..51550dafc7b3 100644 --- a/profiles/arch/powerpc/ppc32/make.defaults +++ b/profiles/arch/powerpc/ppc32/make.defaults @@ -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 # All extra USE/etc should be specified in sub-profiles. @@ -31,3 +31,7 @@ IUSE_IMPLICIT="abi_ppc_32" # Enable abi_ppc_32 for packages that don't have it forced. ABI_PPC="32" + +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +RUBY_TARGETS="ruby32" diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask index 3a5672565127..8a3922c3e0b6 100644 --- a/profiles/arch/powerpc/ppc32/use.stable.mask +++ b/profiles/arch/powerpc/ppc32/use.stable.mask @@ -1,6 +1,10 @@ # Copyright 2014-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +ruby_targets_ruby33 + # Sam James <[email protected]> (2024-03-07) # dev-lang/php:8.2 is not marked stable here yet (bug #920701) php_targets_php8-2 diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults index f981d6d16277..0d042ee0bfe6 100644 --- a/profiles/arch/powerpc/ppc64/make.defaults +++ b/profiles/arch/powerpc/ppc64/make.defaults @@ -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 # All extra USE/etc should be specified in sub-profiles. @@ -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" + +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +RUBY_TARGETS="ruby32" diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask index 1e7699edcdaa..0aaa0a021d30 100644 --- a/profiles/arch/powerpc/ppc64/use.stable.mask +++ b/profiles/arch/powerpc/ppc64/use.stable.mask @@ -4,6 +4,10 @@ # New entries go on top. # Please use the same syntax as in use.mask. +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +ruby_targets_ruby33 + # Sam James <[email protected]> (2024-03-07) # dev-lang/php:8.2 is not marked stable here yet (bug #920701) php_targets_php8-2 diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults index 9fcf0a8a58ce..c665afd229fa 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" + +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +RUBY_TARGETS="ruby32" diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask index 7b9862d055e7..1dcccd552d31 100644 --- a/profiles/arch/sparc/use.stable.mask +++ b/profiles/arch/sparc/use.stable.mask @@ -4,6 +4,10 @@ # New entries go on top. # Please use the same syntax as in use.mask. +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +ruby_targets_ruby33 + # Sam James <[email protected]> (2024-03-07) # dev-lang/php:8.2 is not marked stable here yet (bug #920701) php_targets_php8-2 diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults index 16f6fbe98d0e..75a4254b6d89 100644 --- a/profiles/arch/x86/make.defaults +++ b/profiles/arch/x86/make.defaults @@ -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 # All extra USE/etc should be specified in sub-profiles. @@ -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" + +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +RUBY_TARGETS="ruby32" diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask index 1fd0fa672fa6..3f873654242a 100644 --- a/profiles/arch/x86/use.stable.mask +++ b/profiles/arch/x86/use.stable.mask @@ -4,6 +4,10 @@ # New entries go on top. # Please use the same syntax as in use.mask. +# Hans de Graaff <[email protected]> (2025-05-31) +# Temporary mask to facilitate stabling ruby33 in bug #956881 +ruby_targets_ruby33 + # Andreas Sturmlechner <[email protected]> (2025-03-07) # KDE Frameworks is not stable kde diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index ec64a3897af9..047400302b66 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -94,9 +94,9 @@ XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipp2p iface geoip fu LCD_DEVICES="bayrad cfontz glk hd44780 lb216 lcdm001 mtxorb text" # Manuel Rüger <[email protected]> (2015-09-09) -# Hans de Graaff <[email protected]> (2024-10-08) +# Hans de Graaff <[email protected]> (2025-05-31) # Default Ruby build target(s) -RUBY_TARGETS="ruby32" +RUBY_TARGETS="ruby32 ruby33" # Andreas K. Hüttel <[email protected]> (2022-10-22) # These USE flags are what is common between the various sub-profiles. Stages 2 diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask index aa52f352586e..75dbbe81dcce 100644 --- a/profiles/base/use.stable.mask +++ b/profiles/base/use.stable.mask @@ -16,7 +16,6 @@ llvm_slot_20 # Hans de Graaff <[email protected]> (2024-12-26) # Currently in testing and not ready to go stable yet. ruby_targets_ruby34 -ruby_targets_ruby33 # Michał Górny <[email protected]> (2024-05-08) # Python implementations without stable keywords.
