profiles/arch: prepare for ruby24 stable bug

Mask ruby_targets_ruby24 in each arch with stable ruby and set
RUBY_TARGETS for each arch to ruby23, so that each arch can stable
ruby24 in their own time.

See bug 661262 for more details.

Signed-off-by: Hans de Graaff <graaff@gentoo.org>

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 184cd2140c83d0088f8a736de2f1360b408913f5..efb7262f104e2f4e367df504ac90f2a41206267c 100644 (file)
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -28,9 +28,9 @@ VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
 # Alpha supports the same busses.
 ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 maestro3 trident usb-audio via82xx ymfpci"
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
+# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"
 
 # Tobias Klausmann <klausman@gentoo.org> (25 Jun 2018)
 # Enable USE=libtirpc by default, to ease dependency resolution during

diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index e1b9f434793c9cbe3891716eb07e5ad206e532ed..30ef89054df7812880cade0630388f7a8b0ce65e 100644 (file)
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary mask for ruby:2.4, bug 661262
+ruby_targets_ruby24
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7

diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 48ae66bb3eb1fbcc144001ac2d2dccd5dd902871..8f795c3eaf2628a015e429b0347d37f6dd9ffebe 100644 (file)
--- 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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 1fc437119b704f0bb175d3ef3604170ffcf3e2be..ff72dc56e92e5dfacc6d524f7a3ab030a7d0036e 100644 (file)
--- 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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary mask for ruby:2.4, bug 661262
+ruby_targets_ruby24
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7

diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 410843f5d63653614cd089d64b35390ffe1699c0..d09bb4da35e3d11ecaf74e90f00d6a91677a0e9d 100644 (file)
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -23,6 +23,6 @@ VIDEO_CARDS="exynos fbdev omap"
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
+# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 89f0809db8d7db88d80479e20efb71ab370794be..9f988949e33d9288898bc4bb95d498ad3bef57e3 100644 (file)
--- 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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary mask for ruby:2.4, bug 661262
+ruby_targets_ruby24
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7

diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 3939be39232afb5470da6b3cae11e453a694f1d5..3f22ce8df613fb89d1300a0665907e9b18af46dd 100644 (file)
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -25,6 +25,6 @@ CHOST_hppa="${CHOST}"
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
+# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index f598c4237707e687150ecef0aedfb2eb6a722a67..8c4cf24387ec157832a6dd5a66dcdaa20b6f72c9 100644 (file)
--- 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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary mask for ruby:2.4, bug 661262
+ruby_targets_ruby24
+
 # Andreas Sturmlechner <asturm@gentoo.org> (20 May 2018)
 openal
 

diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 0f0509dd7730f187596e34fb51f3d3e4050c2e6d..b91a39618590e0a31262067b474495991431761a 100644 (file)
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -31,3 +31,7 @@ VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
 # 2006/12/23 - Diego Pettenò <flameeyes@gentoo.org>
 # Defaults for audio drivers - Took from x86 profile
 ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
+
+# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index 7b9d312ba3984207b8d26c218939d2c4ea335292..5d0f2daac7923a58a0d75a30ceb50b735e2f6361 100644 (file)
--- a/profiles/arch/ia64/use.stable.mask
+++ b/profiles/arch/ia64/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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary mask for ruby:2.4, bug 661262
+ruby_targets_ruby24
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7

diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 418e2b9085100c4fedefe143c633eaea24511dae..3b8dbab2de7edbc32001ead7ba7bfd872f1e1479 100644 (file)
--- 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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index 49f0bee80f6566102d8017be41887cbccfdea9a7..9973cc5d55347e2b2b83d416968311ccb5eca201 100644 (file)
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,3 +1,7 @@
+# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
+# Temporary mask for ruby:2.4, bug 661262
+ruby_targets_ruby24
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7

diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index 7f43ef6c4888823eb8ad22bdac859ab57a26d3eb..d2b49417d9f2d66a3ac1ad4d99372ce6c4ec4a0e 100644 (file)
--- 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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index a47ca75152f741e20d84068cafc215363e9a55e7..dadeeb17b0e03effd2cdbf07da513cafc97da595 100644 (file)
--- 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
 
+# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
+# Temporary mask for ruby:2.4, bug 661262
+ruby_targets_ruby24
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7

diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index b26df0f34271e1eb983b9f399c1f107791029700..476bb25aa01f3c91fe71d5d1d408b2e4433a4f06 100644 (file)
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -31,3 +31,7 @@ ABI_S390="32"
 # While multilib is available, we don't default it to on.
 BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib"
 USE="-multilib"
+
+# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 32ca3073612b6568f677692e42a54abb236b60af..8ae22a12a030eccd4057b0b5c61abffee52c7d7d 100644 (file)
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -43,3 +43,7 @@ VIDEO_CARDS="fbdev glint mga r128 radeon tdfx voodoo"
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
 USE="libtirpc"
+
+# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 127d5cf20fb7d471f0dc9f976e418c489e2098c0..f13e6a55c4fa01a71c6e5705587b1dedad25fedc 100644 (file)
--- 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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary mask for ruby:2.4, bug 661262
+ruby_targets_ruby24
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index d11e26fedd16850d5419ee3a4e122c52c35fa565..d644e7ef3d7159fef310fbfd1624a5695ba83706 100644 (file)
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -43,9 +43,9 @@ IUSE_IMPLICIT="abi_x86_32"
 # Default to abi_x86_32 for packages that don't have it forced.
 ABI_X86="32"
 
-# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
-# Temporary entry to support stable bug 639476
-RUBY_TARGETS="ruby22"
+# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
+# Temporary entry to support stable bug 661262
+RUBY_TARGETS="ruby23"
 
 # Thomas Deutschmann <whissi@gentoo.org> (6 Jun 2018)
 # Enable USE=libtirpc by default, to ease dependency resolution during

diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 85f2fc153000efe16c91b1add0ae6edde07bb561..9bddb0b6b7201193ac0d81e39d825420b6f4421a 100644 (file)
--- 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 <graaff@gentoo.org> (12 Nov 2018)
+# Temporary mask for ruby:2.4, bug 661262
+ruby_targets_ruby24
+
 # Mike Gilbert <floppym@gentoo.org> (08 Jun 2017)
 # dev-lang/python:3.7 is not stable.
 python_targets_python3_7

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 167a51095d4b666058d9d300c94dcb49808ad0ac..b957a95fa4fc0a0051c4ebced28a35a7b5f72371 100644 (file)
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -97,9 +97,9 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml"
 
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
-# Default Ruby build target
-# Updated to include ruby23 on 21 Jan 2018
-RUBY_TARGETS="ruby23"
+# Default Ruby build target(s)
+# Updated to include ruby24 on 12 Nov 2018
+RUBY_TARGETS="ruby23 ruby24"
 
 # Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
 # Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx

diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 8d065fe4f51ddd1e51c223de06c119532b3a9fc1..49932570cc7f5d8bdb51b30c3263617d996dad30 100644 (file)
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -13,7 +13,6 @@ python_single_target_pypy3
 
 # Hans de Graaff <graaff@gentoo.org> (25 Dec 2017)
 # Currently in testing and not ready to go stable yet.
-ruby_targets_ruby24
 ruby_targets_ruby25
 
 # Patrick Lauer <patrick@gentoo.org> (28 Apr 2015)