diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2017-04-17 10:07:05 +0200 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2017-04-17 10:12:57 +0200 |
| commit | 25be5ad266afa59aeffe4e4c51ea82daba236fe0 (patch) | |
| tree | a1099c3af1e6741d7a27a86943305d00534fe4d1 /profiles/arch/x86 | |
| parent | net-libs/webkit-gtk: security cleanup (diff) | |
| download | gentoo-25be5ad266afa59aeffe4e4c51ea82daba236fe0.tar.gz gentoo-25be5ad266afa59aeffe4e4c51ea82daba236fe0.tar.bz2 gentoo-25be5ad266afa59aeffe4e4c51ea82daba236fe0.zip | |
Move current ruby22 status into arch profiles, bug 615818
Mask ruby_targets_ruby22 in the use.stable.mask of each arch and set
RUBY_TARGETS to ruby21 in the make.defaults for each arch.
This makes it possible to update the defaults in the main profile for
a stable ruby:2.2 slot and consequently to mark ruby:2.2 stable on
each arch in turn making sure that users of that arch will not end up
with conflicting settings (e.g. stable ruby:2.2 but
RUBY_TARGETS="ruby21").
Each arch is expected to remove these temporary entries as they mark
ruby:2.2 stable, as per the instructions in bug 615818.
Diffstat (limited to 'profiles/arch/x86')
| -rw-r--r-- | profiles/arch/x86/make.defaults | 4 | ||||
| -rw-r--r-- | profiles/arch/x86/use.stable.mask | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults index f3347ce31a71..0709d43356a1 100644 --- a/profiles/arch/x86/make.defaults +++ b/profiles/arch/x86/make.defaults @@ -42,3 +42,7 @@ IUSE_IMPLICIT="abi_x86_32" # Michał Górny <mgorny@gentoo.org> (01 Jul 2014) # Default to abi_x86_32 for packages that don't have it forced. ABI_X86="32" + +# Hans de Graaff <graaff@gentoo.org> (17 Apr 2017) +# Temporary entry to support stable bug 615818 +RUBY_TARGETS="ruby21" diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask index 3a096d726fc7..91ad03654007 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> (17 Apr 2017) +# Temporary mask to support stable bug 615818 +ruby_targets_ruby22 + # Mike Gilbert <floppym@gentoo.org> (19 Oct 2014) # sys-libs/libapparmor apparmor |