profiles: Introduce a dedicated "feature" profile for no Rust

Introduce a common profile that combines the masks necessary for arch
profiles and subprofiles that are not supported by Rust.  Note that
this goes beyond existing masks in the individual profiles since these
masks did not include packages that aren't keyworded on the arch
in question.

Some Rust-influenced masks remain in specific profiles where Rust is
actually keyworded nowadays but the dependencies in question haven't
been rekeyworded.

Closes: https://github.com/gentoo/gentoo/pull/25951
Signed-off-by: Michał Górny <mgorny@gentoo.org>

50 files changed, 115 insertions, 329 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index ef05d1577100..4941898b0305 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -145,10 +145,6 @@ x11-misc/synergy gui
 # media-sound/lash not keyworded, bug #736725
 media-sound/fluidsynth lash
 
-# Cédric Krier <cedk@gentoo.org> (2020-11-10)
-# virtual/rust has no alpha keyword
-dev-vcs/mercurial rust
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
 # app-i18n/fcitx:4 not keyworded.
 media-libs/libsdl2 fcitx4
@@ -165,10 +161,6 @@ mail-filter/pyzor mysql
 # No drivers on this architecture support Vulkan
 media-libs/mesa vulkan vulkan-overlay zink
 
-# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
-# alpha has no virtual/rust support, needed by newer gnome-base/librsvg, et al
->=media-gfx/eog-3.33.1 svg
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-07-18)
 # net-libs/webkit-gtk has no alpha keywords
 app-editors/emacs xwidgets
diff --git a/profiles/arch/alpha/parent b/profiles/arch/alpha/parent
index eb001c6e8ab8..e234bf836e61 100644
--- a/profiles/arch/alpha/parent
+++ b/profiles/arch/alpha/parent
@@ -1 +1,2 @@
 ../base
+../../features/wd40
diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
index ccafb18dbe26..350a12ab9f0f 100644
--- a/profiles/arch/arm/armv4/package.mask
+++ b/profiles/arch/arm/armv4/package.mask
@@ -4,31 +4,3 @@
 # Anthony Ryan <anthonyryan1@gmail.com> (2017-01-21)
 # This package states supports for arm >= v6
 dev-lang/nim
-
-# Marco Scardovi <marco@scardovi.com> (2021-06-17)
-# This package requires newer (Rust-consuming) dev-libs/gjs to be unmasked
-sci-geosciences/gnome-maps
-
-# There is no prebuilt rustc for armv4 by upstream
-dev-lang/rust-bin
-dev-lang/rust
-virtual/rust
->=dev-lang/spidermonkey-78
->=gnome-base/librsvg-2.41
->=gnome-base/gnome-core-libs-3.36.5
->=gnome-base/gnome-core-apps-3.36.5
->=gnome-base/gnome-light-3.36.5
->=dev-libs/gjs-1.66
->=gnome-base/gnome-shell-3.38
->=x11-themes/adwaita-icon-theme-3.36
->=net-irc/polari-3.37
->=sys-apps/bat-0.18.1
-gnome-base/gdm
-gnome-extra/chrome-gnome-shell
-gnome-extra/gnome-tweaks
->=dev-python/cryptography-36
->=dev-python/pyopenssl-22
-dev-python/setuptools-rust
-dev-python/watchfiles
-app-text/mdbook
-dev-util/maturin
diff --git a/profiles/arch/arm/armv4/package.use.mask b/profiles/arch/arm/armv4/package.use.mask
deleted file mode 100644
index 4ee82d31442a..000000000000
--- a/profiles/arch/arm/armv4/package.use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Sam James <sam@gentoo.org> (2022-04-22)
-# Needs Rustified librsvg
->=media-libs/freetype-2.12.0 svg
-media-libs/imlib2 svg
-
-# Matt Turner <mattst88@gentoo.org> (2021-07-25)
-# gdm requires gnome-shell requires rustified librsvg.
-x11-misc/xscreensaver gdm
diff --git a/profiles/arch/arm/armv4/parent b/profiles/arch/arm/armv4/parent
index f3229c5b9876..154b8158dc01 100644
--- a/profiles/arch/arm/armv4/parent
+++ b/profiles/arch/arm/armv4/parent
@@ -1 +1,2 @@
 ..
