profiles/arch/*/make.defaults: tweak RUBY_TARGETS override

Unfortunately RUBY_TARGETS does not have merge semantics
and just overrides value from parent profile. Thus
    RUBY_TARGETS="ruby23 -ruby24"
is not valid and yields error spam like:
    Invalid '-' operator in non-incremental variable 'RUBY_TARGETS': '-ruby24'

Just drop RUBY_TARGETS="-ruby" part. The change should be a no-op.

Bug: https://bugs.gentoo.org/671064
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 3449562f0487afc6ca95890bf7e48fcb7ee2cc1f..efb7262f104e2f4e367df504ac90f2a41206267c 100644 (file)
--- 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 -ruby24"
+RUBY_TARGETS="ruby23"
 
 # Tobias Klausmann <klausman@gentoo.org> (25 Jun 2018)
 # Enable USE=libtirpc by default, to ease dependency resolution during

diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index f1655f9170e38f4ec3a839cc2deddff17f054583..d09bb4da35e3d11ecaf74e90f00d6a91677a0e9d 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> (12 Nov 2018)
 # Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index f6b6600fec84e598ad8c00ea1f9d8dead5266155..3f22ce8df613fb89d1300a0665907e9b18af46dd 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> (12 Nov 2018)
 # Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 1c7884a9e388ec45f60338ab779c6788a67b598b..b91a39618590e0a31262067b474495991431761a 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> (12 Nov 2018)
 # Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index f5b7331ada0d6716ec059d3d9369592baa4b2e0c..3b8dbab2de7edbc32001ead7ba7bfd872f1e1479 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> (12 Nov 2018)
 # Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index ee493e24c302e60ab92fc7f8cbfa1043bb23bae5..d2b49417d9f2d66a3ac1ad4d99372ce6c4ec4a0e 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> (12 Nov 2018)
 # Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index ec35f09d11461b5b6458981b6fbf06750b2c457c..476bb25aa01f3c91fe71d5d1d408b2e4433a4f06 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> (12 Nov 2018)
 # Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 4af6d8cc78ce057671cd889f2f3294c093a046df..8ae22a12a030eccd4057b0b5c61abffee52c7d7d 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> (12 Nov 2018)
 # Temporary entry to support stable bug 661262
-RUBY_TARGETS="ruby23 -ruby24"
+RUBY_TARGETS="ruby23"