commit: 732fa8647044c8d13853a84546803c070faf0217
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 10 06:37:55 2021 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Oct 10 06:39:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732fa864
profiles: prepare for ruby27 stable bug
Set the new defaults including ruby27 in the base profile, and reset
it again to the ruby26 defaults in the arch profiles. This allows each
arch to stable ruby27 at their own speed. Bug 801289.
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
profiles/arch/amd64/make.defaults | 8 ++++++--
profiles/arch/amd64/use.stable.mask | 4 ++++
profiles/arch/arm/make.defaults | 6 +++++-
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 | 6 +++++-
profiles/arch/hppa/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 | 6 +++++-
profiles/arch/sparc/make.defaults | 6 +++++-
profiles/arch/sparc/use.stable.mask | 6 +++++-
profiles/arch/x86/make.defaults | 6 +++++-
profiles/arch/x86/use.stable.mask | 4 ++++
profiles/base/make.defaults | 4 ++--
profiles/base/use.stable.mask | 3 +--
18 files changed, 77 insertions(+), 14 deletions(-)
diff --git a/profiles/arch/amd64/make.defaults
b/profiles/arch/amd64/make.defaults
index afe2ba0ad01..1f4063dbdd1 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
ARCH="amd64"
@@ -38,7 +38,7 @@ LDFLAGS_x32="-m elf32_x86_64"
CHOST_x32="x86_64-pc-linux-gnux32"
# Simon Stelling <bl...@gentoo.org> (2006-10-24)
-# They are masked, but we can enable them anyway for those who have
+# They are masked, but we can enable them anyway for those who have
# >=portage-2.1.2_pre3-r4
CPU_FLAGS_X86="mmx mmxext sse sse2"
@@ -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> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/amd64/use.stable.mask
b/profiles/arch/amd64/use.stable.mask
index df910ea0ebe..ed932e0c842 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> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
# Michał Górny <mgo...@gentoo.org> (2021-05-04)
# Python 3.10 is not yet stable (and will not be until it's out of beta,
# around September.
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 70dc565bdd3..ebd5d88d2d5 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Main ARM profile
@@ -25,3 +25,7 @@ VIDEO_CARDS="exynos fbdev omap"
# 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> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/arm/use.stable.mask
b/profiles/arch/arm/use.stable.mask
index 8fa70e683bc..515afe79c63 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> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
# Michał Górny <mgo...@gentoo.org> (2021-05-04)
# Python 3.10 is not yet stable (and will not be until it's out of beta,
# around September.
diff --git a/profiles/arch/arm64/make.defaults
b/profiles/arch/arm64/make.defaults
index 2f35acff83c..917aed76385 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -28,3 +28,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> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/arm64/use.stable.mask
b/profiles/arch/arm64/use.stable.mask
index ff0cafe9ef9..e341f3f2416 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> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
# Michał Górny <mgo...@gentoo.org> (2021-05-04)
# Python 3.10 is not yet stable (and will not be until it's out of beta,
# around September.
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 4da39eeda98..5ae3874285d 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
ARCH="hppa"
@@ -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> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/hppa/use.stable.mask
b/profiles/arch/hppa/use.stable.mask
index 25572505eec..5cb7fe2795c 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> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
# Matt Turner <matts...@gentoo.org> (2021-09-22)
# media-libs/libsamplerate is not stable on hppa
libsamplerate
diff --git a/profiles/arch/powerpc/ppc32/make.defaults
b/profiles/arch/powerpc/ppc32/make.defaults
index 46b593ce286..d8c881b1080 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# All extra USE/etc should be specified in sub-profiles.
@@ -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> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask
b/profiles/arch/powerpc/ppc32/use.stable.mask
index 408d42d9aa9..86fa045b0a1 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,6 +1,10 @@
# Copyright 2014-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Hans de Graaff <gra...@gentoo.org> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
# Michał Górny <mgo...@gentoo.org> (2021-05-04)
# Python 3.10 is not yet stable (and will not be until it's out of beta,
# around September.
diff --git a/profiles/arch/powerpc/ppc64/make.defaults
b/profiles/arch/powerpc/ppc64/make.defaults
index b4dbccd021c..562ac6ba777 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 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 nv r128 radeon"
# Enable abi_ppc_64 for packages that don't have it forced.
ABI_PPC="64"
+
+# Hans de Graaff <gra...@gentoo.org> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask
b/profiles/arch/powerpc/ppc64/use.stable.mask
index 40076c2d987..509e9df8e60 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# 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> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
# Michał Górny <mgo...@gentoo.org> (2021-05-04)
# Python 3.10 is not yet stable (and will not be until it's out of beta,
# around September.
diff --git a/profiles/arch/sparc/make.defaults
b/profiles/arch/sparc/make.defaults
index 41d01f6982b..520645d7f49 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
ARCH="sparc"
@@ -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> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/sparc/use.stable.mask
b/profiles/arch/sparc/use.stable.mask
index 651f15426c6..338ba8792bc 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> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
# Michał Górny <mgo...@gentoo.org> (2021-05-04)
# Python 3.10 is not yet stable (and will not be until it's out of beta,
# around September.
@@ -40,7 +44,7 @@ sbcl
# Pacho Ramos <pa...@gentoo.org> (2014-04-17)
# Dropped stable keywords after the discussion caused by
-# Gnome 3.8/3.10 stabilization on this arch
+# Gnome 3.8/3.10 stabilization on this arch
devhelp
dia
eds
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 2c3d14cf5e7..c9c64eb4cdf 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# All extra USE/etc should be specified in sub-profiles.
@@ -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> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/x86/use.stable.mask
b/profiles/arch/x86/use.stable.mask
index e0bd8000152..a41554bb67e 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> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
# Michał Górny <mgo...@gentoo.org> (2021-05-04)
# Python 3.10 is not yet stable (and will not be until it's out of beta,
# around September.
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index db1bba9bb64..4aa838bae26 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 ruby26 on 2020-09-14
-RUBY_TARGETS="ruby26"
+# Updated to include ruby27 on 2021-10-10
+RUBY_TARGETS="ruby26 ruby27"
# 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 218e736762f..07b55fe4e69 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -13,7 +13,6 @@ darcs
python_targets_pypy3
python_single_target_pypy3
-# Hans de Graaff <gra...@gentoo.org> (2020-12-26)
+# Hans de Graaff <gra...@gentoo.org> (2021-10-10)
# Currently in testing and not ready to go stable yet.
-ruby_targets_ruby27
ruby_targets_ruby30
