Move current ruby23 status into arch profiles, bug 639476

Mask ruby_targets_ruby23 in the use.stable.mask of each arch and set
RUBY_TARGETS to ruby22 in the make.defaults for each arch.

This makes it possible to update the defaults in the main profile for
a stable ruby:2.3 slot and consequently to mark ruby:2.3 stable on
each arch in turn making sure that users of that arch will not end up
with conflicting settings (e.g. stable ruby:2.3 but
RUBY_TARGETS="ruby22").

Each arch is expected to remove these temporary entries as they mark
ruby:2.3 stable, as per the instructions in bug 639476.

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 25c2ed44634f816da26cd548f9736a6fffae4926..c57fc9bfb4ad6fecce01bc1b9f3c8dc8a5270e83 100644 (file)
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -27,3 +27,7 @@ VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx voodoo"
 # Defaults for audio drivers. These are copied from x86 (minus modems), since
 # 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"

diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index 7ef77fce94be21f3503288d1af3f1972d1d8b370..aec25237e0862dfd00c9d4e7cda40e53cd975f3c 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> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Brian Evans <grknight@gentoo.org> (16 Dec 2017)
 # Needs dev-lang/php:7.1 stable
 php_targets_php7-1

diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 1ca36a8d4f3dbfa7c8ca361e21f8fbf8134aedd5..db2969eaa8d48cf109dd762240b342695847365f 100644 (file)
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -62,3 +62,7 @@ USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
 # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
 # by non-multilib ebuilds when non-native ABIs are disabled.
 IUSE_IMPLICIT="abi_x86_64"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"

diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 2bf7d3769e73d142356743d1473caa56a06ba3ba..8508f7f2dee4b90c3b392a1e1fb518110a5df818 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> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind

diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index c0a917b65d7406a4e1b9bf6106849d094b603d10..410843f5d63653614cd089d64b35390ffe1699c0 100644 (file)
--- 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 <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"

diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 71be5d31fbc55a05532ab619582a7885354000c9..34affefc969d6108e9a8a3134567c90a9b5884b8 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> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Brian Evans <grknight@gentoo.org> (16 Dec 2017)
 # Needs dev-lang/php:7.1 stable
 php_targets_php7-1

diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 0a3820884b6c18af43d318d24f5bcb60c3dbfab3..3939be39232afb5470da6b3cae11e453a694f1d5 100644 (file)
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}"
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # 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"

diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 12f7464923e2fc274209c7f1ce9780912a3b7467..10be280ba22a296d841a6f240a514908c4f44c0e 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> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Andreas Sturmlechner <asturm@gentoo.org> (20 Jan 2018)
 # Mask boost for stabilisation timeout, bug #624662
 boost

diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 476c229a5a630fd6afdf286dccaf6f3f24b6b75a..c1552b0f8c8af02529af0ccb7b32977dfdb9ffc0 100644 (file)
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -26,3 +26,7 @@ VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx vesa 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> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"

diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index 88f33d5ae7be7327aee6c0e4b2efa7ad376042c5..3b65e3358e3259261253cbdbf5342ccc9f6f6c66 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> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Not stable
 mkl
 

diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 57c5d7770ef5c60b1a9defb3dc51fd6677ac00fb..80789f6ad543ce6854fe022be93f58b87ced342f 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> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"

diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index ab73cb222f1a5a40627a1cde3e2011828df3229a..8508553c1a8e8074cd033f91d69540af400e79cd 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> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
 # no stable versions on ppc
 clisp

diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index fe54e02e4ef58f02a445d2d81e2069b0bcafe7d9..6ea718796307b3e24d4c3727ce6f31022086201b 100644 (file)
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mach64 mga nv r128 radeon vesa"
 
 # Enable abi_ppc_64 for packages that don't have it forced.
 ABI_PPC="64"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"

diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index e797af411b7237c221ef0b69da4f85c5627f0b4e..fe877c3e26a2e1ece331195a8b705ee1b950d8cf 100644 (file)
--- 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 <graaff@gentoo.org> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23

diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 0053c3734d9270e342d708db7d649548b5fdb100..acad3dcea1eab7a1fa99e3fa04919f67b3589532 100644 (file)
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -39,3 +39,7 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mach64 mga r128 radeon sunbw2 suncg14 suncg3 \
        suncg6 sunffb sunleo tdfx voodoo"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"

diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index a381058c68d3c5e2662a2c59ed3615d16fa755f3..33c7089f46f4902faacd6eed81bd76281bf0a156 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> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Hans de Graaff <graaff@gentoo.org> (13 Aug 2017)
 # Drop stable ruby on sparc
 ruby

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index f3347ce31a71c8a97662697bc4f45d990f42a451..2e9b5fa264c6e1cedb5e176cfa8b6bf4f44d9906 100644 (file)
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -42,3 +42,7 @@ IUSE_IMPLICIT="abi_x86_32"
 # Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
 # 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"

diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 118c3436da9493c0e377b6481f8175952a6a2ebf..6639125e6f26d81291b0992a96f52898da4f0572 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> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind