gentoo auto-resync : 29:05:2023 - 21:18:33

22 files changed, 75 insertions, 17 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 52531bf66677..d800f11ddc6b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
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 <sam@gentoo.org> (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 <sam@gentoo.org> (2023-05-29)
+# Temporary mask for bug #907377
+ruby_targets_ruby31
+
 # Andreas Sturmlechner <asturm@gentoo.org> (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 <mgorny@gentoo.org> (2017-03-14)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Sam James <sam@gentoo.org> (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 <sam@gentoo.org> (2023-05-29)
+# Temporary mask for bug #907377
+ruby_targets_ruby31
+
 # Sam James <sam@gentoo.org> (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 <mgorny@gentoo.org> (2017-03-14)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Sam James <sam@gentoo.org> (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 <sam@gentoo.org> (2023-05-29)
+# Temporary mask for bug #907377
+ruby_targets_ruby31
+
 # Ionen Wolkens <ionen@gentoo.org> (2022-02-17)
 # x11-drivers/nvidia-drivers is not stable yet
 video_cards_nvidia
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index fb4ad83b8fa2..bb227e4ece2a 100644
--- a/profiles/arch/base/make.defaults
+++ b/profiles/arch/base/make.defaults
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 arm64-macos hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-linux x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 arm64-macos hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc x64-macos x64-solaris x86 x86-linux"
 
 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
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 <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
+
+# Sam James <sam@gentoo.org> (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 <sam@gentoo.org> (2023-05-29)
+# Temporary mask for bug #907377
+ruby_targets_ruby31
+
 # Rolf Eike Beer <eike@sf-mail.de> (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 <sam@gentoo.org> (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 <sam@gentoo.org> (2023-05-29)
+# Temporary mask for bug #907377
+ruby_targets_ruby31
+
 # Sam James <sam@gentoo.org> (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 <sam@gentoo.org> (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 <sam@gentoo.org> (2023-05-29)
+# Temporary mask for bug #907377
+ruby_targets_ruby31
+
 # Michał Górny <mgorny@gentoo.org> (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 <sam@gentoo.org> (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 <sam@gentoo.org> (2023-05-29)
+# Temporary mask for bug #907377
+ruby_targets_ruby31
+
 # Sam James <sam@gentoo.org> (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 <sam@gentoo.org> (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 <sam@gentoo.org> (2023-05-29)
+# Temporary mask for bug #907377
+ruby_targets_ruby31
+
 # Alfredo Tupone <tupone@gentoo.org> (2023-2-2)
 # sys-devel/gcc:12 is not stable yet on x86
 ada_target_gcc_12
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 17410392ce5e..5c28061b2ff6 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -99,8 +99,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 
 # Manuel Rüger <mrueg@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
-# Updated to remove ruby27 on 2023-03-26
-RUBY_TARGETS="ruby30"
+# Updated to add ruby31 on 2023-05-29
+RUBY_TARGETS="ruby30 ruby31"
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2022-10-22)
 # These USE flags are what is common between the various sub-profiles. Stages 2
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 1e9ae51033b0..641aa3d58d59 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -217,11 +217,6 @@ kde-apps/cantor julia
 # This is stable masked as g-sorcery is being not actively developed.
 app-portage/layman g-sorcery
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-01-15)
-# Has no stable reverse deps requiring this useflag
-# Stable-masking it so Boost 1.62 stabilization can go ahead
-sci-libs/vtk mpi
-
 # Alon Bar-Lev <alonbl@gentoo.org> (2017-01-01)
 # Will always require unstable packages.
 net-libs/gnutls test-full
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index b4432fbc178d..6e984e647f1d 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,16 +4,15 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sam James <sam@gentoo.org> (2023-05-29)
+# Currently in testing and not ready to go stable yet.
+ruby_targets_ruby32
+
 # Michał Górny <mgorny@gentoo.org> (2023-05-23)
 # Mask until dev-lang/python:3.12 becomes stable.
 python_targets_python3_12
 python_single_target_python3_12
 
-# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
-# Currently in testing and not ready to go stable yet.
-ruby_targets_ruby31
-ruby_targets_ruby32
-
 # Brian Evans <grknight@gentoo.org> (2022-12-09)
 # PHP 8.2 is in testing
 php_targets_php8-2
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index a1bd0cf4017d..e3d7f8df25cb 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -22,9 +22,9 @@ LINGUAS="en"
 IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-linux x86-solaris x86-winnt"
-USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS"
-USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc x64-macos x64-solaris x86 x86-linux"
+USE_EXPAND_VALUES_ELIBC="bionic Darwin glibc mingw musl SunOS"
+USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.