commit: bc014d3fefbfb979addf255df20d60e530658634 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Mon Nov 12 19:17:46 2018 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Mon Nov 12 19:19:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc014d3f
profiles/arch: prepare for ruby24 stable bug Mask ruby_targets_ruby24 in each arch with stable ruby and set RUBY_TARGETS for each arch to ruby23, so that each arch can stable ruby24 in their own time. See bug 661262 for more details. Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> profiles/arch/alpha/make.defaults | 6 +++--- 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 | 6 +++--- profiles/arch/arm/use.stable.mask | 4 ++++ profiles/arch/hppa/make.defaults | 6 +++--- 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/sparc/make.defaults | 4 ++++ profiles/arch/sparc/use.stable.mask | 4 ++++ profiles/arch/x86/make.defaults | 6 +++--- profiles/arch/x86/use.stable.mask | 4 ++++ profiles/base/make.defaults | 6 +++--- profiles/base/use.stable.mask | 1 - 21 files changed, 75 insertions(+), 16 deletions(-) diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults index 184cd2140c8..efb7262f104 100644 --- a/profiles/arch/alpha/make.defaults +++ b/profiles/arch/alpha/make.defaults @@ -28,9 +28,9 @@ VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo" # Alpha supports the same busses. ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 maestro3 trident usb-audio via82xx ymfpci" -# Hans de Graaff <[email protected]> (21 Jan 2018) -# Temporary entry to support stable bug 639476 -RUBY_TARGETS="ruby22" +# Hans de Graaff <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" # Tobias Klausmann <[email protected]> (25 Jun 2018) # Enable USE=libtirpc by default, to ease dependency resolution during diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask index e1b9f434793..30ef89054df 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 <[email protected]> (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Mike Gilbert <[email protected]> (08 Jun 2017) # 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 48ae66bb3eb..8f795c3eaf2 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 <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask index 1fc437119b7..ff72dc56e92 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 <[email protected]> (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Mike Gilbert <[email protected]> (08 Jun 2017) # dev-lang/python:3.7 is not stable. python_targets_python3_7 diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults index 410843f5d63..d09bb4da35e 100644 --- a/profiles/arch/arm/make.defaults +++ b/profiles/arch/arm/make.defaults @@ -23,6 +23,6 @@ VIDEO_CARDS="exynos fbdev omap" # Unhide the ARM-specific USE_EXPANDs. USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" -# Hans de Graaff <[email protected]> (21 Jan 2018) -# Temporary entry to support stable bug 639476 -RUBY_TARGETS="ruby22" +# Hans de Graaff <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask index 89f0809db8d..9f988949e33 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 <[email protected]> (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Mike Gilbert <[email protected]> (08 Jun 2017) # dev-lang/python:3.7 is not stable. python_targets_python3_7 diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults index 3939be39232..3f22ce8df61 100644 --- a/profiles/arch/hppa/make.defaults +++ b/profiles/arch/hppa/make.defaults @@ -25,6 +25,6 @@ CHOST_hppa="${CHOST}" # Defaults for video drivers VIDEO_CARDS="fbdev" -# Hans de Graaff <[email protected]> (21 Jan 2018) -# Temporary entry to support stable bug 639476 -RUBY_TARGETS="ruby22" +# Hans de Graaff <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask index f598c423770..8c4cf24387e 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 <[email protected]> (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Andreas Sturmlechner <[email protected]> (20 May 2018) openal diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults index 0f0509dd773..b91a3961859 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 tdfx voodoo" # 2006/12/23 - Diego Pettenò <[email protected]> # 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 <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask index 7b9d312ba39..5d0f2daac79 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 <[email protected]> (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Mike Gilbert <[email protected]> (08 Jun 2017) # dev-lang/python:3.7 is not stable. python_targets_python3_7 diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults index 418e2b90851..3b8dbab2de7 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 <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask index 49f0bee80f6..9973cc5d553 100644 --- a/profiles/arch/powerpc/ppc32/use.stable.mask +++ b/profiles/arch/powerpc/ppc32/use.stable.mask @@ -1,3 +1,7 @@ +# Hans de Graaff <[email protected]> (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Mike Gilbert <[email protected]> (08 Jun 2017) # 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 7f43ef6c488..d2b49417d9f 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 <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask index a47ca75152f..dadeeb17b0e 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 <[email protected]> (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Mike Gilbert <[email protected]> (08 Jun 2017) # 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 b26df0f3427..476bb25aa01 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 <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults index 32ca3073612..8ae22a12a03 100644 --- a/profiles/arch/sparc/make.defaults +++ b/profiles/arch/sparc/make.defaults @@ -43,3 +43,7 @@ VIDEO_CARDS="fbdev glint mga r128 radeon tdfx voodoo" # Enable USE=libtirpc by default, to ease dependency resolution during # the stabilization of glibc-2.26. Bug 657148 USE="libtirpc" + +# Hans de Graaff <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask index 127d5cf20fb..f13e6a55c4f 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 <[email protected]> (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Mike Gilbert <[email protected]> (08 Jun 2017) # dev-lang/python:3.7 is not stable. python_targets_python3_7 diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults index d11e26fedd1..d644e7ef3d7 100644 --- a/profiles/arch/x86/make.defaults +++ b/profiles/arch/x86/make.defaults @@ -43,9 +43,9 @@ IUSE_IMPLICIT="abi_x86_32" # Default to abi_x86_32 for packages that don't have it forced. ABI_X86="32" -# Hans de Graaff <[email protected]> (21 Jan 2018) -# Temporary entry to support stable bug 639476 -RUBY_TARGETS="ruby22" +# Hans de Graaff <[email protected]> (12 Nov 2018) +# Temporary entry to support stable bug 661262 +RUBY_TARGETS="ruby23" # Thomas Deutschmann <[email protected]> (6 Jun 2018) # Enable USE=libtirpc by default, to ease dependency resolution during diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask index 85f2fc15300..9bddb0b6b72 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 <[email protected]> (12 Nov 2018) +# Temporary mask for ruby:2.4, bug 661262 +ruby_targets_ruby24 + # Mike Gilbert <[email protected]> (08 Jun 2017) # dev-lang/python:3.7 is not stable. python_targets_python3_7 diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 167a51095d4..b957a95fa4f 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -97,9 +97,9 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml" # Manuel Rüger <[email protected]> (09 Sep 2015) -# Default Ruby build target -# Updated to include ruby23 on 21 Jan 2018 -RUBY_TARGETS="ruby23" +# Default Ruby build target(s) +# Updated to include ruby24 on 12 Nov 2018 +RUBY_TARGETS="ruby23 ruby24" # Samuli Suominen <[email protected]> (03 Dec 2009) # Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask index 8d065fe4f51..49932570cc7 100644 --- a/profiles/base/use.stable.mask +++ b/profiles/base/use.stable.mask @@ -13,7 +13,6 @@ python_single_target_pypy3 # Hans de Graaff <[email protected]> (25 Dec 2017) # Currently in testing and not ready to go stable yet. -ruby_targets_ruby24 ruby_targets_ruby25 # Patrick Lauer <[email protected]> (28 Apr 2015)
