summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2018-11-13 19:49:14 +0100
committerHans de Graaff <graaff@gentoo.org>2018-11-13 19:49:14 +0100
commit61f269a66ca07af54396e6e296949f53110eaac8 (patch)
tree5720e2e1b667721a761ac51995faeb1c0d0a98ac
parentdev-db/percona-server: Add missing line-continuation during pkg_config (diff)
downloadgentoo-61f269a66ca07af54396e6e296949f53110eaac8.tar.gz
gentoo-61f269a66ca07af54396e6e296949f53110eaac8.tar.bz2
gentoo-61f269a66ca07af54396e6e296949f53110eaac8.zip
profiles/arch/*/make.defaults: properly overwrite ruby24
The RUBY_TARGETS setting is cumulative so we need to actively turn off ruby24 to overwrite the setting in base/make.defaults. Fixes: https://bugs.gentoo.org/671064 Signed-off-by: Hans de Graaff <graaff@gentoo.org>
-rw-r--r--profiles/arch/alpha/make.defaults2
-rw-r--r--profiles/arch/amd64/make.defaults2
-rw-r--r--profiles/arch/arm/make.defaults2
-rw-r--r--profiles/arch/hppa/make.defaults2
-rw-r--r--profiles/arch/ia64/make.defaults2
-rw-r--r--profiles/arch/powerpc/ppc32/make.defaults2
-rw-r--r--profiles/arch/powerpc/ppc64/make.defaults2
-rw-r--r--profiles/arch/s390/make.defaults2
-rw-r--r--profiles/arch/sparc/make.defaults2
-rw-r--r--profiles/arch/x86/make.defaults2
10 files changed, 10 insertions, 10 deletions
diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index efb7262f104e..3449562f0487 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -30,7 +30,7 @@ ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 e
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
# Tobias Klausmann <klausman@gentoo.org> (25 Jun 2018)
# Enable USE=libtirpc by default, to ease dependency resolution during
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 8f795c3eaf26..77e20fb9cc38 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -70,4 +70,4 @@ USE="libtirpc"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index d09bb4da35e3..f1655f9170e3 100644
--- 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> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 3f22ce8df613..f6b6600fec84 100644
--- 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> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index b91a39618590..1c7884a9e388 100644
--- 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> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 3b8dbab2de7e..f5b7331ada0d 100644
--- 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> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index d2b49417d9f2..ee493e24c302 100644
--- 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> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index 476bb25aa01f..ec35f09d1146 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -34,4 +34,4 @@ USE="-multilib"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 8ae22a12a030..4af6d8cc78ce 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -46,4 +46,4 @@ USE="libtirpc"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index d644e7ef3d71..d18827217a3b 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -45,7 +45,7 @@ ABI_X86="32"
# Hans de Graaff <graaff@gentoo.org> (12 Nov 2018)
# Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23"
+RUBY_TARGETS="ruby23 -ruby24"
# Thomas Deutschmann <whissi@gentoo.org> (6 Jun 2018)
# Enable USE=libtirpc by default, to ease dependency resolution during