commit:     f9be832e2fafc36b9539224b28f4e7b7e1754835
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 18:30:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 29 18:30:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9be832e

profiles/base: set base profile defaults for ruby31

Allow ruby_targets_ruby31 to be used in stable packages and set both
ruby30 and ruby31 as default ruby targets. We cannot switch directly to
ruby31-only since we need to keep a working ruby+dependencies at all
times to allow proper installation of packages.

Bug: https://bugs.gentoo.org/907377
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/base/make.defaults   | 4 ++--
 profiles/base/use.stable.mask | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

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 <mr...@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 <dilfri...@gentoo.org> (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 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 <s...@gentoo.org> (2023-05-29)
+# Currently in testing and not ready to go stable yet.
+ruby_targets_ruby32
+
 # Michał Górny <mgo...@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 <gra...@gentoo.org> (2023-01-15)
-# Currently in testing and not ready to go stable yet.
-ruby_targets_ruby31
-ruby_targets_ruby32
-
 # Brian Evans <grkni...@gentoo.org> (2022-12-09)
 # PHP 8.2 is in testing
 php_targets_php8-2

Reply via email to