profiles/arch: turn off ruby25 in RUBY_TARGETS

This is needed to overrule the ruby25 target in the base make.defaults.
Otherwise this ruby target will be set for all stable profiles without
ruby itself being stable.

Fixes: https://bugs.gentoo.org/690300

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

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index b0d8d036c6a6c4f0f768c29beea64cc37253ba3c..21df1ec3ca086ae75d4185c414a222201706a076 100644 (file)
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -35,4 +35,4 @@ USE="libtirpc"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 67cce2ed7d7c9d854e02289a9ba3b1461b1f01c9..71ccf64f7b82bc1a179de60d520893e409b63dcb 100644 (file)
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -70,4 +70,4 @@ USE="libtirpc"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 3b496a9a83a03b7becd47a102224af249dc66e10..3da266c294fbb16fc5999ce9076f703afc092050 100644 (file)
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -25,4 +25,4 @@ USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index cffd2eafcc7120decfd1684408b157e5e9504ab1..ae8f19006b867969ca62152f111074037a483514 100644 (file)
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -28,4 +28,4 @@ USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index fb6b9006e23c21d61c6b6a0da313b5715279d8fa..2a073cccf867ef5f7425b0de335956031d8e677e 100644 (file)
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -27,4 +27,4 @@ VIDEO_CARDS="fbdev"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index f268b499769fcf05152ac311515fdfd38e315e00..acf9829486845d722441577e98f5421f89e0808f 100644 (file)
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -34,4 +34,4 @@ ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 944a5063f7b7696db7bbfba0d29d906bd316736a..e308786ffa45e9e34ec68b401fbb3a2aef156942 100644 (file)
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -38,4 +38,4 @@ ABI_PPC="32"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index 02897b7217214bd819559b1fa5f1774e9029fea6..3bf4d4c56851131ba8e5a5ff81e02b74b7711ea6 100644 (file)
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -42,4 +42,4 @@ ABI_PPC="64"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index 3ee8806451d0a38ffe86ea08cea24b20c96bf3fc..f2a7ddadfb2279fd3701abf5f391b919b4f4fb0e 100644 (file)
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -34,4 +34,4 @@ USE="-multilib"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 56a94001e0da3900334a546700190610b2e0c07e..66fd2ca7a08a4061286f0a47c8cc073566587155 100644 (file)
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -46,4 +46,4 @@ USE="libtirpc"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 884e1c008db851b5dd63837e34e4fe5317d61d35..69c61d58e064991fdd1499fc1a46d7d6ae62b727 100644 (file)
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -50,4 +50,4 @@ USE="libtirpc"
 
 # Hans de Graaff <graaff@gentoo.org) (2019-07-17)
 # Temporary RUBY_TARGETS for bug 688976
-RUBY_TARGETS="ruby24"
+RUBY_TARGETS="ruby24 -ruby25"