+../../../features/wd40
diff --git a/profiles/arch/arm/armv4/use.mask b/profiles/arch/arm/armv4/use.mask
deleted file mode 100644
index b1bb8f89da9f..000000000000
--- a/profiles/arch/arm/armv4/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Matt Turner <mattst88@gentoo.org> (2021-07-25)
-# gnome-shell requires rustified librsvg.
-gnome-shell
diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
index ccafb18dbe26..350a12ab9f0f 100644
--- a/profiles/arch/arm/armv4t/package.mask
+++ b/profiles/arch/arm/armv4t/package.mask
@@ -4,31 +4,3 @@
 # Anthony Ryan <anthonyryan1@gmail.com> (2017-01-21)
 # This package states supports for arm >= v6
 dev-lang/nim
-
-# Marco Scardovi <marco@scardovi.com> (2021-06-17)
-# This package requires newer (Rust-consuming) dev-libs/gjs to be unmasked
-sci-geosciences/gnome-maps
-
-# There is no prebuilt rustc for armv4 by upstream
-dev-lang/rust-bin
-dev-lang/rust
-virtual/rust
->=dev-lang/spidermonkey-78
->=gnome-base/librsvg-2.41
->=gnome-base/gnome-core-libs-3.36.5
->=gnome-base/gnome-core-apps-3.36.5
->=gnome-base/gnome-light-3.36.5
->=dev-libs/gjs-1.66
->=gnome-base/gnome-shell-3.38
->=x11-themes/adwaita-icon-theme-3.36
->=net-irc/polari-3.37
->=sys-apps/bat-0.18.1
-gnome-base/gdm
-gnome-extra/chrome-gnome-shell
-gnome-extra/gnome-tweaks
->=dev-python/cryptography-36
->=dev-python/pyopenssl-22
-dev-python/setuptools-rust
-dev-python/watchfiles
-app-text/mdbook
-dev-util/maturin
diff --git a/profiles/arch/arm/armv4t/package.use.force b/profiles/arch/arm/armv4t/package.use.force
deleted file mode 100644
index d70ac2644441..000000000000
--- a/profiles/arch/arm/armv4t/package.use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Sam James <sam@gentoo.org> (2022-05-15)
-# No Rust here (so no Spidermonkey), force Duktape instead
-sys-auth/polkit duktape
diff --git a/profiles/arch/arm/armv4t/package.use.mask b/profiles/arch/arm/armv4t/package.use.mask
deleted file mode 100644
index 4ee82d31442a..000000000000
--- a/profiles/arch/arm/armv4t/package.use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Sam James <sam@gentoo.org> (2022-04-22)
-# Needs Rustified librsvg
->=media-libs/freetype-2.12.0 svg
-media-libs/imlib2 svg
-
-# Matt Turner <mattst88@gentoo.org> (2021-07-25)
-# gdm requires gnome-shell requires rustified librsvg.
-x11-misc/xscreensaver gdm
diff --git a/profiles/arch/arm/armv4t/parent b/profiles/arch/arm/armv4t/parent
index f3229c5b9876..154b8158dc01 100644
--- a/profiles/arch/arm/armv4t/parent
+++ b/profiles/arch/arm/armv4t/parent
@@ -1 +1,2 @@
 ..
+../../../features/wd40
diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
index 8d33f3b44d6e..e7c3cd3a1074 100644
--- a/profiles/arch/arm/armv5te/package.mask
+++ b/profiles/arch/arm/armv5te/package.mask
@@ -8,27 +8,3 @@ dev-lang/nim
 # Marco Scardovi <marco@scardovi.com> (2021-06-17)
 # This package requires dev-libs/gjs to be unmasked
 sci-geosciences/gnome-maps
