summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2018-01-21 11:17:21 +0100
committerHans de Graaff <graaff@gentoo.org>2018-01-21 11:38:40 +0100
commitd1b15d57a9ef8e43dae954f5d961f69550781bbe (patch)
tree4871f193a43f0cd25a61812fcf113afc7b8629c8 /profiles/arch/sparc
parentsys-libs/glibc: reenable stack protection on mips, bug #640130 (diff)
downloadgentoo-d1b15d57a9ef8e43dae954f5d961f69550781bbe.tar.gz
gentoo-d1b15d57a9ef8e43dae954f5d961f69550781bbe.tar.bz2
gentoo-d1b15d57a9ef8e43dae954f5d961f69550781bbe.zip
Move current ruby23 status into arch profiles, bug 639476
Mask ruby_targets_ruby23 in the use.stable.mask of each arch and set RUBY_TARGETS to ruby22 in the make.defaults for each arch. This makes it possible to update the defaults in the main profile for a stable ruby:2.3 slot and consequently to mark ruby:2.3 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.3 but RUBY_TARGETS="ruby22"). Each arch is expected to remove these temporary entries as they mark ruby:2.3 stable, as per the instructions in bug 639476.
Diffstat (limited to 'profiles/arch/sparc')
-rw-r--r--profiles/arch/sparc/make.defaults4
-rw-r--r--profiles/arch/sparc/use.stable.mask4
2 files changed, 8 insertions, 0 deletions
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 0053c3734d92..acad3dcea1ea 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -39,3 +39,7 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
# Defaults for video drivers
VIDEO_CARDS="fbdev glint mach64 mga r128 radeon sunbw2 suncg14 suncg3 \
suncg6 sunffb sunleo tdfx voodoo"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index a381058c68d3..33c7089f46f4 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> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
# Hans de Graaff <graaff@gentoo.org> (13 Aug 2017)
# Drop stable ruby on sparc
ruby