1 |
commit: d5221fb5659fcfae3244550c5cb1817c7f07cbb0 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 14 07:08:19 2020 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 14 07:11:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5221fb5 |
7 |
|
8 |
profiles: mask ruby26 per profile |
9 |
|
10 |
This commit masks ruby26 per profile using use.stable.mask and sets |
11 |
RUBY_TARGETS accordingly. It also enabled ruby26 globally. This |
12 |
facilitates the per-arch stable request in bug 728192 so each arch can |
13 |
mark ruby 2.6 stable without further coordination between arches or |
14 |
maintainers. |
15 |
|
16 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
17 |
|
18 |
profiles/arch/amd64/make.defaults | 4 ++++ |
19 |
profiles/arch/amd64/use.stable.mask | 4 ++++ |
20 |
profiles/arch/arm/make.defaults | 3 +++ |
21 |
profiles/arch/arm/use.stable.mask | 4 ++++ |
22 |
profiles/arch/arm64/make.defaults | 4 ++++ |
23 |
profiles/arch/arm64/use.stable.mask | 4 ++++ |
24 |
profiles/arch/hppa/make.defaults | 4 ++++ |
25 |
profiles/arch/hppa/use.stable.mask | 4 ++++ |
26 |
profiles/arch/powerpc/ppc32/make.defaults | 4 ++++ |
27 |
profiles/arch/powerpc/ppc32/use.stable.mask | 4 ++++ |
28 |
profiles/arch/powerpc/ppc64/make.defaults | 4 ++++ |
29 |
profiles/arch/powerpc/ppc64/use.stable.mask | 4 ++++ |
30 |
profiles/arch/sparc/make.defaults | 4 ++++ |
31 |
profiles/arch/sparc/use.stable.mask | 4 ++++ |
32 |
profiles/arch/x86/make.defaults | 4 ++++ |
33 |
profiles/arch/x86/use.stable.mask | 4 ++++ |
34 |
profiles/base/make.defaults | 4 ++-- |
35 |
profiles/base/use.stable.mask | 1 - |
36 |
18 files changed, 65 insertions(+), 3 deletions(-) |
37 |
|
38 |
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults |
39 |
index afe2ba0ad01..e814358a7a3 100644 |
40 |
--- a/profiles/arch/amd64/make.defaults |
41 |
+++ b/profiles/arch/amd64/make.defaults |
42 |
@@ -67,3 +67,7 @@ IUSE_IMPLICIT="abi_x86_64" |
43 |
# Enable USE=libtirpc by default, to ease dependency resolution during |
44 |
# the stabilization of glibc-2.26. Bug 657148 |
45 |
USE="libtirpc" |
46 |
+ |
47 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
48 |
+# Set per-arch to facilitate stabling, bug 728192 |
49 |
+RUBY_TARGETS="ruby25" |
50 |
|
51 |
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask |
52 |
index d2d7f36c1b2..a904e821200 100644 |
53 |
--- a/profiles/arch/amd64/use.stable.mask |
54 |
+++ b/profiles/arch/amd64/use.stable.mask |
55 |
@@ -4,6 +4,10 @@ |
56 |
# This file requires eapi 5 or later. New entries go on top. |
57 |
# Please use the same syntax as in use.mask |
58 |
|
59 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
60 |
+# Masked per-arch to facilitate stabling, bug 728192 |
61 |
+ruby_targets_ruby26 |
62 |
+ |
63 |
# Andreas Sturmlechner <asturm@g.o> (2020-06-06) |
64 |
# sci-libs/mkl is not stable, needs online registration to even run pkg_setup |
65 |
mkl |
66 |
|
67 |
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults |
68 |
index 972d7a5a46a..8536617f81f 100644 |
69 |
--- a/profiles/arch/arm/make.defaults |
70 |
+++ b/profiles/arch/arm/make.defaults |
71 |
@@ -23,3 +23,6 @@ VIDEO_CARDS="exynos fbdev omap" |
72 |
# Unhide the ARM-specific USE_EXPANDs. |
73 |
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" |
74 |
|
75 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
76 |
+# Set per-arch to facilitate stabling, bug 728192 |
77 |
+RUBY_TARGETS="ruby25" |
78 |
|
79 |
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask |
80 |
index 0448e2b174d..2799fca2ebd 100644 |
81 |
--- a/profiles/arch/arm/use.stable.mask |
82 |
+++ b/profiles/arch/arm/use.stable.mask |
83 |
@@ -4,6 +4,10 @@ |
84 |
# This file requires eapi 5 or later. New entries go on top. |
85 |
# Please use the same syntax as in use.mask |
86 |
|
87 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
88 |
+# Masked per-arch to facilitate stabling, bug 728192 |
89 |
+ruby_targets_ruby26 |
90 |
+ |
91 |
# Sam James <sam@g.o> (2020-06-29) |
92 |
# media-gfx/gimp not yet stable |
93 |
gimp |
94 |
|
95 |
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults |
96 |
index 3fa7f0b1c87..7787cb472c2 100644 |
97 |
--- a/profiles/arch/arm64/make.defaults |
98 |
+++ b/profiles/arch/arm64/make.defaults |
99 |
@@ -25,3 +25,7 @@ USE="libtirpc" |
100 |
# Michał Górny <mgorny@g.o> (2017-03-14) |
101 |
# Unhide the ARM-specific USE_EXPANDs. |
102 |
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" |
103 |
+ |
104 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
105 |
+# Set per-arch to facilitate stabling, bug 728192 |
106 |
+RUBY_TARGETS="ruby25" |
107 |
|
108 |
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask |
109 |
index 9d6e020d696..81d36ee2a62 100644 |
110 |
--- a/profiles/arch/arm64/use.stable.mask |
111 |
+++ b/profiles/arch/arm64/use.stable.mask |
112 |
@@ -4,6 +4,10 @@ |
113 |
# This file requires eapi 5 or later. New entries go on top. |
114 |
# Please use the same syntax as in use.mask |
115 |
|
116 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
117 |
+# Masked per-arch to facilitate stabling, bug 728192 |
118 |
+ruby_targets_ruby26 |
119 |
+ |
120 |
# Aaron Bauman <bman@g.o> (2019-05-20) |
121 |
# Does not build on arm64 |
122 |
ocamlopt |
123 |
|
124 |
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults |
125 |
index e25a2f2759a..38268c9d075 100644 |
126 |
--- a/profiles/arch/hppa/make.defaults |
127 |
+++ b/profiles/arch/hppa/make.defaults |
128 |
@@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}" |
129 |
# Donnie Berkholz <dberkholz@g.o> (2006-08-18) |
130 |
# Defaults for video drivers |
131 |
VIDEO_CARDS="fbdev" |
132 |
+ |
133 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
134 |
+# Set per-arch to facilitate stabling, bug 728192 |
135 |
+RUBY_TARGETS="ruby25" |
136 |
|
137 |
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask |
138 |
index 35d799148af..bb3bb243752 100644 |
139 |
--- a/profiles/arch/hppa/use.stable.mask |
140 |
+++ b/profiles/arch/hppa/use.stable.mask |
141 |
@@ -4,6 +4,10 @@ |
142 |
# This file requires eapi 5 or later. New entries go on top. |
143 |
# Please use the same syntax as in use.mask |
144 |
|
145 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
146 |
+# Masked per-arch to facilitate stabling, bug 728192 |
147 |
+ruby_targets_ruby26 |
148 |
+ |
149 |
# Michał Górny <mgorny@g.o> (2020-06-18) |
150 |
# Not ready for stable yet. |
151 |
python_targets_python3_8 |
152 |
|
153 |
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults |
154 |
index de0dc3b76f4..638233f7ed9 100644 |
155 |
--- a/profiles/arch/powerpc/ppc32/make.defaults |
156 |
+++ b/profiles/arch/powerpc/ppc32/make.defaults |
157 |
@@ -35,3 +35,7 @@ IUSE_IMPLICIT="abi_ppc_32" |
158 |
|
159 |
# Enable abi_ppc_32 for packages that don't have it forced. |
160 |
ABI_PPC="32" |
161 |
+ |
162 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
163 |
+# Set per-arch to facilitate stabling, bug 728192 |
164 |
+RUBY_TARGETS="ruby25" |
165 |
|
166 |
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask |
167 |
index 4153941ba6b..dac2627fd57 100644 |
168 |
--- a/profiles/arch/powerpc/ppc32/use.stable.mask |
169 |
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask |
170 |
@@ -1,3 +1,7 @@ |
171 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
172 |
+# Masked per-arch to facilitate stabling, bug 728192 |
173 |
+ruby_targets_ruby26 |
174 |
+ |
175 |
# Andreas Sturmlechner <asturm@g.o> (2020-08-13) |
176 |
# media-gfx/gimp is ~hppa only |
177 |
gimp |
178 |
|
179 |
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults |
180 |
index 0e1645fcff9..73bcfc3ffe9 100644 |
181 |
--- a/profiles/arch/powerpc/ppc64/make.defaults |
182 |
+++ b/profiles/arch/powerpc/ppc64/make.defaults |
183 |
@@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mga nv r128 radeon" |
184 |
|
185 |
# Enable abi_ppc_64 for packages that don't have it forced. |
186 |
ABI_PPC="64" |
187 |
+ |
188 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
189 |
+# Set per-arch to facilitate stabling, bug 728192 |
190 |
+RUBY_TARGETS="ruby25" |
191 |
|
192 |
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask |
193 |
index e797af411b7..1b72be92145 100644 |
194 |
--- a/profiles/arch/powerpc/ppc64/use.stable.mask |
195 |
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask |
196 |
@@ -3,3 +3,7 @@ |
197 |
|
198 |
# This file requires eapi 5 or later. New entries go on top. |
199 |
# Please use the same syntax as in use.mask |
200 |
+ |
201 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
202 |
+# Masked per-arch to facilitate stabling, bug 728192 |
203 |
+ruby_targets_ruby26 |
204 |
|
205 |
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults |
206 |
index ef87ea58b59..25a6f1c30f0 100644 |
207 |
--- a/profiles/arch/sparc/make.defaults |
208 |
+++ b/profiles/arch/sparc/make.defaults |
209 |
@@ -46,3 +46,7 @@ VIDEO_CARDS="fbdev glint mga r128 radeon" |
210 |
# Enable USE=libtirpc by default, to ease dependency resolution during |
211 |
# the stabilization of glibc-2.26. Bug 657148 |
212 |
USE="libtirpc" |
213 |
+ |
214 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
215 |
+# Set per-arch to facilitate stabling, bug 728192 |
216 |
+RUBY_TARGETS="ruby25" |
217 |
|
218 |
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask |
219 |
index af76053d3be..a509d574084 100644 |
220 |
--- a/profiles/arch/sparc/use.stable.mask |
221 |
+++ b/profiles/arch/sparc/use.stable.mask |
222 |
@@ -4,6 +4,10 @@ |
223 |
# This file requires eapi 5 or later. New entries go on top. |
224 |
# Please use the same syntax as in use.mask |
225 |
|
226 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
227 |
+# Masked per-arch to facilitate stabling, bug 728192 |
228 |
+ruby_targets_ruby26 |
229 |
+ |
230 |
# Rolf Eike Beer <eike@×××××××.de> (2020-04-14) |
231 |
# media-libs/gstreamer is not stable for sparc |
232 |
gstreamer |
233 |
|
234 |
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults |
235 |
index c0600e4ae9f..5f26b6eab90 100644 |
236 |
--- a/profiles/arch/x86/make.defaults |
237 |
+++ b/profiles/arch/x86/make.defaults |
238 |
@@ -47,3 +47,7 @@ ABI_X86="32" |
239 |
# Enable USE=libtirpc by default, to ease dependency resolution during |
240 |
# the stabilization of glibc-2.26. Bug 657148 |
241 |
USE="libtirpc" |
242 |
+ |
243 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
244 |
+# Set per-arch to facilitate stabling, bug 728192 |
245 |
+RUBY_TARGETS="ruby25" |
246 |
|
247 |
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask |
248 |
index b0ff96b03f1..b3aa6061b2d 100644 |
249 |
--- a/profiles/arch/x86/use.stable.mask |
250 |
+++ b/profiles/arch/x86/use.stable.mask |
251 |
@@ -4,6 +4,10 @@ |
252 |
# This file requires eapi 5 or later. New entries go on top. |
253 |
# Please use the same syntax as in use.mask |
254 |
|
255 |
+# Hans de Graaff <graaff@g.o> (2020-09-14) |
256 |
+# Masked per-arch to facilitate stabling, bug 728192 |
257 |
+ruby_targets_ruby26 |
258 |
+ |
259 |
# Andreas Sturmlechner <asturm@g.o> (2020-06-06) |
260 |
# sci-libs/mkl is not stable, needs online registration to even run pkg_setup |
261 |
mkl |
262 |
|
263 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
264 |
index 5b8552b7c2d..f2b15dd9a7e 100644 |
265 |
--- a/profiles/base/make.defaults |
266 |
+++ b/profiles/base/make.defaults |
267 |
@@ -101,8 +101,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te |
268 |
|
269 |
# Manuel Rüger <mrueg@g.o> (2015-09-09) |
270 |
# Default Ruby build target(s) |
271 |
-# Updated to include ruby25 on 2019-07-17 |
272 |
-RUBY_TARGETS="ruby25" |
273 |
+# Updated to include ruby26 on 2020-09-14 |
274 |
+RUBY_TARGETS="ruby25 ruby26" |
275 |
|
276 |
# Enable extended filesystem attribute support by default. |
277 |
# https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0 |
278 |
|
279 |
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask |
280 |
index 81ece61c137..ac34603f8ed 100644 |
281 |
--- a/profiles/base/use.stable.mask |
282 |
+++ b/profiles/base/use.stable.mask |
283 |
@@ -20,5 +20,4 @@ python_single_target_pypy3 |
284 |
|
285 |
# Hans de Graaff <graaff@g.o> (2019-12-26) |
286 |
# Currently in testing and not ready to go stable yet. |
287 |
-ruby_targets_ruby26 |
288 |
ruby_targets_ruby27 |