-
-# There is no prebuilt rustc for armv5 by upstream
-dev-lang/rust-bin
-dev-lang/rust
-virtual/rust
->=dev-lang/spidermonkey-78
->=gnome-base/librsvg-2.41
->=gnome-base/gnome-core-libs-3.36.5
->=gnome-base/gnome-core-apps-3.36.5
->=gnome-base/gnome-light-3.36.5
->=dev-libs/gjs-1.66
->=gnome-base/gnome-shell-3.38
->=x11-themes/adwaita-icon-theme-3.36
->=net-irc/polari-3.37
->=sys-apps/bat-0.18.1
-gnome-base/gdm
-gnome-extra/chrome-gnome-shell
-gnome-extra/gnome-tweaks
->=dev-python/cryptography-36
->=dev-python/pyopenssl-22
-dev-python/setuptools-rust
-dev-python/watchfiles
-app-text/mdbook
-dev-util/maturin
diff --git a/profiles/arch/arm/armv5te/package.use.force b/profiles/arch/arm/armv5te/package.use.force
deleted file mode 100644
index d70ac2644441..000000000000
--- a/profiles/arch/arm/armv5te/package.use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Sam James <sam@gentoo.org> (2022-05-15)
-# No Rust here (so no Spidermonkey), force Duktape instead
-sys-auth/polkit duktape
diff --git a/profiles/arch/arm/armv5te/package.use.mask b/profiles/arch/arm/armv5te/package.use.mask
deleted file mode 100644
index 4ee82d31442a..000000000000
--- a/profiles/arch/arm/armv5te/package.use.mask
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Sam James <sam@gentoo.org> (2022-04-22)
-# Needs Rustified librsvg
->=media-libs/freetype-2.12.0 svg
-media-libs/imlib2 svg
-
-# Matt Turner <mattst88@gentoo.org> (2021-07-25)
-# gdm requires gnome-shell requires rustified librsvg.
-x11-misc/xscreensaver gdm
diff --git a/profiles/arch/arm/armv5te/parent b/profiles/arch/arm/armv5te/parent
index f3229c5b9876..154b8158dc01 100644
--- a/profiles/arch/arm/armv5te/parent
+++ b/profiles/arch/arm/armv5te/parent
@@ -1 +1,2 @@
 ..
+../../../features/wd40
diff --git a/profiles/arch/arm/armv5te/use.mask b/profiles/arch/arm/armv5te/use.mask
index 2d07ff8b0aa8..8d9124bed67b 100644
--- a/profiles/arch/arm/armv5te/use.mask
+++ b/profiles/arch/arm/armv5te/use.mask
@@ -8,7 +8,3 @@
 -cpu_flags_arm_edsp
 -cpu_flags_arm_thumb
 -cpu_flags_arm_vfp
-
-# Matt Turner <mattst88@gentoo.org> (2021-07-25)
-# gnome-shell requires rustified librsvg.
-gnome-shell
diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
deleted file mode 100644
index 2ed73e22f688..000000000000
--- a/profiles/arch/arm/armv6j/package.mask
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Joonas Niilola <juippis@gentoo.org> (2020-09-26)
-# Depends on media-video/rav1e that's listed below. #744637
--media-libs/libavif
-
-# Sam James <sam@gentoo.org> (2020-11-04)
-# Needs Rust, which is available here
--dev-util/cargo-c
--dev-util/cbindgen
--media-video/rav1e
--net-news/newsboat
--net-libs/quiche
--dev-util/git-delta
diff --git a/profiles/arch/arm/armv6j/package.use.mask b/profiles/arch/arm/armv6j/package.use.mask
index c1451fed59a6..20a7e47e59bf 100644
--- a/profiles/arch/arm/armv6j/package.use.mask
+++ b/profiles/arch/arm/armv6j/package.use.mask
@@ -1,21 +1,6 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Jakov Smolić <jsmolic@gentoo.org> (2021-01-23)
-# Rust is available here
->=media-libs/libheif-1.10.0 -rav1e
-
-# Joonas Niilola <juippis@gentoo.org> (2020-10-08)
-# Sam James <sam@gentoo.org> (2021-03-11)
-# libavif is keyworded for this profile.
-dev-libs/efl -avif
-kde-frameworks/kimageformats -avif
-media-libs/gd -avif
-
-# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
-# virtual/rust is available here
->=media-gfx/eog-3.33.1 -svg
-
 # Sam James <sam@gentoo.org> (2020-07-04)
 # Rust is available here
 # Bug #728558
diff --git a/profiles/arch/arm/armv6j/use.mask b/profiles/arch/arm/armv6j/use.mask
index 95cadb1ac25f..5a841abd6e10 100644
--- a/profiles/arch/arm/armv6j/use.mask
+++ b/profiles/arch/arm/armv6j/use.mask
@@ -6,7 +6,3 @@
 -cpu_flags_arm_edsp
 -cpu_flags_arm_thumb
 -cpu_flags_arm_vfp
