Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 6/6] profiles: Introduce a dedicated "feature" profile for no Rust
Date: Sun, 19 Jun 2022 10:06:59
Message-Id: 20220619100404.622009-7-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/6] s390 restructuring + common mixin for arches without Rust by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 profiles/arch/alpha/package.use.mask | 8 ----
4 profiles/arch/alpha/parent | 1 +
5 profiles/arch/arm/armv4/package.mask | 28 -----------
6 profiles/arch/arm/armv4/package.use.mask | 11 -----
7 profiles/arch/arm/armv4/parent | 1 +
8 profiles/arch/arm/armv4/use.mask | 6 ---
9 profiles/arch/arm/armv4t/package.mask | 28 -----------
10 profiles/arch/arm/armv4t/package.use.force | 6 ---
11 profiles/arch/arm/armv4t/package.use.mask | 11 -----
12 profiles/arch/arm/armv4t/parent | 1 +
13 profiles/arch/arm/armv5te/package.mask | 24 ----------
14 profiles/arch/arm/armv5te/package.use.force | 6 ---
15 profiles/arch/arm/armv5te/package.use.mask | 11 -----
16 profiles/arch/arm/armv5te/parent | 1 +
17 profiles/arch/arm/armv5te/use.mask | 4 --
18 profiles/arch/arm/armv6j/package.mask | 15 ------
19 profiles/arch/arm/armv6j/package.use.mask | 17 +------
20 profiles/arch/arm/armv6j/use.mask | 4 --
21 profiles/arch/arm/armv7a/package.mask | 15 +-----
22 profiles/arch/arm/armv7a/package.use.mask | 18 +------
23 profiles/arch/arm/armv7a/use.mask | 6 +--
24 profiles/arch/arm/package.mask | 16 +------
25 profiles/arch/arm/package.use.mask | 18 -------
26 profiles/arch/arm/use.mask | 5 --
27 profiles/arch/hppa/package.use.mask | 4 --
28 profiles/arch/hppa/parent | 1 +
29 profiles/arch/ia64/package.use.mask | 15 ------
30 profiles/arch/ia64/parent | 1 +
31 profiles/arch/ia64/use.mask | 4 --
32 profiles/arch/loong/package.mask | 5 --
33 profiles/arch/loong/package.use.force | 4 --
34 profiles/arch/loong/package.use.mask | 9 ----
35 profiles/arch/loong/parent | 1 +
36 profiles/arch/m68k/parent | 1 +
37 profiles/arch/m68k/use.mask | 4 --
38 profiles/arch/s390/package.use.force | 4 --
39 profiles/arch/s390/package.use.mask | 7 +--
40 profiles/arch/s390/s390/package.mask | 14 ------
41 profiles/arch/s390/s390/parent | 1 +
42 profiles/arch/s390/s390x/package.use.force | 4 ++
43 profiles/arch/s390/s390x/package.use.mask | 5 ++
44 profiles/arch/s390/s390x/use.mask | 4 --
45 profiles/arch/sparc/package.use.mask | 4 --
46 profiles/arch/sparc/parent | 1 +
47 profiles/features/wd40/eapi | 1 +
48 profiles/features/wd40/package.mask | 36 ++++++++++++++
49 .../armv4 => features/wd40}/package.use.force | 0
50 profiles/features/wd40/package.use.mask | 48 +++++++++++++++++++
51 .../arm/armv4t => features/wd40}/use.mask | 2 +
52 49 files changed, 112 insertions(+), 329 deletions(-)
53 delete mode 100644 profiles/arch/arm/armv4/package.use.mask
54 delete mode 100644 profiles/arch/arm/armv4/use.mask
55 delete mode 100644 profiles/arch/arm/armv4t/package.use.force
56 delete mode 100644 profiles/arch/arm/armv4t/package.use.mask
57 delete mode 100644 profiles/arch/arm/armv5te/package.use.force
58 delete mode 100644 profiles/arch/arm/armv5te/package.use.mask
59 delete mode 100644 profiles/arch/arm/armv6j/package.mask
60 create mode 100644 profiles/features/wd40/eapi
61 create mode 100644 profiles/features/wd40/package.mask
62 rename profiles/{arch/arm/armv4 => features/wd40}/package.use.force (100%)
63 create mode 100644 profiles/features/wd40/package.use.mask
64 rename profiles/{arch/arm/armv4t => features/wd40}/use.mask (97%)
65
66 diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
67 index 7b5c6e1c20ad..b871792ccfd8 100644
68 --- a/profiles/arch/alpha/package.use.mask
69 +++ b/profiles/arch/alpha/package.use.mask
70 @@ -140,10 +140,6 @@ x11-misc/synergy gui
71 # media-sound/lash not keyworded, bug #736725
72 media-sound/fluidsynth lash
73
74 -# Cédric Krier <cedk@g.o> (2020-11-10)
75 -# virtual/rust has no alpha keyword
76 -dev-vcs/mercurial rust
77 -
78 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com> (2020-10-14)
79 # app-i18n/fcitx:4 not keyworded.
80 media-libs/libsdl2 fcitx4
81 @@ -160,10 +156,6 @@ mail-filter/pyzor mysql
82 # No drivers on this architecture support Vulkan
83 media-libs/mesa vulkan vulkan-overlay zink
84
85 -# Mart Raudsepp <leio@g.o> (2020-08-02)
86 -# alpha has no virtual/rust support, needed by newer gnome-base/librsvg, et al
87 ->=media-gfx/eog-3.33.1 svg
88 -
89 # Sergei Trofimovich <slyfox@g.o> (2020-07-18)
90 # net-libs/webkit-gtk has no alpha keywords
91 app-editors/emacs xwidgets
92 diff --git a/profiles/arch/alpha/parent b/profiles/arch/alpha/parent
93 index eb001c6e8ab8..e234bf836e61 100644
94 --- a/profiles/arch/alpha/parent
95 +++ b/profiles/arch/alpha/parent
96 @@ -1 +1,2 @@
97 ../base
98 +../../features/wd40
99 diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
100 index ccafb18dbe26..350a12ab9f0f 100644
101 --- a/profiles/arch/arm/armv4/package.mask
102 +++ b/profiles/arch/arm/armv4/package.mask
103 @@ -4,31 +4,3 @@
104 # Anthony Ryan <anthonyryan1@×××××.com> (2017-01-21)
105 # This package states supports for arm >= v6
106 dev-lang/nim
107 -
108 -# Marco Scardovi <marco@××××××××.com> (2021-06-17)
109 -# This package requires newer (Rust-consuming) dev-libs/gjs to be unmasked
110 -sci-geosciences/gnome-maps
111 -
112 -# There is no prebuilt rustc for armv4 by upstream
113 -dev-lang/rust-bin
114 -dev-lang/rust
115 -virtual/rust
116 ->=dev-lang/spidermonkey-78
117 ->=gnome-base/librsvg-2.41
118 ->=gnome-base/gnome-core-libs-3.36.5
119 ->=gnome-base/gnome-core-apps-3.36.5
120 ->=gnome-base/gnome-light-3.36.5
121 ->=dev-libs/gjs-1.66
122 ->=gnome-base/gnome-shell-3.38
123 ->=x11-themes/adwaita-icon-theme-3.36
124 ->=net-irc/polari-3.37
125 ->=sys-apps/bat-0.18.1
126 -gnome-base/gdm
127 -gnome-extra/chrome-gnome-shell
128 -gnome-extra/gnome-tweaks
129 ->=dev-python/cryptography-36
130 ->=dev-python/pyopenssl-22
131 -dev-python/setuptools-rust
132 -dev-python/watchfiles
133 -app-text/mdbook
134 -dev-util/maturin
135 diff --git a/profiles/arch/arm/armv4/package.use.mask b/profiles/arch/arm/armv4/package.use.mask
136 deleted file mode 100644
137 index 4ee82d31442a..000000000000
138 --- a/profiles/arch/arm/armv4/package.use.mask
139 +++ /dev/null
140 @@ -1,11 +0,0 @@
141 -# Copyright 1999-2022 Gentoo Authors
142 -# Distributed under the terms of the GNU General Public License v2
143 -
144 -# Sam James <sam@g.o> (2022-04-22)
145 -# Needs Rustified librsvg
146 ->=media-libs/freetype-2.12.0 svg
147 -media-libs/imlib2 svg
148 -
149 -# Matt Turner <mattst88@g.o> (2021-07-25)
150 -# gdm requires gnome-shell requires rustified librsvg.
151 -x11-misc/xscreensaver gdm
152 diff --git a/profiles/arch/arm/armv4/parent b/profiles/arch/arm/armv4/parent
153 index f3229c5b9876..154b8158dc01 100644
154 --- a/profiles/arch/arm/armv4/parent
155 +++ b/profiles/arch/arm/armv4/parent
156 @@ -1 +1,2 @@
157 ..
158 +../../../features/wd40
159 diff --git a/profiles/arch/arm/armv4/use.mask b/profiles/arch/arm/armv4/use.mask
160 deleted file mode 100644
161 index b1bb8f89da9f..000000000000
162 --- a/profiles/arch/arm/armv4/use.mask
163 +++ /dev/null
164 @@ -1,6 +0,0 @@
165 -# Copyright 1999-2022 Gentoo Authors
166 -# Distributed under the terms of the GNU General Public License v2
167 -
168 -# Matt Turner <mattst88@g.o> (2021-07-25)
169 -# gnome-shell requires rustified librsvg.
170 -gnome-shell
171 diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
172 index ccafb18dbe26..350a12ab9f0f 100644
173 --- a/profiles/arch/arm/armv4t/package.mask
174 +++ b/profiles/arch/arm/armv4t/package.mask
175 @@ -4,31 +4,3 @@
176 # Anthony Ryan <anthonyryan1@×××××.com> (2017-01-21)
177 # This package states supports for arm >= v6
178 dev-lang/nim
179 -
180 -# Marco Scardovi <marco@××××××××.com> (2021-06-17)
181 -# This package requires newer (Rust-consuming) dev-libs/gjs to be unmasked
182 -sci-geosciences/gnome-maps
183 -
184 -# There is no prebuilt rustc for armv4 by upstream
185 -dev-lang/rust-bin
186 -dev-lang/rust
187 -virtual/rust
188 ->=dev-lang/spidermonkey-78
189 ->=gnome-base/librsvg-2.41
190 ->=gnome-base/gnome-core-libs-3.36.5
191 ->=gnome-base/gnome-core-apps-3.36.5
192 ->=gnome-base/gnome-light-3.36.5
193 ->=dev-libs/gjs-1.66
194 ->=gnome-base/gnome-shell-3.38
195 ->=x11-themes/adwaita-icon-theme-3.36
196 ->=net-irc/polari-3.37
197 ->=sys-apps/bat-0.18.1
198 -gnome-base/gdm
199 -gnome-extra/chrome-gnome-shell
200 -gnome-extra/gnome-tweaks
201 ->=dev-python/cryptography-36
202 ->=dev-python/pyopenssl-22
203 -dev-python/setuptools-rust
204 -dev-python/watchfiles
205 -app-text/mdbook
206 -dev-util/maturin
207 diff --git a/profiles/arch/arm/armv4t/package.use.force b/profiles/arch/arm/armv4t/package.use.force
208 deleted file mode 100644
209 index d70ac2644441..000000000000
210 --- a/profiles/arch/arm/armv4t/package.use.force
211 +++ /dev/null
212 @@ -1,6 +0,0 @@
213 -# Copyright 1999-2022 Gentoo Authors
214 -# Distributed under the terms of the GNU General Public License v2
215 -
216 -# Sam James <sam@g.o> (2022-05-15)
217 -# No Rust here (so no Spidermonkey), force Duktape instead
218 -sys-auth/polkit duktape
219 diff --git a/profiles/arch/arm/armv4t/package.use.mask b/profiles/arch/arm/armv4t/package.use.mask
220 deleted file mode 100644
221 index 4ee82d31442a..000000000000
222 --- a/profiles/arch/arm/armv4t/package.use.mask
223 +++ /dev/null
224 @@ -1,11 +0,0 @@
225 -# Copyright 1999-2022 Gentoo Authors
226 -# Distributed under the terms of the GNU General Public License v2
227 -
228 -# Sam James <sam@g.o> (2022-04-22)
229 -# Needs Rustified librsvg
230 ->=media-libs/freetype-2.12.0 svg
231 -media-libs/imlib2 svg
232 -
233 -# Matt Turner <mattst88@g.o> (2021-07-25)
234 -# gdm requires gnome-shell requires rustified librsvg.
235 -x11-misc/xscreensaver gdm
236 diff --git a/profiles/arch/arm/armv4t/parent b/profiles/arch/arm/armv4t/parent
237 index f3229c5b9876..154b8158dc01 100644
238 --- a/profiles/arch/arm/armv4t/parent
239 +++ b/profiles/arch/arm/armv4t/parent
240 @@ -1 +1,2 @@
241 ..
242 +../../../features/wd40
243 diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
244 index 8d33f3b44d6e..e7c3cd3a1074 100644
245 --- a/profiles/arch/arm/armv5te/package.mask
246 +++ b/profiles/arch/arm/armv5te/package.mask
247 @@ -8,27 +8,3 @@ dev-lang/nim
248 # Marco Scardovi <marco@××××××××.com> (2021-06-17)
249 # This package requires dev-libs/gjs to be unmasked
250 sci-geosciences/gnome-maps
251 -
252 -# There is no prebuilt rustc for armv5 by upstream
253 -dev-lang/rust-bin
254 -dev-lang/rust
255 -virtual/rust
256 ->=dev-lang/spidermonkey-78
257 ->=gnome-base/librsvg-2.41
258 ->=gnome-base/gnome-core-libs-3.36.5
259 ->=gnome-base/gnome-core-apps-3.36.5
260 ->=gnome-base/gnome-light-3.36.5
261 ->=dev-libs/gjs-1.66
262 ->=gnome-base/gnome-shell-3.38
263 ->=x11-themes/adwaita-icon-theme-3.36
264 ->=net-irc/polari-3.37
265 ->=sys-apps/bat-0.18.1
266 -gnome-base/gdm
267 -gnome-extra/chrome-gnome-shell
268 -gnome-extra/gnome-tweaks
269 ->=dev-python/cryptography-36
270 ->=dev-python/pyopenssl-22
271 -dev-python/setuptools-rust
272 -dev-python/watchfiles
273 -app-text/mdbook
274 -dev-util/maturin
275 diff --git a/profiles/arch/arm/armv5te/package.use.force b/profiles/arch/arm/armv5te/package.use.force
276 deleted file mode 100644
277 index d70ac2644441..000000000000
278 --- a/profiles/arch/arm/armv5te/package.use.force
279 +++ /dev/null
280 @@ -1,6 +0,0 @@
281 -# Copyright 1999-2022 Gentoo Authors
282 -# Distributed under the terms of the GNU General Public License v2
283 -
284 -# Sam James <sam@g.o> (2022-05-15)
285 -# No Rust here (so no Spidermonkey), force Duktape instead
286 -sys-auth/polkit duktape
287 diff --git a/profiles/arch/arm/armv5te/package.use.mask b/profiles/arch/arm/armv5te/package.use.mask
288 deleted file mode 100644
289 index 4ee82d31442a..000000000000
290 --- a/profiles/arch/arm/armv5te/package.use.mask
291 +++ /dev/null
292 @@ -1,11 +0,0 @@
293 -# Copyright 1999-2022 Gentoo Authors
294 -# Distributed under the terms of the GNU General Public License v2
295 -
296 -# Sam James <sam@g.o> (2022-04-22)
297 -# Needs Rustified librsvg
298 ->=media-libs/freetype-2.12.0 svg
299 -media-libs/imlib2 svg
300 -
301 -# Matt Turner <mattst88@g.o> (2021-07-25)
302 -# gdm requires gnome-shell requires rustified librsvg.
303 -x11-misc/xscreensaver gdm
304 diff --git a/profiles/arch/arm/armv5te/parent b/profiles/arch/arm/armv5te/parent
305 index f3229c5b9876..154b8158dc01 100644
306 --- a/profiles/arch/arm/armv5te/parent
307 +++ b/profiles/arch/arm/armv5te/parent
308 @@ -1 +1,2 @@
309 ..
310 +../../../features/wd40
311 diff --git a/profiles/arch/arm/armv5te/use.mask b/profiles/arch/arm/armv5te/use.mask
312 index 2d07ff8b0aa8..8d9124bed67b 100644
313 --- a/profiles/arch/arm/armv5te/use.mask
314 +++ b/profiles/arch/arm/armv5te/use.mask
315 @@ -8,7 +8,3 @@
316 -cpu_flags_arm_edsp
317 -cpu_flags_arm_thumb
318 -cpu_flags_arm_vfp
319 -
320 -# Matt Turner <mattst88@g.o> (2021-07-25)
321 -# gnome-shell requires rustified librsvg.
322 -gnome-shell
323 diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
324 deleted file mode 100644
325 index 2ed73e22f688..000000000000
326 --- a/profiles/arch/arm/armv6j/package.mask
327 +++ /dev/null
328 @@ -1,15 +0,0 @@
329 -# Copyright 1999-2020 Gentoo Authors
330 -# Distributed under the terms of the GNU General Public License v2
331 -
332 -# Joonas Niilola <juippis@g.o> (2020-09-26)
333 -# Depends on media-video/rav1e that's listed below. #744637
334 --media-libs/libavif
335 -
336 -# Sam James <sam@g.o> (2020-11-04)
337 -# Needs Rust, which is available here
338 --dev-util/cargo-c
339 --dev-util/cbindgen
340 --media-video/rav1e
341 --net-news/newsboat
342 --net-libs/quiche
343 --dev-util/git-delta
344 diff --git a/profiles/arch/arm/armv6j/package.use.mask b/profiles/arch/arm/armv6j/package.use.mask
345 index c1451fed59a6..20a7e47e59bf 100644
346 --- a/profiles/arch/arm/armv6j/package.use.mask
347 +++ b/profiles/arch/arm/armv6j/package.use.mask
348 @@ -1,21 +1,6 @@
349 -# Copyright 1999-2021 Gentoo Authors
350 +# Copyright 1999-2022 Gentoo Authors
351 # Distributed under the terms of the GNU General Public License v2
352
353 -# Jakov Smolić <jsmolic@g.o> (2021-01-23)
354 -# Rust is available here
355 ->=media-libs/libheif-1.10.0 -rav1e
356 -
357 -# Joonas Niilola <juippis@g.o> (2020-10-08)
358 -# Sam James <sam@g.o> (2021-03-11)
359 -# libavif is keyworded for this profile.
360 -dev-libs/efl -avif
361 -kde-frameworks/kimageformats -avif
362 -media-libs/gd -avif
363 -
364 -# Mart Raudsepp <leio@g.o> (2020-08-02)
365 -# virtual/rust is available here
366 ->=media-gfx/eog-3.33.1 -svg
367 -
368 # Sam James <sam@g.o> (2020-07-04)
369 # Rust is available here
370 # Bug #728558
371 diff --git a/profiles/arch/arm/armv6j/use.mask b/profiles/arch/arm/armv6j/use.mask
372 index 95cadb1ac25f..5a841abd6e10 100644
373 --- a/profiles/arch/arm/armv6j/use.mask
374 +++ b/profiles/arch/arm/armv6j/use.mask
375 @@ -6,7 +6,3 @@
376 -cpu_flags_arm_edsp
377 -cpu_flags_arm_thumb
378 -cpu_flags_arm_vfp
379 -
380 -# Sam James <sam@g.o> (2020-11-10)
381 -# Rust is available here
382 --rust
383 diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
384 index 80329451c6a1..5e7abc375abb 100644
385 --- a/profiles/arch/arm/armv7a/package.mask
386 +++ b/profiles/arch/arm/armv7a/package.mask
387 @@ -1,19 +1,6 @@
388 -# Copyright 1999-2021 Gentoo Authors
389 +# Copyright 1999-2022 Gentoo Authors
390 # Distributed under the terms of the GNU General Public License v2
391
392 -# Joonas Niilola <juippis@g.o> (2020-09-26)
393 -# Depends on media-video/rav1e that's listed below. #744637
394 --media-libs/libavif
395 -
396 -# Sam James <sam@g.o> (2020-11-04)
397 -# Needs Rust, which is available here
398 --dev-util/cargo-c
399 --dev-util/cbindgen
400 --media-video/rav1e
401 --net-news/newsboat
402 --net-libs/quiche
403 --dev-util/git-delta
404 -
405 # Sam James <sam@g.o> (2020-06-24)
406 # Valgrind works on ARMv7
407 -dev-util/valgrind
408 diff --git a/profiles/arch/arm/armv7a/package.use.mask b/profiles/arch/arm/armv7a/package.use.mask
409 index aabb4fa77e40..b9878807147a 100644
410 --- a/profiles/arch/arm/armv7a/package.use.mask
411 +++ b/profiles/arch/arm/armv7a/package.use.mask
412 @@ -1,28 +1,12 @@
413 -# Copyright 1999-2021 Gentoo Authors
414 +# Copyright 1999-2022 Gentoo Authors
415 # Distributed under the terms of the GNU General Public License v2
416
417 -# Jakov Smolić <jsmolic@g.o> (2021-01-23)
418 -# Rust is available here
419 ->=media-libs/libheif-1.10.0 -rav1e
420 -
421 -# Joonas Niilola <juippis@g.o> (2020-10-08)
422 -# Sam James <sam@g.o> (2021-03-11)
423 -# Dependency keyworded on this arm profile.
424 -dev-libs/efl -avif
425 -kde-frameworks/kimageformats -avif
426 -media-libs/gd -avif
427 -net-libs/webkit-gtk -avif
428 -
429 # Sam James <sam@g.o> (2020-10-05)
430 # Guile only supports JIT on some arches
431 # (armv7 only for arm)
432 # (See 9.3.8 in the Guile manual)
433 dev-scheme/guile -jit
434
435 -# Mart Raudsepp <leio@g.o> (2020-08-02)
436 -# virtual/rust is available here
437 ->=media-gfx/eog-3.33.1 -svg
438 -
439 # Sam James <sam@g.o> (2020-07-03)
440 # Rust is available here
441 # Bug #728558
442 diff --git a/profiles/arch/arm/armv7a/use.mask b/profiles/arch/arm/armv7a/use.mask
443 index 64cae067a80a..f8d4ad73b7ed 100644
444 --- a/profiles/arch/arm/armv7a/use.mask
445 +++ b/profiles/arch/arm/armv7a/use.mask
446 @@ -1,4 +1,4 @@
447 -# Copyright 2011-2020 Gentoo Authors
448 +# Copyright 2011-2022 Gentoo Authors
449 # Distributed under the terms of the GNU General Public License v2
450
451 # Unmask armv7 specific USE flags
452 @@ -18,10 +18,6 @@
453 -cpu_flags_arm_vfpv4
454 -cpu_flags_arm_vfp-d32
455
456 -# Sam James <sam@g.o> (2020-11-10)
457 -# Rust is available here
458 --rust
459 -
460 # Sam James <sam@g.o> (2020-06-24)
461 # Valgrind works on ARMv7
462 -valgrind
463 diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
464 index cd022be2b22d..40a2ac1ce0dd 100644
465 --- a/profiles/arch/arm/package.mask
466 +++ b/profiles/arch/arm/package.mask
467 @@ -1,20 +1,6 @@
468 -# Copyright 1999-2021 Gentoo Authors
469 +# Copyright 1999-2022 Gentoo Authors
470 # Distributed under the terms of the GNU General Public License v2
471
472 -# Joonas Niilola <juippis@g.o> (2020-09-26)
473 -# Depends on media-video/rav1e that's listed below. #744637
474 -media-libs/libavif
475 -
476 -# Sam James <sam@g.o> (2020-11-04)
477 -# Packages which need Rust (only on >= 6j)
478 -# We unmask them for armv6j, armv7a elsewhere
479 -dev-util/cargo-c
480 -dev-util/cbindgen
481 -media-video/rav1e
482 -net-news/newsboat
483 -net-libs/quiche
484 -dev-util/git-delta
485 -
486 # Sam James <sam@g.o> (2020-06-24)
487 # Valgrind lacks support for < ARMv7
488 # https://valgrind.org/info/platforms.html
489 diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
490 index d8432511d705..b901e3ba86f1 100644
491 --- a/profiles/arch/arm/package.use.mask
492 +++ b/profiles/arch/arm/package.use.mask
493 @@ -74,10 +74,6 @@ dev-lang/php -jit
494 # No SELinux on ARM
495 net-im/prosody selinux
496
497 -# Jakov Smolić <jsmolic@g.o> (2021-01-23)
498 -# Depends on media-video/rav1e which needs Rust
499 ->=media-libs/libheif-1.10.0 rav1e
500 -
501 # Sam James <sam@g.o> (2020-01-17)
502 # gnuefi + systemd-boot works on arm
503 # bug #729720
504 @@ -106,14 +102,6 @@ net-wireless/gnuradio ctrlport
505 # app-i18n/fcitx:4 not keyworded.
506 media-libs/libsdl2 fcitx4
507
508 -# Joonas Niilola <juippis@g.o> (2020-10-02)
509 -# Sam James <sam@g.o> (2021-03-11)
510 -# Dependency only keyworded on specific arm profiles.
511 -dev-libs/efl avif
512 -kde-frameworks/kimageformats avif
513 -media-libs/gd avif
514 -net-libs/webkit-gtk avif
515 -
516 # Adam Feldman <NP-Hardass@g.o> (2020-09-05)
517 # dev-util/dogtail is not keyworded for arm
518 app-text/atril test
519 @@ -126,11 +114,6 @@ games-strategy/0ad nvtt
520 # Cinnamon is not keyworded on this architecture.
521 x11-themes/arc-theme cinnamon
522
523 -# Mart Raudsepp <leio@g.o> (2020-08-02)
524 -# armv5 and older has no virtual/rust support yet, needed by newer
525 -# gnome-base/librsvg, et al
526 ->=media-gfx/eog-3.33.1 svg
527 -
528 # Sam James <sam@g.o> (2020-07-11)
529 # Don't drag in qtwebengine for Plasma right now
530 # Not going for nuclear option of general mask
531 @@ -194,7 +177,6 @@ sys-apps/fwupd dell thunderbolt
532
533 # Thomas Deutschmann <whissi@g.o> (2018-10-12)
534 # Requires www-client/firefox which isn't available on ARM yet
535 -# due to dev-lang/rust requirement
536 dev-ruby/capybara test
537
538 # Christian Ruppert <idl0r@g.o> (2018-08-25)
539 diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
540 index 820017b73bb2..fba199bc664c 100644
541 --- a/profiles/arch/arm/use.mask
542 +++ b/profiles/arch/arm/use.mask
543 @@ -12,11 +12,6 @@
544 -cpu_flags_arm_iwmmxt
545 -cpu_flags_arm_iwmmxt2
546
547 -# Sam James <sam@g.o> (2020-11-10)
548 -# Rust isn't available for generic ARM,
549 -# just armv6, armv7
550 -rust
551 -
552 # Sam James <sam@g.o> (2020-06-24)
553 # Valgrind lacks support for < ARMv7
554 # https://valgrind.org/info/platforms.html
555 diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
556 index 58ec9a129e1e..4ec67b9cd497 100644
557 --- a/profiles/arch/hppa/package.use.mask
558 +++ b/profiles/arch/hppa/package.use.mask
559 @@ -145,10 +145,6 @@ dev-util/cppcheck z3
560 # media-sound/lash not keyworded, bug #736725
561 media-sound/fluidsynth lash
562
563 -# Cédric Krier <cedk@g.o> (2020-11-10)
564 -# virtual/rust has no hppa keyword
565 -dev-vcs/mercurial rust
566 -
567 # Joonas Niilola <juippis@g.o> (2020-10-08)
568 # Dependency not keyworded on this arch.
569 dev-libs/efl avif heif lua_single_target_luajit physics
570 diff --git a/profiles/arch/hppa/parent b/profiles/arch/hppa/parent
571 index eb001c6e8ab8..e234bf836e61 100644
572 --- a/profiles/arch/hppa/parent
573 +++ b/profiles/arch/hppa/parent
574 @@ -1 +1,2 @@
575 ../base
576 +../../features/wd40
577 diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
578 index 8c184263e48c..fa4aa577762d 100644
579 --- a/profiles/arch/ia64/package.use.mask
580 +++ b/profiles/arch/ia64/package.use.mask
581 @@ -39,13 +39,6 @@ media-video/ffmpeg amf
582 # app-text/ronn-ng not keyworded here, bug #801103
583 app-accessibility/espeak-ng man
584
585 -# Michał Górny <mgorny@g.o> (2021-11-26)
586 -# These package flags require dev-python/cryptography which -- due
587 -# to the dependency on Rust -- is no longer portable to ia64.
588 -dev-python/twisted conch crypt
589 -dev-python/urllib3 test
590 -net-fs/samba addc addns ads
591 -
592 # Sam James <sam@g.o> (2021-11-05)
593 # Avoid keywording unnecessary depenencies for now, bug #804115
594 dev-python/scipy pythran
595 @@ -123,10 +116,6 @@ app-crypt/pinentry efl
596 # Dependency not keyworded on this arch.
597 app-text/enchant voikko
598
599 -# Cédric Krier <cedk@g.o> (2020-11-10)
600 -# virtual/rust has no ia64 keyword
601 -dev-vcs/mercurial rust
602 -
603 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com> (2020-10-14)
604 # app-i18n/fcitx:4 not keyworded.
605 media-libs/libsdl2 fcitx4
606 @@ -139,10 +128,6 @@ net-analyzer/wireshark ilbc
607 # No drivers on this architecture support Vulkan
608 media-libs/mesa vulkan vulkan-overlay zink
609
610 -# Mart Raudsepp <leio@g.o> (2020-08-02)
611 -# ia64 has no virtual/rust support, needed by newer gnome-base/librsvg, et al
612 ->=media-gfx/eog-3.33.1 svg
613 -
614 # Michał Górny <mgorny@g.o> (2020-06-14)
615 # Requires dev-python/networkx.
616 app-portage/nattka depgraph-order
617 diff --git a/profiles/arch/ia64/parent b/profiles/arch/ia64/parent
618 index eb001c6e8ab8..e234bf836e61 100644
619 --- a/profiles/arch/ia64/parent
620 +++ b/profiles/arch/ia64/parent
621 @@ -1 +1,2 @@
622 ../base
623 +../../features/wd40
624 diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
625 index 801512a035e5..f961cb6d0d8b 100644
626 --- a/profiles/arch/ia64/use.mask
627 +++ b/profiles/arch/ia64/use.mask
628 @@ -12,10 +12,6 @@ tpm
629 # media-video/pipewire is not keyworded. Bug #807616.
630 pipewire
631
632 -# Matt Turner <mattst88@g.o> (2021-07-25)
633 -# gnome-shell requires rustified librsvg.
634 -gnome-shell
635 -
636 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com> (2021-04-01)
637 # sys-libs/llvm-libunwind not supported on IA64.
638 llvm-libunwind
639 diff --git a/profiles/arch/loong/package.mask b/profiles/arch/loong/package.mask
640 index a14d70f36806..0f67333e0b7b 100644
641 --- a/profiles/arch/loong/package.mask
642 +++ b/profiles/arch/loong/package.mask
643 @@ -4,8 +4,3 @@
644 # WANG Xuerui <xen0n@g.o> (2022-05-13)
645 # Fails to build due to bug 843212
646 >=dev-libs/boost-1.79.0
647 -
648 -# WANG Xuerui <xen0n@g.o> (2022-05-04)
649 -# We have no Rust at the moment
650 ->=dev-python/cryptography-37
651 ->=gnome-base/librsvg-2.41
652 diff --git a/profiles/arch/loong/package.use.force b/profiles/arch/loong/package.use.force
653 index e53df0152ef8..1b1948517b25 100644
654 --- a/profiles/arch/loong/package.use.force
655 +++ b/profiles/arch/loong/package.use.force
656 @@ -11,7 +11,3 @@ sys-libs/libseccomp experimental-loong
657 # WANG Xuerui <xen0n@g.o> (2022-04-18)
658 # gcc-12 is live ebuild for now, hence requiring this
659 dev-vcs/git curl
660 -
661 -# WANG Xuerui <xen0n@g.o> (2022-04-18)
662 -# Newer spidermonkey not available yet (due to absence of rust)
663 -sys-auth/polkit duktape
664 diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
665 index 8e314964b5f4..df5fef0d5fe2 100644
666 --- a/profiles/arch/loong/package.use.mask
667 +++ b/profiles/arch/loong/package.use.mask
668 @@ -6,15 +6,6 @@
669 # investigation.
670 net-libs/libssh mbedtls
671
672 -# WANG Xuerui <xen0n@g.o> (2022-05-13)
673 -# dev-lang/rust is not available on loong yet.
674 -dev-vcs/mercurial rust
675 -media-gfx/eog svg
676 -media-gfx/imv svg
677 -media-libs/freetype svg
678 ->=media-libs/imlib2-1.9.0 svg
679 -media-libs/libavif rav1e
680 -
681 # WANG Xuerui <xen0n@g.o> (2022-05-13)
682 # dev-lang/go is not available on loong yet.
683 media-libs/libheif go test
684 diff --git a/profiles/arch/loong/parent b/profiles/arch/loong/parent
685 index eb001c6e8ab8..e234bf836e61 100644
686 --- a/profiles/arch/loong/parent
687 +++ b/profiles/arch/loong/parent
688 @@ -1 +1,2 @@
689 ../base
690 +../../features/wd40
691 diff --git a/profiles/arch/m68k/parent b/profiles/arch/m68k/parent
692 index eb001c6e8ab8..e234bf836e61 100644
693 --- a/profiles/arch/m68k/parent
694 +++ b/profiles/arch/m68k/parent
695 @@ -1 +1,2 @@
696 ../base
697 +../../features/wd40
698 diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
699 index 544b27bcfa5a..4df4b49e6738 100644
700 --- a/profiles/arch/m68k/use.mask
701 +++ b/profiles/arch/m68k/use.mask
702 @@ -85,10 +85,6 @@ ruby
703 # app-arch/zstd is broken
704 zstd
705
706 -# James Le Cuirot <chewi@g.o> (2021-08-20)
707 -# There is a community effort to bring Rust to m68k but it's not ready yet.
708 -rust
709 -
710 # James Le Cuirot <chewi@g.o> (2021-08-20)
711 # Qt is not keyworded or tested.
712 qt5
713 diff --git a/profiles/arch/s390/package.use.force b/profiles/arch/s390/package.use.force
714 index 7a031392e14a..7b02f8859485 100644
715 --- a/profiles/arch/s390/package.use.force
716 +++ b/profiles/arch/s390/package.use.force
717 @@ -1,10 +1,6 @@
718 # Copyright 1999-2022 Gentoo Authors
719 # Distributed under the terms of the GNU General Public License v2
720
721 -# Sam James <sam@g.o> (2022-04-26)
722 -# Spidermonkey needs Rust and LLVM, not available for s390
723 -sys-auth/polkit duktape
724 -
725 # Andreas K. Hüttel <dilfridge@g.o> (2022-04-20)
726 # s390-tools (in @system) needs this for building some bootloader code
727 sys-devel/binutils multitarget
728 diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
729 index d18377364d6f..e0bf16f31c2d 100644
730 --- a/profiles/arch/s390/package.use.mask
731 +++ b/profiles/arch/s390/package.use.mask
732 @@ -10,9 +10,8 @@ dev-ruby/stringex test
733 # Sam James <sam@g.o> (2022-04-26)
734 # eps: app-text/libspectre not keyworded here
735 # heif: media-libs/libheif not keyworded here
736 -# svg: rustified librsvg not keyworded here
737 # jpegxl: libjxl not keyworded here
738 -media-libs/imlib2 eps heif svg jpegxl
739 +media-libs/imlib2 eps heif jpegxl
740
741 # Sam James <sam@g.o> (2022-04-26)
742 # Avoid unkeyworded dependencies
743 @@ -67,10 +66,6 @@ net-libs/gnutls test-full
744 # net-fs/samba unkeyworded here
745 net-fs/cifs-utils acl
746
747 -# Sam James <sam@g.o> (2022-04-24)
748 -# No Rust here, so no librsvg
749 -media-libs/freetype svg
750 -
751 # Sam James <sam@g.o> (2022-04-20)
752 # x11-themes/sound-theme-freedesktop unkeyworded here
753 media-libs/libcanberra sound
754 diff --git a/profiles/arch/s390/s390/package.mask b/profiles/arch/s390/s390/package.mask
755 index 0f483435d0a0..a3155b7509b2 100644
756 --- a/profiles/arch/s390/s390/package.mask
757 +++ b/profiles/arch/s390/s390/package.mask
758 @@ -1,20 +1,6 @@
759 # Copyright 1999-2022 Gentoo Authors
760 # Distributed under the terms of the GNU General Public License v2
761
762 -# Sam James <sam@g.o> (2022-04-25)
763 -# Rust is available for s390x, but not s390.
764 -# bug #769446
765 -app-eselect/eselect-rust
766 -app-text/mdbook
767 -dev-lang/rust
768 -dev-lang/rust-bin
769 ->=dev-python/cryptography-36
770 ->=dev-python/pyopenssl-22
771 -dev-python/setuptools-rust
772 -dev-python/watchfiles
773 -dev-util/maturin
774 -virtual/rust
775 -
776 # Arthur Zamarin <arthurzam@g.o> (2022-03-20)
777 # sys-libs/libunwind doesn't work on s390
778 sys-libs/libunwind
779 diff --git a/profiles/arch/s390/s390/parent b/profiles/arch/s390/s390/parent
780 index f3229c5b9876..154b8158dc01 100644
781 --- a/profiles/arch/s390/s390/parent
782 +++ b/profiles/arch/s390/s390/parent
783 @@ -1 +1,2 @@
784 ..
785 +../../../features/wd40
786 diff --git a/profiles/arch/s390/s390x/package.use.force b/profiles/arch/s390/s390x/package.use.force
787 index 54d9b2d19c6f..a91fe713a600 100644
788 --- a/profiles/arch/s390/s390x/package.use.force
789 +++ b/profiles/arch/s390/s390x/package.use.force
790 @@ -1,6 +1,10 @@
791 # Copyright 1999-2022 Gentoo Authors
792 # Distributed under the terms of the GNU General Public License v2
793
794 +# Michał Górny <mgorny@g.o> (2022-06-18)
795 +# dev-lang/spidermonkey not keyworded yet.
796 +sys-auth/polkit duktape
797 +
798 # Michał Górny <mgorny@g.o> (2016-11-11)
799 # Force the host target to avoid dependency hell
800 dev-ml/llvm-ocaml llvm_targets_SystemZ
801 diff --git a/profiles/arch/s390/s390x/package.use.mask b/profiles/arch/s390/s390x/package.use.mask
802 index 9af431104cb5..b12271ba6785 100644
803 --- a/profiles/arch/s390/s390x/package.use.mask
804 +++ b/profiles/arch/s390/s390x/package.use.mask
805 @@ -1,6 +1,11 @@
806 # Copyright 1999-2022 Gentoo Authors
807 # Distributed under the terms of the GNU General Public License v2
808
809 +# Michał Górny <mgorny@g.o> (2022-06-18)
810 +# media-libs/librsvg not keyworded yet.
811 +media-libs/freetype svg
812 +media-libs/imlib2 svg
813 +
814 # Sam James <sam@g.o> (2021-02-05)
815 # libpcre2 has JIT support for s390x (not s390)
816 # but it doesn't seem to build right now?
817 diff --git a/profiles/arch/s390/s390x/use.mask b/profiles/arch/s390/s390x/use.mask
818 index 57f5e213dcf5..b7a7f1dac69b 100644
819 --- a/profiles/arch/s390/s390x/use.mask
820 +++ b/profiles/arch/s390/s390x/use.mask
821 @@ -3,7 +3,3 @@
822
823 # Unmask ABI flags for this arch.
824 -abi_s390_64
825 -
826 -# Sam James <sam@g.o> (2022-05-02)
827 -# Rust is available for s390x (but not s390)
828 --rust
829 diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
830 index a155bfca4536..617144e3e5aa 100644
831 --- a/profiles/arch/sparc/package.use.mask
832 +++ b/profiles/arch/sparc/package.use.mask
833 @@ -135,10 +135,6 @@ media-libs/libsdl2 fcitx4
834 # No drivers on this architecture support Vulkan
835 media-libs/mesa vulkan vulkan-overlay zink
836
837 -# Mart Raudsepp <leio@g.o> (2020-08-02)
838 -# sparc has no virtual/rust support, needed by newer gnome-base/librsvg, et al
839 ->=media-gfx/eog-3.33.1 svg
840 -
841 # Robin H. Johnson <robbat2@g.o> (2020-07-02)
842 # Mask io-uring & zbc pending keywording
843 sys-block/fio -io-uring -zbc
844 diff --git a/profiles/arch/sparc/parent b/profiles/arch/sparc/parent
845 index eb001c6e8ab8..e234bf836e61 100644
846 --- a/profiles/arch/sparc/parent
847 +++ b/profiles/arch/sparc/parent
848 @@ -1 +1,2 @@
849 ../base
850 +../../features/wd40
851 diff --git a/profiles/features/wd40/eapi b/profiles/features/wd40/eapi
852 new file mode 100644
853 index 000000000000..7ed6ff82de6b
854 --- /dev/null
855 +++ b/profiles/features/wd40/eapi
856 @@ -0,0 +1 @@
857 +5
858 diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
859 new file mode 100644
860 index 000000000000..35e1e701f465
861 --- /dev/null
862 +++ b/profiles/features/wd40/package.mask
863 @@ -0,0 +1,36 @@
864 +# Copyright 1999-2022 Gentoo Authors
865 +# Distributed under the terms of the GNU General Public License v2
866 +
867 +# Various packages requiring Rust.
868 +app-eselect/eselect-rust
869 +app-text/mdbook
870 +dev-lang/rust
871 +dev-lang/rust-bin
872 +>=dev-lang/spidermonkey-78
873 +>=dev-libs/gjs-1.66
874 +>=dev-python/cryptography-36
875 +>=dev-python/pyopenssl-22
876 +dev-python/setuptools-rust
877 +dev-python/watchfiles
878 +dev-util/cargo-c
879 +dev-util/cbindgen
880 +dev-util/git-delta
881 +dev-util/maturin
882 +gnome-base/gdm
883 +>=gnome-base/gnome-core-apps-3.36.5
884 +>=gnome-base/gnome-core-libs-3.36.5
885 +>=gnome-base/gnome-light-3.36.5
886 +>=gnome-base/gnome-shell-3.38
887 +>=gnome-base/librsvg-2.41
888 +gnome-extra/chrome-gnome-shell
889 +gnome-extra/gnome-tweaks
890 +media-libs/libavif
891 +media-video/rav1e
892 +>=net-irc/polari-3.37
893 +net-libs/quiche
894 +net-news/newsboat
895 +net-p2p/deluge
896 +sci-geosciences/gnome-maps
897 +>=sys-apps/bat-0.18.1
898 +virtual/rust
899 +>=x11-themes/adwaita-icon-theme-3.36
900 diff --git a/profiles/arch/arm/armv4/package.use.force b/profiles/features/wd40/package.use.force
901 similarity index 100%
902 rename from profiles/arch/arm/armv4/package.use.force
903 rename to profiles/features/wd40/package.use.force
904 diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
905 new file mode 100644
906 index 000000000000..a2d57b80710f
907 --- /dev/null
908 +++ b/profiles/features/wd40/package.use.mask
909 @@ -0,0 +1,48 @@
910 +# Copyright 1999-2022 Gentoo Authors
911 +# Distributed under the terms of the GNU General Public License v2
912 +
913 +# WANG Xuerui <xen0n@g.o> (2022-05-13)
914 +# dev-lang/rust is not available on ${arch} yet.
915 +media-gfx/imv svg
916 +media-libs/libavif rav1e
917 +
918 +# Sam James <sam@g.o> (2022-04-22)
919 +# Needs Rustified librsvg
920 +>=media-libs/freetype-2.12.0 svg
921 +media-libs/imlib2 svg
922 +
923 +# Michał Górny <mgorny@g.o> (2021-11-26)
924 +# These package flags require dev-python/cryptography which -- due
925 +# to the dependency on Rust -- is no longer portable to ${arch}.
926 +dev-python/twisted conch crypt
927 +dev-python/urllib3 test
928 +net-fs/samba addc addns ads
929 +
930 +# Matt Turner <mattst88@g.o> (2021-07-25)
931 +# gdm requires gnome-shell requires rustified librsvg.
932 +x11-misc/xscreensaver gdm
933 +
934 +# Jakov Smolić <jsmolic@g.o> (2021-01-23)
935 +# Depends on media-video/rav1e which needs Rust
936 +>=media-libs/libheif-1.10.0 rav1e
937 +
938 +# Cédric Krier <cedk@g.o> (2020-11-10)
939 +# virtual/rust has no ${arch} keyword
940 +dev-vcs/mercurial rust
941 +
942 +# Joonas Niilola <juippis@g.o> (2020-10-02)
943 +# Sam James <sam@g.o> (2021-03-11)
944 +# Dependency only keyworded on specific ${arch} profiles.
945 +dev-libs/efl avif
946 +kde-frameworks/kimageformats avif
947 +media-libs/gd avif
948 +net-libs/webkit-gtk avif
949 +
950 +# Mart Raudsepp <leio@g.o> (2020-08-02)
951 +# ${arch} has no virtual/rust support, needed by newer gnome-base/librsvg, et al
952 +>=media-gfx/eog-3.33.1 svg
953 +
954 +# Thomas Deutschmann <whissi@g.o> (2018-10-12)
955 +# Requires www-client/firefox which isn't available on ${arch} yet
956 +# due to dev-lang/rust requirement
957 +dev-ruby/capybara test
958 diff --git a/profiles/arch/arm/armv4t/use.mask b/profiles/features/wd40/use.mask
959 similarity index 97%
960 rename from profiles/arch/arm/armv4t/use.mask
961 rename to profiles/features/wd40/use.mask
962 index b1bb8f89da9f..41e587d5c549 100644
963 --- a/profiles/arch/arm/armv4t/use.mask
964 +++ b/profiles/features/wd40/use.mask
965 @@ -1,6 +1,8 @@
966 # Copyright 1999-2022 Gentoo Authors
967 # Distributed under the terms of the GNU General Public License v2
968
969 +rust
970 +
971 # Matt Turner <mattst88@g.o> (2021-07-25)
972 # gnome-shell requires rustified librsvg.
973 gnome-shell
974 --
975 2.35.1