[gentoo-commits] repo/gentoo:master commit in: profiles/arch/ia64/, profiles/arch/powerpc/ppc64/, profiles/arch/alpha/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/ia64/, profiles/arch/powerpc/ppc64/, profiles/arch/alpha/, ...

[Sergei Trofimovich]

commit:     e79e532d2563c4eae769876fd7cc7e6f3fac12da
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 23:04:51 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 23:04:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e79e532d

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 <AT> gentoo.org>

 profiles/arch/alpha/make.defaults         | 2 +-
 profiles/arch/arm/make.defaults           | 2 +-
 profiles/arch/hppa/make.defaults          | 2 +-
 profiles/arch/ia64/make.defaults          | 2 +-
 profiles/arch/powerpc/ppc32/make.defaults | 2 +-
 profiles/arch/powerpc/ppc64/make.defaults | 2 +-
 profiles/arch/s390/make.defaults          | 2 +-
 profiles/arch/sparc/make.defaults         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 3449562f048..efb7262f104 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 -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 f1655f9170e..d09bb4da35e 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 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index f6b6600fec8..3f22ce8df61 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 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 1c7884a9e38..b91a3961859 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 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index f5b7331ada0..3b8dbab2de7 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 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index ee493e24c30..d2b49417d9f 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 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index ec35f09d114..476bb25aa01 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 -ruby24"
+RUBY_TARGETS="ruby23"

diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 4af6d8cc78c..8ae22a12a03 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 -ruby24"
+RUBY_TARGETS="ruby23"