Move current ruby22 status into arch profiles, bug 615818

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

This makes it possible to update the defaults in the main profile for
a stable ruby:2.2 slot and consequently to mark ruby:2.2 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.2 but
RUBY_TARGETS="ruby21").

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

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 25c2ed44634f816da26cd548f9736a6fffae4926..ac23ebed5b35f36b8e17f2a8b3285a8a1f05c5d6 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> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index 9a7a23bf7abb878981f7eeb2e28904938f67ab6a..af7d30ae15646cdbaa52f423c6b54c3303c6210e 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> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Tobias Klausmann <klausman@gentoo.org> (17 Mar 2016)
 # Webkit itself is enormous (~13h compile+test on our fastest dev machine), so
 # it will remain not-stable forever. Mask the USE flag accordingly.

diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index a9d2cc0549dc669b650e3f00b7e9ee12a6e00134..897169d6b165b7f2e5f3346dc6a984f6eda63aef 100644 (file)
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -63,3 +63,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> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index f61ff941c4569319388ffeed32b1aab6bb4576fa..d4d153d53c190af868185bede93a8e08f34f7213 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> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
 # sys-libs/libapparmor
 apparmor

diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 48822043d21e509cc5ba18529dacd351c02e6449..58207017b7556d5df2c94d232e8382b171ef9fac 100644 (file)
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -22,3 +22,7 @@ VIDEO_CARDS="exynos fbdev omap"
 # Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index fd610057d048ddd6d76e1de61cd6ec7b5f636883..451a350a2896c262dafc98c2188adca30f669700 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> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Andrey Grozin <grozin@gentoo.org> (16 May 2014)
 # No stable gcl
 gcl

diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index 5dff71b148264f0011e79ea3754029721873d4dd..f985ef0637e53b2e7bcf541d76eb36b1d6b1d928 100644 (file)
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -20,3 +20,7 @@ VIDEO_CARDS="fbdev"
 # Michał Górny <mgorny@gentoo.org> (14 Mar 2017)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 8b37228640ccef1f4c416ea9f96b802aa5688b9e..6b0c085c24df3dbbb193c0f517b2c839bdebf4a2 100644 (file)
--- 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 <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Mart Raudsepp <leio@gentoo.org> (04 Feb 2017)
 # dev-vcs/subversion not marked stable yet
 subversion

diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 0a3820884b6c18af43d318d24f5bcb60c3dbfab3..6b8185a2832c84c64b07215e05b033f204cf1f59 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> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
new file mode 100644 (file)
index 0000000..339a497
--- /dev/null
+++ b/profiles/arch/hppa/use.stable.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22

diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 476c229a5a630fd6afdf286dccaf6f3f24b6b75a..906372e964be7c6112a65ab5764d1b91547082b4 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> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index 88f33d5ae7be7327aee6c0e4b2efa7ad376042c5..b9adc5d7e448a1131251ca7979e7163d812ba6e4 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> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Not stable
 mkl
 

diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 57c5d7770ef5c60b1a9defb3dc51fd6677ac00fb..6ba3076feda9ecae8649474247794677c25db7f0 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> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index ab73cb222f1a5a40627a1cde3e2011828df3229a..39ca1020ef10f471403d5a7b00b1b05be8284f09 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> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # 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..a02b5076f66e303aa35a8d473051473abd6eac63 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> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
new file mode 100644 (file)
index 0000000..339a497
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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 <graaff@gentoo.org> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22

diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 0053c3734d9270e342d708db7d649548b5fdb100..7abf4172ffee32663de0dc586ffd187292031977 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> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index a1ef089a866de5391b5a1037b4480434f5c88bf3..054384207e159a80255d69b96e29862e9449b160 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> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
 # no stable version on sparc
 ecls

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index f3347ce31a71c8a97662697bc4f45d990f42a451..0709d43356a1d08e9b9f7662c8faf4af06b8a39e 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> (17 Apr 2017)
+# Temporary entry to support stable bug 615818
+RUBY_TARGETS="ruby21"

diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 3a096d726fc72b290f7dcca949420e65d39f0619..91ad036540077ea46c968cba013ce00c2881334c 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> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Mike Gilbert <floppym@gentoo.org> (19 Oct 2014)
 # sys-libs/libapparmor
 apparmor