-
-# Sam James <sam@gentoo.org> (2020-11-10)
-# Rust is available here
--rust
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index 80329451c6a1..5e7abc375abb 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,19 +1,6 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Joonas Niilola <juippis@gentoo.org> (2020-09-26)
-# Depends on media-video/rav1e that's listed below. #744637
--media-libs/libavif
-
-# Sam James <sam@gentoo.org> (2020-11-04)
-# Needs Rust, which is available here
--dev-util/cargo-c
--dev-util/cbindgen
--media-video/rav1e
--net-news/newsboat
--net-libs/quiche
--dev-util/git-delta
-
 # Sam James <sam@gentoo.org> (2020-06-24)
 # Valgrind works on ARMv7
 -dev-util/valgrind
diff --git a/profiles/arch/arm/armv7a/package.use.mask b/profiles/arch/arm/armv7a/package.use.mask
index aabb4fa77e40..b9878807147a 100644
--- a/profiles/arch/arm/armv7a/package.use.mask
+++ b/profiles/arch/arm/armv7a/package.use.mask
@@ -1,28 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Jakov Smolić <jsmolic@gentoo.org> (2021-01-23)
-# Rust is available here
->=media-libs/libheif-1.10.0 -rav1e
-
-# Joonas Niilola <juippis@gentoo.org> (2020-10-08)
-# Sam James <sam@gentoo.org> (2021-03-11)
-# Dependency keyworded on this arm profile.
-dev-libs/efl -avif
-kde-frameworks/kimageformats -avif
-media-libs/gd -avif
-net-libs/webkit-gtk -avif
-
 # Sam James <sam@gentoo.org> (2020-10-05)
 # Guile only supports JIT on some arches
 # (armv7 only for arm)
 # (See 9.3.8 in the Guile manual)
 dev-scheme/guile -jit
 
-# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
-# virtual/rust is available here
->=media-gfx/eog-3.33.1 -svg
-
 # Sam James <sam@gentoo.org> (2020-07-03)
 # Rust is available here
 # Bug #728558
diff --git a/profiles/arch/arm/armv7a/use.mask b/profiles/arch/arm/armv7a/use.mask
index 64cae067a80a..f8d4ad73b7ed 100644
--- a/profiles/arch/arm/armv7a/use.mask
+++ b/profiles/arch/arm/armv7a/use.mask
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask armv7 specific USE flags
@@ -18,10 +18,6 @@
 -cpu_flags_arm_vfpv4
 -cpu_flags_arm_vfp-d32
 
-# Sam James <sam@gentoo.org> (2020-11-10)
-# Rust is available here
--rust
-
 # Sam James <sam@gentoo.org> (2020-06-24)
 # Valgrind works on ARMv7
 -valgrind
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index cd022be2b22d..40a2ac1ce0dd 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -1,20 +1,6 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Joonas Niilola <juippis@gentoo.org> (2020-09-26)
-# Depends on media-video/rav1e that's listed below. #744637
-media-libs/libavif
-
-# Sam James <sam@gentoo.org> (2020-11-04)
-# Packages which need Rust (only on >= 6j)
-# We unmask them for armv6j, armv7a elsewhere
-dev-util/cargo-c
-dev-util/cbindgen
-media-video/rav1e
-net-news/newsboat
-net-libs/quiche
-dev-util/git-delta
-
 # Sam James <sam@gentoo.org> (2020-06-24)
 # Valgrind lacks support for < ARMv7
 # https://valgrind.org/info/platforms.html
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index d8432511d705..b901e3ba86f1 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -74,10 +74,6 @@ dev-lang/php -jit
 # No SELinux on ARM
 net-im/prosody selinux
 
-# Jakov Smolić <jsmolic@gentoo.org> (2021-01-23)
-# Depends on media-video/rav1e which needs Rust
->=media-libs/libheif-1.10.0 rav1e
-
 # Sam James <sam@gentoo.org> (2020-01-17)
 # gnuefi + systemd-boot works on arm
 # bug #729720
@@ -106,14 +102,6 @@ net-wireless/gnuradio ctrlport
 # app-i18n/fcitx:4 not keyworded.
 media-libs/libsdl2 fcitx4
 
-# Joonas Niilola <juippis@gentoo.org> (2020-10-02)
-# Sam James <sam@gentoo.org> (2021-03-11)
-# Dependency only keyworded on specific arm profiles.
-dev-libs/efl avif
-kde-frameworks/kimageformats avif
-media-libs/gd avif
-net-libs/webkit-gtk avif
-
 # Adam Feldman <NP-Hardass@gentoo.org> (2020-09-05)
 # dev-util/dogtail is not keyworded for arm
 app-text/atril test
