[gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, profiles/arch/hppa/, profiles/arch/x86/, ...

[Hans de Graaff]

commit:     25be5ad266afa59aeffe4e4c51ea82daba236fe0
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 08:07:05 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 08:12:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25be5ad2

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.

 profiles/arch/alpha/make.defaults           | 4 ++++
 profiles/arch/alpha/use.stable.mask         | 4 ++++
 profiles/arch/amd64/make.defaults           | 4 ++++
 profiles/arch/amd64/use.stable.mask         | 4 ++++
 profiles/arch/arm/make.defaults             | 4 ++++
 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          | 9 +++++++++
 profiles/arch/ia64/make.defaults            | 4 ++++
 profiles/arch/ia64/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 | 9 +++++++++
 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 ++++
 20 files changed, 90 insertions(+)

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 25c2ed44634..ac23ebed5b3 100644
--- 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@g.o> (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 9a7a23bf7ab..af7d30ae156 100644
--- 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@g.o> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Tobias Klausmann <klausman@g.o> (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 a9d2cc0549d..897169d6b16 100644
--- 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@g.o> (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 f61ff941c45..d4d153d53c1 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 <graaff@g.o> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Mike Gilbert <floppym@g.o> (19 Oct 2014)
 # sys-libs/libapparmor
 apparmor

diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 48822043d21..58207017b75 100644
--- 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@g.o> (14 Mar 2017)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@g.o> (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 fd610057d04..451a350a289 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 <graaff@g.o> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Andrey Grozin <grozin@g.o> (16 May 2014)
 # No stable gcl
 gcl

diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index 5dff71b1482..f985ef0637e 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -20,3 +20,7 @@ VIDEO_CARDS="fbdev"
 # Michał Górny <mgorny@g.o> (14 Mar 2017)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@g.o> (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 8b37228640c..6b0c085c24d 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 <graaff@g.o> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Mart Raudsepp <leio@g.o> (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 0a3820884b6..6b8185a2832 100644
--- 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@g.o>
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
+
+# Hans de Graaff <graaff@g.o> (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
index 00000000000..339a497f612
--- /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@g.o> (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 476c229a5a6..906372e964b 100644
--- 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@g.o>
 # 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@g.o> (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 88f33d5ae7b..b9adc5d7e44 100644
--- 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@g.o> (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 57c5d7770ef..6ba3076feda 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 <graaff@g.o> (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 ab73cb222f1..39ca1020ef1 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,3 +1,7 @@
+# Hans de Graaff <graaff@g.o> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Andrey Grozin <grozin@g.o> (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 fe54e02e4ef..a02b5076f66 100644
--- 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@g.o> (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
index 00000000000..339a497f612
--- /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@g.o> (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 0053c3734d9..7abf4172ffe 100644
--- 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@g.o> (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 a1ef089a866..054384207e1 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 <graaff@g.o> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Andrey Grozin <grozin@g.o> (25 Jun 2014)
 # no stable version on sparc
 ecls

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index f3347ce31a7..0709d43356a 100644
--- 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@g.o> (01 Jul 2014)
 # Default to abi_x86_32 for packages that don't have it forced.
 ABI_X86="32"
+
+# Hans de Graaff <graaff@g.o> (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 3a096d726fc..91ad0365400 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 <graaff@g.o> (17 Apr 2017)
+# Temporary mask to support stable bug 615818
+ruby_targets_ruby22
+
 # Mike Gilbert <floppym@g.o> (19 Oct 2014)
 # sys-libs/libapparmor
 apparmor