1 |
commit: 732fa8647044c8d13853a84546803c070faf0217 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 10 06:37:55 2021 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 10 06:39:44 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732fa864 |
7 |
|
8 |
profiles: prepare for ruby27 stable bug |
9 |
|
10 |
Set the new defaults including ruby27 in the base profile, and reset |
11 |
it again to the ruby26 defaults in the arch profiles. This allows each |
12 |
arch to stable ruby27 at their own speed. Bug 801289. |
13 |
|
14 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
15 |
|
16 |
profiles/arch/amd64/make.defaults | 8 ++++++-- |
17 |
profiles/arch/amd64/use.stable.mask | 4 ++++ |
18 |
profiles/arch/arm/make.defaults | 6 +++++- |
19 |
profiles/arch/arm/use.stable.mask | 4 ++++ |
20 |
profiles/arch/arm64/make.defaults | 4 ++++ |
21 |
profiles/arch/arm64/use.stable.mask | 4 ++++ |
22 |
profiles/arch/hppa/make.defaults | 6 +++++- |
23 |
profiles/arch/hppa/use.stable.mask | 4 ++++ |
24 |
profiles/arch/powerpc/ppc32/make.defaults | 6 +++++- |
25 |
profiles/arch/powerpc/ppc32/use.stable.mask | 4 ++++ |
26 |
profiles/arch/powerpc/ppc64/make.defaults | 6 +++++- |
27 |
profiles/arch/powerpc/ppc64/use.stable.mask | 6 +++++- |
28 |
profiles/arch/sparc/make.defaults | 6 +++++- |
29 |
profiles/arch/sparc/use.stable.mask | 6 +++++- |
30 |
profiles/arch/x86/make.defaults | 6 +++++- |
31 |
profiles/arch/x86/use.stable.mask | 4 ++++ |
32 |
profiles/base/make.defaults | 4 ++-- |
33 |
profiles/base/use.stable.mask | 3 +-- |
34 |
18 files changed, 77 insertions(+), 14 deletions(-) |
35 |
|
36 |
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults |
37 |
index afe2ba0ad01..1f4063dbdd1 100644 |
38 |
--- a/profiles/arch/amd64/make.defaults |
39 |
+++ b/profiles/arch/amd64/make.defaults |
40 |
@@ -1,4 +1,4 @@ |
41 |
-# Copyright 1999-2017 Gentoo Foundation |
42 |
+# Copyright 1999-2021 Gentoo Authors |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
|
45 |
ARCH="amd64" |
46 |
@@ -38,7 +38,7 @@ LDFLAGS_x32="-m elf32_x86_64" |
47 |
CHOST_x32="x86_64-pc-linux-gnux32" |
48 |
|
49 |
# Simon Stelling <blubb@g.o> (2006-10-24) |
50 |
-# They are masked, but we can enable them anyway for those who have |
51 |
+# They are masked, but we can enable them anyway for those who have |
52 |
# >=portage-2.1.2_pre3-r4 |
53 |
CPU_FLAGS_X86="mmx mmxext sse sse2" |
54 |
|
55 |
@@ -67,3 +67,7 @@ IUSE_IMPLICIT="abi_x86_64" |
56 |
# Enable USE=libtirpc by default, to ease dependency resolution during |
57 |
# the stabilization of glibc-2.26. Bug 657148 |
58 |
USE="libtirpc" |
59 |
+ |
60 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
61 |
+# Temporary override base default to support the ruby27 stable bug 801289 |
62 |
+RUBY_TARGETS="ruby26" |
63 |
|
64 |
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask |
65 |
index df910ea0ebe..ed932e0c842 100644 |
66 |
--- a/profiles/arch/amd64/use.stable.mask |
67 |
+++ b/profiles/arch/amd64/use.stable.mask |
68 |
@@ -4,6 +4,10 @@ |
69 |
# This file requires eapi 5 or later. New entries go on top. |
70 |
# Please use the same syntax as in use.mask |
71 |
|
72 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
73 |
+# Temporary entry to support the ruby27 stable bug 801289 |
74 |
+ruby_targets_ruby27 |
75 |
+ |
76 |
# Michał Górny <mgorny@g.o> (2021-05-04) |
77 |
# Python 3.10 is not yet stable (and will not be until it's out of beta, |
78 |
# around September. |
79 |
|
80 |
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults |
81 |
index 70dc565bdd3..ebd5d88d2d5 100644 |
82 |
--- a/profiles/arch/arm/make.defaults |
83 |
+++ b/profiles/arch/arm/make.defaults |
84 |
@@ -1,4 +1,4 @@ |
85 |
-# Copyright 2008-2020 Gentoo Authors |
86 |
+# Copyright 2008-2021 Gentoo Authors |
87 |
# Distributed under the terms of the GNU General Public License v2 |
88 |
|
89 |
# Main ARM profile |
90 |
@@ -25,3 +25,7 @@ VIDEO_CARDS="exynos fbdev omap" |
91 |
# Michał Górny <mgorny@g.o> (2017-03-14) |
92 |
# Unhide the ARM-specific USE_EXPANDs. |
93 |
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" |
94 |
+ |
95 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
96 |
+# Temporary override base default to support the ruby27 stable bug 801289 |
97 |
+RUBY_TARGETS="ruby26" |
98 |
|
99 |
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask |
100 |
index 8fa70e683bc..515afe79c63 100644 |
101 |
--- a/profiles/arch/arm/use.stable.mask |
102 |
+++ b/profiles/arch/arm/use.stable.mask |
103 |
@@ -4,6 +4,10 @@ |
104 |
# This file requires eapi 5 or later. New entries go on top. |
105 |
# Please use the same syntax as in use.mask |
106 |
|
107 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
108 |
+# Temporary entry to support the ruby27 stable bug 801289 |
109 |
+ruby_targets_ruby27 |
110 |
+ |
111 |
# Michał Górny <mgorny@g.o> (2021-05-04) |
112 |
# Python 3.10 is not yet stable (and will not be until it's out of beta, |
113 |
# around September. |
114 |
|
115 |
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults |
116 |
index 2f35acff83c..917aed76385 100644 |
117 |
--- a/profiles/arch/arm64/make.defaults |
118 |
+++ b/profiles/arch/arm64/make.defaults |
119 |
@@ -28,3 +28,7 @@ USE="libtirpc" |
120 |
# Michał Górny <mgorny@g.o> (2017-03-14) |
121 |
# Unhide the ARM-specific USE_EXPANDs. |
122 |
USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" |
123 |
+ |
124 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
125 |
+# Temporary override base default to support the ruby27 stable bug 801289 |
126 |
+RUBY_TARGETS="ruby26" |
127 |
|
128 |
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask |
129 |
index ff0cafe9ef9..e341f3f2416 100644 |
130 |
--- a/profiles/arch/arm64/use.stable.mask |
131 |
+++ b/profiles/arch/arm64/use.stable.mask |
132 |
@@ -4,6 +4,10 @@ |
133 |
# This file requires eapi 5 or later. New entries go on top. |
134 |
# Please use the same syntax as in use.mask |
135 |
|
136 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
137 |
+# Temporary entry to support the ruby27 stable bug 801289 |
138 |
+ruby_targets_ruby27 |
139 |
+ |
140 |
# Michał Górny <mgorny@g.o> (2021-05-04) |
141 |
# Python 3.10 is not yet stable (and will not be until it's out of beta, |
142 |
# around September. |
143 |
|
144 |
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults |
145 |
index 4da39eeda98..5ae3874285d 100644 |
146 |
--- a/profiles/arch/hppa/make.defaults |
147 |
+++ b/profiles/arch/hppa/make.defaults |
148 |
@@ -1,4 +1,4 @@ |
149 |
-# Copyright 1999-2020 Gentoo Authors |
150 |
+# Copyright 1999-2021 Gentoo Authors |
151 |
# Distributed under the terms of the GNU General Public License v2 |
152 |
|
153 |
ARCH="hppa" |
154 |
@@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}" |
155 |
# Donnie Berkholz <dberkholz@g.o> (2006-08-18) |
156 |
# Defaults for video drivers |
157 |
VIDEO_CARDS="fbdev" |
158 |
+ |
159 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
160 |
+# Temporary override base default to support the ruby27 stable bug 801289 |
161 |
+RUBY_TARGETS="ruby26" |
162 |
|
163 |
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask |
164 |
index 25572505eec..5cb7fe2795c 100644 |
165 |
--- a/profiles/arch/hppa/use.stable.mask |
166 |
+++ b/profiles/arch/hppa/use.stable.mask |
167 |
@@ -4,6 +4,10 @@ |
168 |
# This file requires eapi 5 or later. New entries go on top. |
169 |
# Please use the same syntax as in use.mask |
170 |
|
171 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
172 |
+# Temporary entry to support the ruby27 stable bug 801289 |
173 |
+ruby_targets_ruby27 |
174 |
+ |
175 |
# Matt Turner <mattst88@g.o> (2021-09-22) |
176 |
# media-libs/libsamplerate is not stable on hppa |
177 |
libsamplerate |
178 |
|
179 |
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults |
180 |
index 46b593ce286..d8c881b1080 100644 |
181 |
--- a/profiles/arch/powerpc/ppc32/make.defaults |
182 |
+++ b/profiles/arch/powerpc/ppc32/make.defaults |
183 |
@@ -1,4 +1,4 @@ |
184 |
-# Copyright 1999-2019 Gentoo Authors |
185 |
+# Copyright 1999-2021 Gentoo Authors |
186 |
# Distributed under the terms of the GNU General Public License v2 |
187 |
|
188 |
# All extra USE/etc should be specified in sub-profiles. |
189 |
@@ -35,3 +35,7 @@ IUSE_IMPLICIT="abi_ppc_32" |
190 |
|
191 |
# Enable abi_ppc_32 for packages that don't have it forced. |
192 |
ABI_PPC="32" |
193 |
+ |
194 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
195 |
+# Temporary override base default to support the ruby27 stable bug 801289 |
196 |
+RUBY_TARGETS="ruby26" |
197 |
|
198 |
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask |
199 |
index 408d42d9aa9..86fa045b0a1 100644 |
200 |
--- a/profiles/arch/powerpc/ppc32/use.stable.mask |
201 |
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask |
202 |
@@ -1,6 +1,10 @@ |
203 |
# Copyright 2014-2021 Gentoo Authors |
204 |
# Distributed under the terms of the GNU General Public License v2 |
205 |
|
206 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
207 |
+# Temporary entry to support the ruby27 stable bug 801289 |
208 |
+ruby_targets_ruby27 |
209 |
+ |
210 |
# Michał Górny <mgorny@g.o> (2021-05-04) |
211 |
# Python 3.10 is not yet stable (and will not be until it's out of beta, |
212 |
# around September. |
213 |
|
214 |
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults |
215 |
index b4dbccd021c..562ac6ba777 100644 |
216 |
--- a/profiles/arch/powerpc/ppc64/make.defaults |
217 |
+++ b/profiles/arch/powerpc/ppc64/make.defaults |
218 |
@@ -1,4 +1,4 @@ |
219 |
-# Copyright 1999-2019 Gentoo Authors |
220 |
+# Copyright 1999-2021 Gentoo Authors |
221 |
# Distributed under the terms of the GNU General Public License v2 |
222 |
|
223 |
# All extra USE/etc should be specified in sub-profiles. |
224 |
@@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mga nv r128 radeon" |
225 |
|
226 |
# Enable abi_ppc_64 for packages that don't have it forced. |
227 |
ABI_PPC="64" |
228 |
+ |
229 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
230 |
+# Temporary override base default to support the ruby27 stable bug 801289 |
231 |
+RUBY_TARGETS="ruby26" |
232 |
|
233 |
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask |
234 |
index 40076c2d987..509e9df8e60 100644 |
235 |
--- a/profiles/arch/powerpc/ppc64/use.stable.mask |
236 |
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask |
237 |
@@ -1,9 +1,13 @@ |
238 |
-# Copyright 1999-2019 Gentoo Authors |
239 |
+# Copyright 1999-2021 Gentoo Authors |
240 |
# Distributed under the terms of the GNU General Public License v2 |
241 |
|
242 |
# This file requires eapi 5 or later. New entries go on top. |
243 |
# Please use the same syntax as in use.mask |
244 |
|
245 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
246 |
+# Temporary entry to support the ruby27 stable bug 801289 |
247 |
+ruby_targets_ruby27 |
248 |
+ |
249 |
# Michał Górny <mgorny@g.o> (2021-05-04) |
250 |
# Python 3.10 is not yet stable (and will not be until it's out of beta, |
251 |
# around September. |
252 |
|
253 |
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults |
254 |
index 41d01f6982b..520645d7f49 100644 |
255 |
--- a/profiles/arch/sparc/make.defaults |
256 |
+++ b/profiles/arch/sparc/make.defaults |
257 |
@@ -1,4 +1,4 @@ |
258 |
-# Copyright 1999-2019 Gentoo Authors |
259 |
+# Copyright 1999-2021 Gentoo Authors |
260 |
# Distributed under the terms of the GNU General Public License v2 |
261 |
|
262 |
ARCH="sparc" |
263 |
@@ -46,3 +46,7 @@ VIDEO_CARDS="fbdev glint mga r128 radeon" |
264 |
# Enable USE=libtirpc by default, to ease dependency resolution during |
265 |
# the stabilization of glibc-2.26. Bug 657148 |
266 |
USE="libtirpc" |
267 |
+ |
268 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
269 |
+# Temporary override base default to support the ruby27 stable bug 801289 |
270 |
+RUBY_TARGETS="ruby26" |
271 |
|
272 |
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask |
273 |
index 651f15426c6..338ba8792bc 100644 |
274 |
--- a/profiles/arch/sparc/use.stable.mask |
275 |
+++ b/profiles/arch/sparc/use.stable.mask |
276 |
@@ -4,6 +4,10 @@ |
277 |
# This file requires eapi 5 or later. New entries go on top. |
278 |
# Please use the same syntax as in use.mask |
279 |
|
280 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
281 |
+# Temporary entry to support the ruby27 stable bug 801289 |
282 |
+ruby_targets_ruby27 |
283 |
+ |
284 |
# Michał Górny <mgorny@g.o> (2021-05-04) |
285 |
# Python 3.10 is not yet stable (and will not be until it's out of beta, |
286 |
# around September. |
287 |
@@ -40,7 +44,7 @@ sbcl |
288 |
|
289 |
# Pacho Ramos <pacho@g.o> (2014-04-17) |
290 |
# Dropped stable keywords after the discussion caused by |
291 |
-# Gnome 3.8/3.10 stabilization on this arch |
292 |
+# Gnome 3.8/3.10 stabilization on this arch |
293 |
devhelp |
294 |
dia |
295 |
eds |
296 |
|
297 |
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults |
298 |
index 2c3d14cf5e7..c9c64eb4cdf 100644 |
299 |
--- a/profiles/arch/x86/make.defaults |
300 |
+++ b/profiles/arch/x86/make.defaults |
301 |
@@ -1,4 +1,4 @@ |
302 |
-# Copyright 1999-2019 Gentoo Authors |
303 |
+# Copyright 1999-2021 Gentoo Authors |
304 |
# Distributed under the terms of the GNU General Public License v2 |
305 |
|
306 |
# All extra USE/etc should be specified in sub-profiles. |
307 |
@@ -47,3 +47,7 @@ ABI_X86="32" |
308 |
# Enable USE=libtirpc by default, to ease dependency resolution during |
309 |
# the stabilization of glibc-2.26. Bug 657148 |
310 |
USE="libtirpc" |
311 |
+ |
312 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
313 |
+# Temporary override base default to support the ruby27 stable bug 801289 |
314 |
+RUBY_TARGETS="ruby26" |
315 |
|
316 |
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask |
317 |
index e0bd8000152..a41554bb67e 100644 |
318 |
--- a/profiles/arch/x86/use.stable.mask |
319 |
+++ b/profiles/arch/x86/use.stable.mask |
320 |
@@ -4,6 +4,10 @@ |
321 |
# This file requires eapi 5 or later. New entries go on top. |
322 |
# Please use the same syntax as in use.mask |
323 |
|
324 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
325 |
+# Temporary entry to support the ruby27 stable bug 801289 |
326 |
+ruby_targets_ruby27 |
327 |
+ |
328 |
# Michał Górny <mgorny@g.o> (2021-05-04) |
329 |
# Python 3.10 is not yet stable (and will not be until it's out of beta, |
330 |
# around September. |
331 |
|
332 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
333 |
index db1bba9bb64..4aa838bae26 100644 |
334 |
--- a/profiles/base/make.defaults |
335 |
+++ b/profiles/base/make.defaults |
336 |
@@ -101,8 +101,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te |
337 |
|
338 |
# Manuel Rüger <mrueg@g.o> (2015-09-09) |
339 |
# Default Ruby build target(s) |
340 |
-# Updated to include ruby26 on 2020-09-14 |
341 |
-RUBY_TARGETS="ruby26" |
342 |
+# Updated to include ruby27 on 2021-10-10 |
343 |
+RUBY_TARGETS="ruby26 ruby27" |
344 |
|
345 |
# Enable extended filesystem attribute support by default. |
346 |
# https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0 |
347 |
|
348 |
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask |
349 |
index 218e736762f..07b55fe4e69 100644 |
350 |
--- a/profiles/base/use.stable.mask |
351 |
+++ b/profiles/base/use.stable.mask |
352 |
@@ -13,7 +13,6 @@ darcs |
353 |
python_targets_pypy3 |
354 |
python_single_target_pypy3 |
355 |
|
356 |
-# Hans de Graaff <graaff@g.o> (2020-12-26) |
357 |
+# Hans de Graaff <graaff@g.o> (2021-10-10) |
358 |
# Currently in testing and not ready to go stable yet. |
359 |
-ruby_targets_ruby27 |
360 |
ruby_targets_ruby30 |