@@ -126,11 +114,6 @@ games-strategy/0ad nvtt
 # Cinnamon is not keyworded on this architecture.
 x11-themes/arc-theme cinnamon
 
-# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
-# armv5 and older has no virtual/rust support yet, needed by newer
-# gnome-base/librsvg, et al
->=media-gfx/eog-3.33.1 svg
-
 # Sam James <sam@gentoo.org> (2020-07-11)
 # Don't drag in qtwebengine for Plasma right now
 # Not going for nuclear option of general mask
@@ -194,7 +177,6 @@ sys-apps/fwupd dell thunderbolt
 
 # Thomas Deutschmann <whissi@gentoo.org> (2018-10-12)
 # Requires www-client/firefox which isn't available on ARM yet
-# due to dev-lang/rust requirement
 dev-ruby/capybara test
 
 # Christian Ruppert <idl0r@gentoo.org> (2018-08-25)
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 820017b73bb2..fba199bc664c 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -12,11 +12,6 @@
 -cpu_flags_arm_iwmmxt
 -cpu_flags_arm_iwmmxt2
 
-# Sam James <sam@gentoo.org> (2020-11-10)
-# Rust isn't available for generic ARM,
-# just armv6, armv7
-rust
-
 # Sam James <sam@gentoo.org> (2020-06-24)
 # Valgrind lacks support for < ARMv7
 # https://valgrind.org/info/platforms.html
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 57943bc00925..804f970f43a9 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -150,10 +150,6 @@ dev-util/cppcheck z3
 # media-sound/lash not keyworded, bug #736725
 media-sound/fluidsynth lash
 
-# Cédric Krier <cedk@gentoo.org> (2020-11-10)
-# virtual/rust has no hppa keyword
-dev-vcs/mercurial rust
-
 # Joonas Niilola <juippis@gentoo.org> (2020-10-08)
 # Dependency not keyworded on this arch.
 dev-libs/efl avif heif lua_single_target_luajit physics
diff --git a/profiles/arch/hppa/parent b/profiles/arch/hppa/parent
index eb001c6e8ab8..e234bf836e61 100644
--- a/profiles/arch/hppa/parent
+++ b/profiles/arch/hppa/parent
@@ -1 +1,2 @@
 ../base
+../../features/wd40
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index ed0d6fae762b..901347bbe5a3 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -44,13 +44,6 @@ media-video/ffmpeg amf
 # app-text/ronn-ng not keyworded here, bug #801103
 app-accessibility/espeak-ng man
 
-# Michał Górny <mgorny@gentoo.org> (2021-11-26)
-# These package flags require dev-python/cryptography which -- due
-# to the dependency on Rust -- is no longer portable to ia64.
-dev-python/twisted conch crypt
-dev-python/urllib3 test
-net-fs/samba addc addns ads
-
 # Sam James <sam@gentoo.org> (2021-11-05)
 # Avoid keywording unnecessary depenencies for now, bug #804115
 dev-python/scipy pythran
@@ -128,10 +121,6 @@ app-crypt/pinentry efl
 # Dependency not keyworded on this arch.
 app-text/enchant voikko
 
-# Cédric Krier <cedk@gentoo.org> (2020-11-10)
-# virtual/rust has no ia64 keyword
-dev-vcs/mercurial rust
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
 # app-i18n/fcitx:4 not keyworded.
 media-libs/libsdl2 fcitx4
@@ -144,10 +133,6 @@ net-analyzer/wireshark ilbc
 # No drivers on this architecture support Vulkan
 media-libs/mesa vulkan vulkan-overlay zink
 
-# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
-# ia64 has no virtual/rust support, needed by newer gnome-base/librsvg, et al
->=media-gfx/eog-3.33.1 svg
-
 # Michał Górny <mgorny@gentoo.org> (2020-06-14)
 # Requires dev-python/networkx.
 app-portage/nattka depgraph-order
diff --git a/profiles/arch/ia64/parent b/profiles/arch/ia64/parent
index eb001c6e8ab8..e234bf836e61 100644
--- a/profiles/arch/ia64/parent
+++ b/profiles/arch/ia64/parent
@@ -1 +1,2 @@
 ../base
+../../features/wd40
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 483ad5b171a7..187c06dae958 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -16,10 +16,6 @@ tpm
 # media-video/pipewire is not keyworded. Bug #807616.
 pipewire
 
-# Matt Turner <mattst88@gentoo.org> (2021-07-25)
-# gnome-shell requires rustified librsvg.
-gnome-shell
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
 # sys-libs/llvm-libunwind not supported on IA64.
 llvm-libunwind
diff --git a/profiles/arch/loong/package.mask b/profiles/arch/loong/package.mask
index a14d70f36806..0f67333e0b7b 100644
--- a/profiles/arch/loong/package.mask
+++ b/profiles/arch/loong/package.mask
@@ -4,8 +4,3 @@
 # WANG Xuerui <xen0n@gentoo.org> (2022-05-13)
 # Fails to build due to bug 843212
 >=dev-libs/boost-1.79.0
-
-# WANG Xuerui <xen0n@gentoo.org> (2022-05-04)
-# We have no Rust at the moment
->=dev-python/cryptography-37
->=gnome-base/librsvg-2.41
diff --git a/profiles/arch/loong/package.use.force b/profiles/arch/loong/package.use.force
index e53df0152ef8..1b1948517b25 100644
--- a/profiles/arch/loong/package.use.force
+++ b/profiles/arch/loong/package.use.force
@@ -11,7 +11,3 @@ sys-libs/libseccomp experimental-loong
 # WANG Xuerui <xen0n@gentoo.org> (2022-04-18)
 # gcc-12 is live ebuild for now, hence requiring this
 dev-vcs/git curl
-
-# WANG Xuerui <xen0n@gentoo.org> (2022-04-18)
-# Newer spidermonkey not available yet (due to absence of rust)
-sys-auth/polkit duktape
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 8e314964b5f4..df5fef0d5fe2 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -7,15 +7,6 @@
 net-libs/libssh mbedtls
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-05-13)
-# dev-lang/rust is not available on loong yet.
-dev-vcs/mercurial rust
-media-gfx/eog svg
-media-gfx/imv svg
-media-libs/freetype svg
->=media-libs/imlib2-1.9.0 svg
-media-libs/libavif rav1e
-
-# WANG Xuerui <xen0n@gentoo.org> (2022-05-13)
 # dev-lang/go is not available on loong yet.
 media-libs/libheif go test
 sys-apps/earlyoom test
diff --git a/profiles/arch/loong/parent b/profiles/arch/loong/parent
index eb001c6e8ab8..e234bf836e61 100644
--- a/profiles/arch/loong/parent
+++ b/profiles/arch/loong/parent
@@ -1 +1,2 @@
 ../base
+../../features/wd40
diff --git a/profiles/arch/m68k/parent b/profiles/arch/m68k/parent
index eb001c6e8ab8..e234bf836e61 100644
--- a/profiles/arch/m68k/parent
+++ b/profiles/arch/m68k/parent
@@ -1 +1,2 @@
 ../base
+../../features/wd40
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 544b27bcfa5a..4df4b49e6738 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -86,10 +86,6 @@ ruby
 zstd
 
 # James Le Cuirot <chewi@gentoo.org> (2021-08-20)
-# There is a community effort to bring Rust to m68k but it's not ready yet.
-rust
-
-# James Le Cuirot <chewi@gentoo.org> (2021-08-20)
 # Qt is not keyworded or tested.
 qt5
 
diff --git a/profiles/arch/s390/package.use.force b/profiles/arch/s390/package.use.force
index 7a031392e14a..7b02f8859485 100644
--- a/profiles/arch/s390/package.use.force
+++ b/profiles/arch/s390/package.use.force
@@ -1,10 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2022-04-26)
-# Spidermonkey needs Rust and LLVM, not available for s390
-sys-auth/polkit duktape
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2022-04-20)
 # s390-tools (in @system) needs this for building some bootloader code
 sys-devel/binutils multitarget
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index d18377364d6f..e0bf16f31c2d 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -10,9 +10,8 @@ dev-ruby/stringex test
 # Sam James <sam@gentoo.org> (2022-04-26)
 # eps: app-text/libspectre not keyworded here
 # heif: media-libs/libheif not keyworded here
-# svg: rustified librsvg not keyworded here
 # jpegxl: libjxl not keyworded here
-media-libs/imlib2 eps heif svg jpegxl
+media-libs/imlib2 eps heif jpegxl
 
 # Sam James <sam@gentoo.org> (2022-04-26)
 # Avoid unkeyworded dependencies
