* [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm64/, profiles/arch/sparc/, profiles/arch/powerpc/ppc64/, ...
@ 2019-07-22 6:40 Hans de Graaff
0 siblings, 0 replies; only message in thread
From: Hans de Graaff @ 2019-07-22 6:40 UTC (permalink / raw
To: gentoo-commits
commit: 44eed74d8bc1287470555ae21ca5531782a5185d
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 06:38:01 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 06:38:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44eed74d
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 <AT> gentoo.org>
profiles/arch/alpha/make.defaults | 2 +-
profiles/arch/amd64/make.defaults | 2 +-
profiles/arch/arm/make.defaults | 2 +-
profiles/arch/arm64/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 +-
profiles/arch/x86/make.defaults | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index b0d8d036c6a..21df1ec3ca0 100644
--- 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 67cce2ed7d7..71ccf64f7b8 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) (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 3b496a9a83a..3da266c294f 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) (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 cffd2eafcc7..ae8f19006b8 100644
--- 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 fb6b9006e23..2a073cccf86 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) (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 f268b499769..acf98294868 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) (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 944a5063f7b..e308786ffa4 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) (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 02897b72172..3bf4d4c5685 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) (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 3ee8806451d..f2a7ddadfb2 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) (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 56a94001e0d..66fd2ca7a08 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) (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 884e1c008db..69c61d58e06 100644
--- 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"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-07-22 6:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-22 6:40 [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm64/, profiles/arch/sparc/, profiles/arch/powerpc/ppc64/, Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox