profiles/arch: mask ruby:2.5 for each arch

This is needed for ruby 2.5 stable bug 688976 and allows each arch to
mark ruby 2.5 stable independently.

Add a use.stable.mask for ruby_targets_ruby25 and sets RUBY_TARGETS to
ruby24 only.

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

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 6bbfb6303139332214ed6c9c749dc50ac84e8616..b0d8d036c6a6c4f0f768c29beea64cc37253ba3c 100644 (file)
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -32,3 +32,7 @@ ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 e
 # 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) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index d28d2d5a80002f620382f95fd8ac2f1acb8b1761..23450b43c84d4ee4c442bbdd8fca793ba78d2f7b 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Mike Gilbert <floppym@gentoo.org> (2017-06-08)
 # 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 afe2ba0ad0105adeab9bb823d67584d48aa3725a..67cce2ed7d7c9d854e02289a9ba3b1461b1f01c9 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) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index b2065471711aafa2e43e9fb498efbf85301ffe57..67f14b4f4ce4066fffe7e09935880c1c9e52d23a 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-11-17)
 # media-sound/audacious is not yet stabilised
 audacious

diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 23746eae9be339312208d71ca413c6cc8e3e3337..3b496a9a83a03b7becd47a102224af249dc66e10 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> (2017-03-14)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 5d0ba54c26e21750ba735969e6273558cad6d093..3c11f961a4dce09aa050a108f206ec239ca67b26 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Thomas Deutschmann <whissi@gentoo.org> (2019-06-08)
 # Needs dev-lang/php:7.3 stable
 php_targets_php7-3

diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index 3fa7f0b1c8781b7d10050c372f8333c56e9650ff..cffd2eafcc7120decfd1684408b157e5e9504ab1 100644 (file)
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -25,3 +25,7 @@ USE="libtirpc"
 # Michał Górny <mgorny@gentoo.org> (2017-03-14)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index d99f15b0806f77852d0d98411bb68b9c9078f51e..0cb107d8064da980e30a2f199d078e1641c8e71b 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Aaron Bauman <bman@gentoo.org> (2019-05-20)
 # Does not build on arm64
 ocamlopt

diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index e25a2f2759a303baf487ee18e20e992583bc72ee..fb6b9006e23c21d61c6b6a0da313b5715279d8fa 100644 (file)
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}"
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 4ca83d48de11eda0325fff58c216c64a9a6ff7d3..b6d0ffd1d1bb0d869662a0612d33dfc73f14a1ff 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-06-05)
 # sys-auth/consolekit will not be stabilised anymore.
 consolekit

diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index bdf4d7fa4798558b318121d0e8958bd3df1edf9f..f268b499769fcf05152ac311515fdfd38e315e00 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"
 # Diego Pettenò <flameeyes@gentoo.org> (2006-12-23)
 # 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) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index f7aa42a2d1db64a4278c8a3ed3c5a9a702e1ad64..6bfa9aaa186476521a083dbe33c74ae622663558 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-04-29)
 # sys-auth/elogind is not yet stable here. bug #682158
 elogind

diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index de0dc3b76f4741f97f79c4642b9300bba2eb47f7..944a5063f7b7696db7bbfba0d29d906bd316736a 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) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index bb884f654d2802e60963ab773cf1ed012ae22979..224abbab30a0614862a6e41519a291153a2d7692 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Mike Gilbert <floppym@gentoo.org> (2017-06-08)
 # 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 0e1645fcff970e14e3b9d6bcc9c08602d9306f88..02897b7217214bd819559b1fa5f1774e9029fea6 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) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index 5ba9da7bc57260234b765ba0b001beccd8bc96bd..6f2bbeb4eb7e2ad944695426bf51be870e6dff9a 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Mike Gilbert <floppym@gentoo.org> (2017-06-08)
 # 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 ae0d0d397e86b475a2a7c8124ae42ba2049ba207..3ee8806451d0a38ffe86ea08cea24b20c96bf3fc 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) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/s390/use.stable.mask b/profiles/arch/s390/use.stable.mask
new file mode 100644 (file)
index 0000000..cfd0947
--- /dev/null
+++ b/profiles/arch/s390/use.stable.mask
@@ -0,0 +1,4 @@
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+

diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index b7dc3ff5dc2b519c79e90be6fa46e16c6ad3719f..56a94001e0da3900334a546700190610b2e0c07e 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"
 # 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) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index dda2b0e622dbfcbe3b1d2c713b06bb444569a068..123fa35d6f2f3185b23c44e67b18cea1a35e2e88 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-02-02)
 # No stable app-arch/rpm on sparc.
 rpm

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index c0600e4ae9f11edbe214baeb61189b8a638fe984..884e1c008db851b5dd63837e34e4fe5317d61d35 100644 (file)
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -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 <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"

diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index c30ac38e05bccf33adbe1e22a149be39657b9dda..32aebf145aa9d9e160de386353b3be54110e7391 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> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-11-17)
 # media-sound/audacious is not yet stabilised
 audacious