@@ -67,10 +66,6 @@ net-libs/gnutls test-full
 # net-fs/samba unkeyworded here
 net-fs/cifs-utils acl
 
-# Sam James <sam@gentoo.org> (2022-04-24)
-# No Rust here, so no librsvg
-media-libs/freetype svg
-
 # Sam James <sam@gentoo.org> (2022-04-20)
 # x11-themes/sound-theme-freedesktop unkeyworded here
 media-libs/libcanberra sound
diff --git a/profiles/arch/s390/s390/package.mask b/profiles/arch/s390/s390/package.mask
index 0f483435d0a0..a3155b7509b2 100644
--- a/profiles/arch/s390/s390/package.mask
+++ b/profiles/arch/s390/s390/package.mask
@@ -1,20 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2022-04-25)
-# Rust is available for s390x, but not s390.
-# bug #769446
-app-eselect/eselect-rust
-app-text/mdbook
-dev-lang/rust
-dev-lang/rust-bin
->=dev-python/cryptography-36
->=dev-python/pyopenssl-22
-dev-python/setuptools-rust
-dev-python/watchfiles
-dev-util/maturin
-virtual/rust
-
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-03-20)
 # sys-libs/libunwind doesn't work on s390
 sys-libs/libunwind
diff --git a/profiles/arch/s390/s390/parent b/profiles/arch/s390/s390/parent
index f3229c5b9876..154b8158dc01 100644
--- a/profiles/arch/s390/s390/parent
+++ b/profiles/arch/s390/s390/parent
@@ -1 +1,2 @@
 ..
+../../../features/wd40
diff --git a/profiles/arch/s390/s390x/package.use.force b/profiles/arch/s390/s390x/package.use.force
index 54d9b2d19c6f..a91fe713a600 100644
--- a/profiles/arch/s390/s390x/package.use.force
+++ b/profiles/arch/s390/s390x/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2022-06-18)
+# dev-lang/spidermonkey not keyworded yet.
+sys-auth/polkit duktape
+
 # Michał Górny <mgorny@gentoo.org> (2016-11-11)
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_SystemZ
diff --git a/profiles/arch/s390/s390x/package.use.mask b/profiles/arch/s390/s390x/package.use.mask
index 9af431104cb5..b12271ba6785 100644
--- a/profiles/arch/s390/s390x/package.use.mask
+++ b/profiles/arch/s390/s390x/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2022-06-18)
+# media-libs/librsvg not keyworded yet.
+media-libs/freetype svg
+media-libs/imlib2 svg
+
 # Sam James <sam@gentoo.org> (2021-02-05)
 # libpcre2 has JIT support for s390x (not s390)
 # but it doesn't seem to build right now?
diff --git a/profiles/arch/s390/s390x/use.mask b/profiles/arch/s390/s390x/use.mask
index 57f5e213dcf5..b7a7f1dac69b 100644
--- a/profiles/arch/s390/s390x/use.mask
+++ b/profiles/arch/s390/s390x/use.mask
@@ -3,7 +3,3 @@
 
 # Unmask ABI flags for this arch.
 -abi_s390_64
-
-# Sam James <sam@gentoo.org> (2022-05-02)
-# Rust is available for s390x (but not s390)
--rust
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index a155bfca4536..617144e3e5aa 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -135,10 +135,6 @@ media-libs/libsdl2 fcitx4
 # No drivers on this architecture support Vulkan
 media-libs/mesa vulkan vulkan-overlay zink
 
-# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
-# sparc has no virtual/rust support, needed by newer gnome-base/librsvg, et al
->=media-gfx/eog-3.33.1 svg
-
 # Robin H. Johnson <robbat2@gentoo.org> (2020-07-02)
 # Mask io-uring & zbc pending keywording
 sys-block/fio -io-uring -zbc
diff --git a/profiles/arch/sparc/parent b/profiles/arch/sparc/parent
index eb001c6e8ab8..e234bf836e61 100644
--- a/profiles/arch/sparc/parent
+++ b/profiles/arch/sparc/parent
@@ -1 +1,2 @@
 ../base
