From 1cdd6b23d70596db93f2cdf3e5c3c7c024fdced4 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Wed, 17 Jul 2019 08:33:45 +0200 Subject: 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 --- 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(+) create mode 100644 profiles/arch/s390/use.stable.mask (limited to 'profiles') diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults index 6bbfb6303139..b0d8d036c6a6 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 (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Mike Gilbert (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 afe2ba0ad010..67cce2ed7d7c 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 (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Andreas Sturmlechner (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 23746eae9be3..3b496a9a83a0 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 (2017-03-14) # Unhide the ARM-specific USE_EXPANDs. USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" + +# Hans de Graaff (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Thomas Deutschmann (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 3fa7f0b1c878..cffd2eafcc71 100644 --- a/profiles/arch/arm64/make.defaults +++ b/profiles/arch/arm64/make.defaults @@ -25,3 +25,7 @@ USE="libtirpc" # Michał Górny (2017-03-14) # Unhide the ARM-specific USE_EXPANDs. USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" + +# Hans de Graaff (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Aaron Bauman (2019-05-20) # Does not build on arm64 ocamlopt diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults index e25a2f2759a3..fb6b9006e23c 100644 --- a/profiles/arch/hppa/make.defaults +++ b/profiles/arch/hppa/make.defaults @@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}" # Donnie Berkholz (2006-08-18) # Defaults for video drivers VIDEO_CARDS="fbdev" + +# Hans de Graaff (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Andreas Sturmlechner (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 bdf4d7fa4798..f268b499769f 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ò (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 (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Andreas Sturmlechner (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 de0dc3b76f47..944a5063f7b7 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 (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Mike Gilbert (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 0e1645fcff97..02897b721721 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 (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Mike Gilbert (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 ae0d0d397e86..3ee8806451d0 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 (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 b7dc3ff5dc2b..56a94001e0da 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 (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Sergei Trofimovich (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 c0600e4ae9f1..884e1c008db8 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 (2019-07-17) +# Temporary mask for stable bug 688976 +ruby_targets_ruby25 + # Andreas Sturmlechner (2018-11-17) # media-sound/audacious is not yet stabilised audacious -- cgit v1.2.3-65-gdbad