commit: d5221fb5659fcfae3244550c5cb1817c7f07cbb0
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 07:08:19 2020 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 07:11:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5221fb5
profiles: mask ruby26 per profile
This commit masks ruby26 per profile using use.stable.mask and sets
RUBY_TARGETS accordingly. It also enabled ruby26 globally. This
facilitates the per-arch stable request in bug 728192 so each arch can
mark ruby 2.6 stable without further coordination between arches or
maintainers.
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
profiles/arch/amd64/make.defaults | 4 ++++
profiles/arch/amd64/use.stable.mask | 4 ++++
profiles/arch/arm/make.defaults | 3 +++
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 ++++
profiles/base/make.defaults | 4 ++--
profiles/base/use.stable.mask | 1 -
18 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/profiles/arch/amd64/make.defaults
b/profiles/arch/amd64/make.defaults
index afe2ba0ad01..e814358a7a3 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -67,3 +67,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 <gra...@gentoo.org> (2020-09-14)
+# Set per-arch to facilitate stabling, bug 728192
+RUBY_TARGETS="ruby25"
diff --git a/profiles/arch/amd64/use.stable.mask
b/profiles/arch/amd64/use.stable.mask
index d2d7f36c1b2..a904e821200 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
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Masked per-arch to facilitate stabling, bug 728192
+ruby_targets_ruby26
+
# Andreas Sturmlechner <ast...@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 972d7a5a46a..8536617f81f 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -23,3 +23,6 @@ VIDEO_CARDS="exynos fbdev omap"
# Unhide the ARM-specific USE_EXPANDs.
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Set per-arch to facilitate stabling, bug 728192
+RUBY_TARGETS="ruby25"
diff --git a/profiles/arch/arm/use.stable.mask
b/profiles/arch/arm/use.stable.mask
index 0448e2b174d..2799fca2ebd 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
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Masked per-arch to facilitate stabling, bug 728192
+ruby_targets_ruby26
+
# Sam James <s...@gentoo.org> (2020-06-29)
# media-gfx/gimp not yet stable
gimp
diff --git a/profiles/arch/arm64/make.defaults
b/profiles/arch/arm64/make.defaults
index 3fa7f0b1c87..7787cb472c2 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -25,3 +25,7 @@ USE="libtirpc"
# Michał Górny <mgo...@gentoo.org> (2017-03-14)
# Unhide the ARM-specific USE_EXPANDs.
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Set per-arch to facilitate stabling, bug 728192
+RUBY_TARGETS="ruby25"
diff --git a/profiles/arch/arm64/use.stable.mask
b/profiles/arch/arm64/use.stable.mask
index 9d6e020d696..81d36ee2a62 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
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Masked per-arch to facilitate stabling, bug 728192
+ruby_targets_ruby26
+
# Aaron Bauman <b...@gentoo.org> (2019-05-20)
# Does not build on arm64
ocamlopt
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index e25a2f2759a..38268c9d075 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}"
# Donnie Berkholz <dberkh...@gentoo.org> (2006-08-18)
# Defaults for video drivers
VIDEO_CARDS="fbdev"
+
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Set per-arch to facilitate stabling, bug 728192
+RUBY_TARGETS="ruby25"
diff --git a/profiles/arch/hppa/use.stable.mask
b/profiles/arch/hppa/use.stable.mask
index 35d799148af..bb3bb243752 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
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Masked per-arch to facilitate stabling, bug 728192
+ruby_targets_ruby26
+
# Michał Górny <mgo...@gentoo.org> (2020-06-18)
# Not ready for stable yet.
python_targets_python3_8
diff --git a/profiles/arch/powerpc/ppc32/make.defaults
b/profiles/arch/powerpc/ppc32/make.defaults
index de0dc3b76f4..638233f7ed9 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -35,3 +35,7 @@ IUSE_IMPLICIT="abi_ppc_32"
# Enable abi_ppc_32 for packages that don't have it forced.
ABI_PPC="32"
+
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Set per-arch to facilitate stabling, bug 728192
+RUBY_TARGETS="ruby25"
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask
b/profiles/arch/powerpc/ppc32/use.stable.mask
index 4153941ba6b..dac2627fd57 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,3 +1,7 @@
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Masked per-arch to facilitate stabling, bug 728192
+ruby_targets_ruby26
+
# Andreas Sturmlechner <ast...@gentoo.org> (2020-08-13)
# media-gfx/gimp is ~hppa only
gimp
diff --git a/profiles/arch/powerpc/ppc64/make.defaults
b/profiles/arch/powerpc/ppc64/make.defaults
index 0e1645fcff9..73bcfc3ffe9 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mga nv r128 radeon"
# Enable abi_ppc_64 for packages that don't have it forced.
ABI_PPC="64"
+
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Set per-arch to facilitate stabling, bug 728192
+RUBY_TARGETS="ruby25"
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask
b/profiles/arch/powerpc/ppc64/use.stable.mask
index e797af411b7..1b72be92145 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -3,3 +3,7 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Masked per-arch to facilitate stabling, bug 728192
+ruby_targets_ruby26
diff --git a/profiles/arch/sparc/make.defaults
b/profiles/arch/sparc/make.defaults
index ef87ea58b59..25a6f1c30f0 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -46,3 +46,7 @@ VIDEO_CARDS="fbdev glint 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 <gra...@gentoo.org> (2020-09-14)
+# Set per-arch to facilitate stabling, bug 728192
+RUBY_TARGETS="ruby25"
diff --git a/profiles/arch/sparc/use.stable.mask
b/profiles/arch/sparc/use.stable.mask
index af76053d3be..a509d574084 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
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Masked per-arch to facilitate stabling, bug 728192
+ruby_targets_ruby26
+
# Rolf Eike Beer <e...@sf-mail.de> (2020-04-14)
# media-libs/gstreamer is not stable for sparc
gstreamer
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index c0600e4ae9f..5f26b6eab90 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -47,3 +47,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 <gra...@gentoo.org> (2020-09-14)
+# Set per-arch to facilitate stabling, bug 728192
+RUBY_TARGETS="ruby25"
diff --git a/profiles/arch/x86/use.stable.mask
b/profiles/arch/x86/use.stable.mask
index b0ff96b03f1..b3aa6061b2d 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
+# Hans de Graaff <gra...@gentoo.org> (2020-09-14)
+# Masked per-arch to facilitate stabling, bug 728192
+ruby_targets_ruby26
+
# Andreas Sturmlechner <ast...@gentoo.org> (2020-06-06)
# sci-libs/mkl is not stable, needs online registration to even run pkg_setup
mkl
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 5b8552b7c2d..f2b15dd9a7e 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -101,8 +101,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 include ruby25 on 2019-07-17
-RUBY_TARGETS="ruby25"
+# Updated to include ruby26 on 2020-09-14
+RUBY_TARGETS="ruby25 ruby26"
# Enable extended filesystem attribute support by default.
#
https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 81ece61c137..ac34603f8ed 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -20,5 +20,4 @@ python_single_target_pypy3
# Hans de Graaff <gra...@gentoo.org> (2019-12-26)
# Currently in testing and not ready to go stable yet.
-ruby_targets_ruby26
ruby_targets_ruby27