+../../features/wd40
diff --git a/profiles/features/wd40/README b/profiles/features/wd40/README
new file mode 100644
index 000000000000..1e90063187fc
--- /dev/null
+++ b/profiles/features/wd40/README
@@ -0,0 +1,3 @@
+This is a common profile for architectures and subarchitectures that do not
+support Rust (do not have a working virtual/rust).  It serves as a common place
+to mask the packages requiring Rust and the USE flags pulling them.
diff --git a/profiles/features/wd40/eapi b/profiles/features/wd40/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/features/wd40/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
new file mode 100644
index 000000000000..35e1e701f465
--- /dev/null
+++ b/profiles/features/wd40/package.mask
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Various packages requiring Rust.
+app-eselect/eselect-rust
+app-text/mdbook
+dev-lang/rust
+dev-lang/rust-bin
+>=dev-lang/spidermonkey-78
+>=dev-libs/gjs-1.66
+>=dev-python/cryptography-36
+>=dev-python/pyopenssl-22
+dev-python/setuptools-rust
+dev-python/watchfiles
+dev-util/cargo-c
+dev-util/cbindgen
+dev-util/git-delta
+dev-util/maturin
+gnome-base/gdm
+>=gnome-base/gnome-core-apps-3.36.5
+>=gnome-base/gnome-core-libs-3.36.5
+>=gnome-base/gnome-light-3.36.5
+>=gnome-base/gnome-shell-3.38
+>=gnome-base/librsvg-2.41
+gnome-extra/chrome-gnome-shell
+gnome-extra/gnome-tweaks
+media-libs/libavif
+media-video/rav1e
+>=net-irc/polari-3.37
+net-libs/quiche
+net-news/newsboat
+net-p2p/deluge
+sci-geosciences/gnome-maps
+>=sys-apps/bat-0.18.1
+virtual/rust
+>=x11-themes/adwaita-icon-theme-3.36
diff --git a/profiles/arch/arm/armv4/package.use.force b/profiles/features/wd40/package.use.force
index d70ac2644441..d70ac2644441 100644
--- a/profiles/arch/arm/armv4/package.use.force
+++ b/profiles/features/wd40/package.use.force
diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
new file mode 100644
index 000000000000..a2d57b80710f
--- /dev/null
+++ b/profiles/features/wd40/package.use.mask
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-05-13)
+# dev-lang/rust is not available on ${arch} yet.
+media-gfx/imv svg
+media-libs/libavif rav1e
+
+# Sam James <sam@gentoo.org> (2022-04-22)
+# Needs Rustified librsvg
+>=media-libs/freetype-2.12.0 svg
+media-libs/imlib2 svg
+
+# Michał Górny <mgorny@gentoo.org> (2021-11-26)
+# These package flags require dev-python/cryptography which -- due
+# to the dependency on Rust -- is no longer portable to ${arch}.
+dev-python/twisted conch crypt
+dev-python/urllib3 test
+net-fs/samba addc addns ads
+
+# Matt Turner <mattst88@gentoo.org> (2021-07-25)
+# gdm requires gnome-shell requires rustified librsvg.
+x11-misc/xscreensaver gdm
+
+# Jakov Smolić <jsmolic@gentoo.org> (2021-01-23)
+# Depends on media-video/rav1e which needs Rust
+>=media-libs/libheif-1.10.0 rav1e
+
+# Cédric Krier <cedk@gentoo.org> (2020-11-10)
+# virtual/rust has no ${arch} keyword
+dev-vcs/mercurial rust
+
+# Joonas Niilola <juippis@gentoo.org> (2020-10-02)
+# Sam James <sam@gentoo.org> (2021-03-11)
+# Dependency only keyworded on specific ${arch} profiles.
+dev-libs/efl avif
+kde-frameworks/kimageformats avif
+media-libs/gd avif
+net-libs/webkit-gtk avif
+
+# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
+# ${arch} has no virtual/rust support, needed by newer gnome-base/librsvg, et al
+>=media-gfx/eog-3.33.1 svg
+
+# Thomas Deutschmann <whissi@gentoo.org> (2018-10-12)
+# Requires www-client/firefox which isn't available on ${arch} yet
+# due to dev-lang/rust requirement
+dev-ruby/capybara test
diff --git a/profiles/arch/arm/armv4t/use.mask b/profiles/features/wd40/use.mask
index b1bb8f89da9f..41e587d5c549 100644
--- a/profiles/arch/arm/armv4t/use.mask
+++ b/profiles/features/wd40/use.mask
@@ -1,6 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+rust
+
 # Matt Turner <mattst88@gentoo.org> (2021-07-25)
 # gnome-shell requires rustified librsvg.
 gnome-shell