* [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, profiles/arch/hppa/, profiles/arch/amd64/, ...
@ 2019-07-17 6:40 Hans de Graaff
0 siblings, 0 replies; only message in thread
From: Hans de Graaff @ 2019-07-17 6:40 UTC (permalink / raw
To: gentoo-commits
commit: 1cdd6b23d70596db93f2cdf3e5c3c7c024fdced4
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 06:33:45 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 06:33:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cdd6b23
profiles/arch: mask ruby:2.5 for each arch
This is needed for ruby 2.5 stable bug 688976 and allows each arch to
mark ruby 2.5 stable independently.
Add a use.stable.mask for ruby_targets_ruby25 and sets RUBY_TARGETS to
ruby24 only.
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
profiles/arch/alpha/make.defaults | 4 ++++
profiles/arch/alpha/use.stable.mask | 4 ++++
profiles/arch/amd64/make.defaults | 4 ++++
profiles/arch/amd64/use.stable.mask | 4 ++++
profiles/arch/arm/make.defaults | 4 ++++
profiles/arch/arm/use.stable.mask | 4 ++++
profiles/arch/arm64/make.defaults | 4 ++++
profiles/arch/arm64/use.stable.mask | 4 ++++
profiles/arch/hppa/make.defaults | 4 ++++
profiles/arch/hppa/use.stable.mask | 4 ++++
profiles/arch/ia64/make.defaults | 4 ++++
profiles/arch/ia64/use.stable.mask | 4 ++++
profiles/arch/powerpc/ppc32/make.defaults | 4 ++++
profiles/arch/powerpc/ppc32/use.stable.mask | 4 ++++
profiles/arch/powerpc/ppc64/make.defaults | 4 ++++
profiles/arch/powerpc/ppc64/use.stable.mask | 4 ++++
profiles/arch/s390/make.defaults | 4 ++++
profiles/arch/s390/use.stable.mask | 4 ++++
profiles/arch/sparc/make.defaults | 4 ++++
profiles/arch/sparc/use.stable.mask | 4 ++++
profiles/arch/x86/make.defaults | 4 ++++
profiles/arch/x86/use.stable.mask | 4 ++++
22 files changed, 88 insertions(+)
diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 6bbfb630313..b0d8d036c6a 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -32,3 +32,7 @@ ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 e
# Enable USE=libtirpc by default, to ease dependency resolution during
# the stabilization of glibc-2.26. Bug 657148
USE="libtirpc"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index d28d2d5a800..23450b43c84 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Mike Gilbert <floppym@gentoo.org> (2017-06-08)
# dev-lang/python:3.7 is not stable.
python_targets_python3_7
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index afe2ba0ad01..67cce2ed7d7 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -67,3 +67,7 @@ IUSE_IMPLICIT="abi_x86_64"
# Enable USE=libtirpc by default, to ease dependency resolution during
# the stabilization of glibc-2.26. Bug 657148
USE="libtirpc"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index b2065471711..67f14b4f4ce 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Andreas Sturmlechner <asturm@gentoo.org> (2018-11-17)
# media-sound/audacious is not yet stabilised
audacious
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 23746eae9be..3b496a9a83a 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -22,3 +22,7 @@ VIDEO_CARDS="exynos fbdev omap"
# Michał Górny <mgorny@gentoo.org> (2017-03-14)
# Unhide the ARM-specific USE_EXPANDs.
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 5d0ba54c26e..3c11f961a4d 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Thomas Deutschmann <whissi@gentoo.org> (2019-06-08)
# Needs dev-lang/php:7.3 stable
php_targets_php7-3
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index 3fa7f0b1c87..cffd2eafcc7 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -25,3 +25,7 @@ USE="libtirpc"
# Michał Górny <mgorny@gentoo.org> (2017-03-14)
# Unhide the ARM-specific USE_EXPANDs.
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index d99f15b0806..0cb107d8064 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Aaron Bauman <bman@gentoo.org> (2019-05-20)
# Does not build on arm64
ocamlopt
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index e25a2f2759a..fb6b9006e23 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}"
# Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
# Defaults for video drivers
VIDEO_CARDS="fbdev"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 4ca83d48de1..b6d0ffd1d1b 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Andreas Sturmlechner <asturm@gentoo.org> (2019-06-05)
# sys-auth/consolekit will not be stabilised anymore.
consolekit
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index bdf4d7fa479..f268b499769 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -31,3 +31,7 @@ VIDEO_CARDS="fbdev glint mga nv r128 radeon"
# Diego Pettenò <flameeyes@gentoo.org> (2006-12-23)
# Defaults for audio drivers - Took from x86 profile
ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index f7aa42a2d1d..6bfa9aaa186 100644
--- a/profiles/arch/ia64/use.stable.mask
+++ b/profiles/arch/ia64/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Andreas Sturmlechner <asturm@gentoo.org> (2019-04-29)
# sys-auth/elogind is not yet stable here. bug #682158
elogind
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index de0dc3b76f4..944a5063f7b 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -35,3 +35,7 @@ IUSE_IMPLICIT="abi_ppc_32"
# Enable abi_ppc_32 for packages that don't have it forced.
ABI_PPC="32"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index bb884f654d2..224abbab30a 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,3 +1,7 @@
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Mike Gilbert <floppym@gentoo.org> (2017-06-08)
# dev-lang/python:3.7 is not stable.
python_targets_python3_7
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index 0e1645fcff9..02897b72172 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mga nv r128 radeon"
# Enable abi_ppc_64 for packages that don't have it forced.
ABI_PPC="64"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index 5ba9da7bc57..6f2bbeb4eb7 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Mike Gilbert <floppym@gentoo.org> (2017-06-08)
# dev-lang/python:3.7 is not stable.
python_targets_python3_7
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index ae0d0d397e8..3ee8806451d 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -31,3 +31,7 @@ ABI_S390="32"
# While multilib is available, we don't default it to on.
BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib"
USE="-multilib"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/s390/use.stable.mask b/profiles/arch/s390/use.stable.mask
new file mode 100644
index 00000000000..cfd0947fdfd
--- /dev/null
+++ b/profiles/arch/s390/use.stable.mask
@@ -0,0 +1,4 @@
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index b7dc3ff5dc2..56a94001e0d 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -43,3 +43,7 @@ VIDEO_CARDS="fbdev glint mga r128 radeon"
# Enable USE=libtirpc by default, to ease dependency resolution during
# the stabilization of glibc-2.26. Bug 657148
USE="libtirpc"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index dda2b0e622d..123fa35d6f2 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Sergei Trofimovich <slyfox@gentoo.org> (2019-02-02)
# No stable app-arch/rpm on sparc.
rpm
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index c0600e4ae9f..884e1c008db 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -47,3 +47,7 @@ ABI_X86="32"
# Enable USE=libtirpc by default, to ease dependency resolution during
# the stabilization of glibc-2.26. Bug 657148
USE="libtirpc"
+
+# Hans de Graaff <graaff@gentoo.org) (2019-07-17)
+# Temporary RUBY_TARGETS for bug 688976
+RUBY_TARGETS="ruby24"
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index c30ac38e05b..32aebf145aa 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
+# Temporary mask for stable bug 688976
+ruby_targets_ruby25
+
# Andreas Sturmlechner <asturm@gentoo.org> (2018-11-17)
# media-sound/audacious is not yet stabilised
audacious
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-07-17 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-17 6:40 [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, profiles/arch/hppa/, profiles/arch/amd64/, 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