gentoo resync : 16.09.2021

56 files changed, 259 insertions, 176 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c12854bc67dc..2073930a9dd6 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index dfb3c9ca0247..7b4697273e01 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-09-12)
+# dev-ruby/asciidoctor isn't keyworded here
+dev-util/ccache doc
+
 # David Seifert <soap@gentoo.org> (2021-09-04)
 # dev-lang/go not keyworded here
 sys-libs/libcap tools
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 0b0f7f6b8122..53436728e7a1 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -188,11 +188,6 @@ net-im/ejabberd hipe
 # (SM)BIOS/Thunderbolt outside of amd64/x86? - citation needed
 sys-apps/fwupd dell thunderbolt
 
-# Davide Pesavento <pesa@gentoo.org> (2018-12-27)
-# The corresponding Qt5 modules are not keyworded on arm, and we don't want to
-# keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 networkauth
-
 # 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
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 695b70d43187..09c23baeafaf 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -5,10 +5,6 @@
 # Needs Raspberry Pi specific applications
 media-video/mjpg-streamer -input-raspicam
 
-# Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/tty-editor not keyworded here yet (Bug #807685)
-app-text/htmltidy test
-
 # Alexey Sokolov <alexey+gentoo@asokolov.org> (2021-08-08)
 # dev-games/ogre doesn't build on arm64, see https://bugs.gentoo.org/806776#c12
 dev-games/mygui ogre
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 5081d34b934a..f8994d5d256e 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-09-10)
+# no stable dev-ruby/{thor,tty-editor} on this arch yet
+# and there are many dependencies to go through before there are
+app-text/htmltidy test
+
 # Marek Szuba <marecki@gentoo.org> (2021-08-09)
 # media-plugins/cmt-plugins isn't stable on this arch yet
 media-sound/fluidsynth ladspa
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 2c2966e181bd..ecee11f522e9 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,14 +4,16 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2021-09-14)
+# fdk-aac, libfreeaptx not keyworded here
+# nor is jack2
+# bug #807616
+media-video/pipewire bluetooth jack-client
+
 # David Seifert <soap@gentoo.org> (2021-09-04)
 # dev-lang/go not keyworded here
 sys-libs/libcap tools
 
-# Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/tty-editor not keyworded here yet (Bug #807685)
-app-text/htmltidy test
-
 # Michał Górny <mgorny@gentoo.org> (2021-07-25)
 # PyQt5 and wxpython are not keyworded.
 dev-python/ipython qt5
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index adfc8b764e9a..b5e07045619e 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Matt Turner <mattst88@gentoo.org> (2021-09-10)
+# dev-libs/tomsfastmath does not have stable keywords on hppa
+dev-libs/libtomcrypt tomsfastmath
+
+# Marek Szuba <marecki@gentoo.org> (2021-09-10)
+# no stable dev-ruby/{thor,tty-editor} on this arch yet
+# and there are many dependencies to go through before there are
+app-text/htmltidy test
+
 # Matt Turner <mattst88@gentoo.org> (2021-09-06)
 # net-dialup/linux-atm does not have stable keywords on hppa
 # dev-libs/libbpf does not have stable keywords on hppa
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 468a49b4f2c3..9d8cdc717833 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -9,6 +9,7 @@
 
 # James Le Cuirot <chewi@gentoo.org> (2021-08-10)
 # media-video/pipewire is not keyworded. Bug #807616.
+bluetooth
 pipewire
 
 # Michał Górny <mgorny@gentoo.org> (2021-05-20)
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 7574729ef7d3..6a6397ddc197 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-09-14)
+# JACK2 isn't keyworded here
+# bug #807616
+media-video/pipewire jack-client
+
+# Sam James <sam@gentoo.org> (2021-09-12)
+# dev-ruby/asciidoctor isn't keyworded here
+dev-util/ccache doc
+
 # David Seifert <soap@gentoo.org> (2021-09-04)
 # dev-lang/go not keyworded here
 sys-libs/libcap tools
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index ec0d3456c1f3..433f3d1f5a80 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -199,7 +199,7 @@ dev-db/percona-server -numa
 # Davide Pesavento <pesa@gentoo.org> (2016-07-28)
 # The corresponding Qt5 modules are not keyworded on ppc, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
-dev-python/PyQt5 bluetooth location networkauth speech
+dev-python/PyQt5 bluetooth location speech
 
 # Michael Palimaka <kensington@gentoo.org> (2016-07-07)
 # Requires unkeyworded dependencies
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index cd56cfb4ff52..57fd3e5b0d13 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,16 +1,20 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Alex Fan <alexfanqi@yahoo.com> (2021-09-13)
+# dev-vcs/darcs depends on haskell
+app-portage/layman darcs
+
+# Sam James <sam@gentoo.org> (2021-09-12)
+# dev-ruby/asciidoctor isn't keyworded here
+dev-util/ccache doc
+
 # Marek Szuba <marecki@gentoo.org> (2021-09-07)
 # firefox needs nodejs to build, no firefox-bin for riscv
 dev-ruby/capybara test
 # net-misc/memcached not keyworded yet due to failing tests (Bug #811477)
 dev-ruby/dalli test
 
-# Yixun Lan <dlan@gentoo.org> (2021-09-03)
-# dependencies not keyworded/tested
-media-sound/cmus pidgin
-
 # Jonathan Davies <jpds@protonmail.com> (2021-09-03)
 # Requires CPU with SSSE3 support
 net-analyzer/suricata hyperscan
@@ -45,12 +49,10 @@ dev-lang/ruby xemacs
 
 # Yixun Lan <dlan@gentoo.org> (2021-08-20)
 # dependencies not keyworded/tested
-app-misc/tracker miners
 gnome-extra/sushi office
 gnome-base/gnome-control-center v4l
 gnome-base/gnome-shell telepathy browser-extension
-gnome-base/gdm plymouth accessibility
-gnome-base/nautilus previewer sendto
+gnome-base/gdm accessibility
 
 # Marek Szuba <marecki@gentoo.org> (2021-08-18)
 # media-libs/libffado does not recognise this arch, fails src_configure
@@ -58,15 +60,12 @@ gnome-base/nautilus previewer sendto
 media-sound/jack2 ieee1394
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-08-17)
+# dev-qt/qtwebengine requires nodejs to build.
+kde-plasma/kdeplasma-addons webengine
+kde-plasma/libksysguard webengine
 # dependencies not keyworded/tested
-kde-plasma/powerdevil wireless
 kde-plasma/plasma-desktop emoji
-kde-plasma/libksysguard webengine
-kde-plasma/plasma-workspace appstream screencast gps geolocation
-kde-plasma/kdeplasma-addons webengine
 kde-plasma/plasma-meta accessibility grub plymouth pulseaudio
-kde-plasma/discover flatpak
-kde-plasma/kwin accessibility screencast
 
 # Marek Szuba <marecki@gentoo.org> (2021-08-17)
 # sys-libs/libfaketime does not work properly on this arch
@@ -83,8 +82,8 @@ net-libs/libproxy spidermonkey
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-08-09)
 # ipython[qt5] depends on qtconsole, which depends on QtPy.
-# QtPy cannot be tested atm because QtPy[test] has a hard
-# dependency on PyQt5[bluetooth].
+# QtPy cannot be tested atm because QtPy[test] has an indirect hard
+# dependency on dev-qt/qtwebengine, which requires nodejs to build.
 dev-python/ipython qt5
 
 # Marek Szuba <marecki@gentoo.org> (2021-08-14)
@@ -111,10 +110,6 @@ app-admin/syslog-ng test
 dev-libs/mongo-c-driver test
 dev-python/pymongo test
 
-# Alex Fan <alexfanqi@yahoo.com> (2021-07-22)
-# lack an ios device to test it
-kde-frameworks/solid ios
-
 # Alex Fan <alexfanqi@yahoo.com> (2021-07-20)
 # hdf5-1.10 always fails tests with these 2 use flags enabled, otherwise
 # passes all tests on at least some systems. No longer needed for 1.12,
diff --git a/profiles/arch/sparc/package.use b/profiles/arch/sparc/package.use
index 944a41045491..4babc96027fc 100644
--- a/profiles/arch/sparc/package.use
+++ b/profiles/arch/sparc/package.use
@@ -1,13 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2020-01-18)
-# net-libs/mbedtls is not stable on sparc
-# so, let's enable openssl to avoid
-# REQUIRED_USE default conflicts for users.
-# bug #758428
-net-proxy/privoxy openssl
-
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Enable the GPU targets matching the default VIDEO_CARDS
 dev-ml/llvm-ocaml llvm_targets_AMDGPU
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index e592b1c4a5ba..8be0bc3ef149 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,14 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-09-14)
+# jack2 not keyworded here
+# bug #807616
+media-video/pipewire jack-client
+
+# Sam James <sam@gentoo.org> (2021-09-12)
+# dev-ruby/asciidoctor isn't keyworded here
+dev-util/ccache doc
+
 # David Seifert <soap@gentoo.org> (2021-09-04)
 # dev-lang/go not keyworded here
 sys-libs/libcap tools
 
-# Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/tty-editor not keyworded here yet (Bug #807685)
-app-text/htmltidy test
-
 # Matt Turner <mattst88@gentoo.org> (2021-07-23)
 # gui-libs/gtk is not keyworded
 net-libs/gssdp gtk
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index ea6368da3dd5..3e8a393cba95 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -1,6 +1,11 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-09-10)
+# no stable dev-ruby/{thor,tty-editor} on this arch yet
+# and there are many dependencies to go through before there are
+app-text/htmltidy test
+
 # Michał Górny <mgorny@gentoo.org> (2021-09-07)
 # Reduce the stabilization nightmare.
 dev-python/ipython nbconvert notebook smp
@@ -15,13 +20,6 @@ dev-python/matplotlib wxwidgets
 # bug #766051
 app-text/dblatex inkscape
 
-# Sam James <sam@gentoo.org> (2020-01-18)
-# net-libs/mbedtls is not stable on sparc
-# see also: package.use entry to allow
-# installs for now (+openssl).
-# bug #758428
-net-proxy/privoxy mbedtls
-
 # Sam James <sam@gentoo.org> (2021-01-04)
 # Drags in qt which is not stable here
 # bug #763405
@@ -68,14 +66,6 @@ net-libs/libssh mbedtls
 net-libs/libssh2 mbedtls
 net-vpn/openvpn mbedtls
 
-# Rolf Eike Beer <eike@sf-mail.de> (2020-04-04)
-# Needs stable x11-terms/xterm, bug #706118
-app-editors/joe xterm
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-04)
 # Needs stable net-libs/webkit-gtk, bug #712260
 app-editors/emacs xwidgets
-
-# Matt Turner <mattst88@gentoo.org> (2019-08-27)
-# No stable nftables yet.
-net-firewall/iptables nftables
diff --git a/profiles/arches.desc b/profiles/arches.desc
index 3159347e91f0..c627dd5570a7 100644
--- a/profiles/arches.desc
+++ b/profiles/arches.desc
@@ -27,6 +27,7 @@ sparc		stable
 x86		stable
 
 # Prefix keywords
+amd64-linux	testing
 arm-linux	testing
 arm64-linux	testing
 ppc64-linux	testing
diff --git a/profiles/base/package.use b/profiles/base/package.use
index c08d631f4f45..2eb93144eb97 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,6 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> (2021-09-13)
+# WirePlumber obligatory links and embeds either Lua 5.3 or 5.4
+# interpreter with the later being the upstream default.
+media-video/wireplumber lua_single_target_lua5-4
+
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Enable the BPF target by default
 dev-ml/llvm-ocaml llvm_targets_BPF
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index aa66e55ed5b5..0915aaf80a2a 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,12 +1,6 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2021-05-07)
-# Forced on for now as generated headers are now
-# included unconditionally.
-# (https://github.com/cyrusimap/cyrus-imapd/pull/3270)
->=net-mail/cyrus-imapd-3.4.0 sieve
-
 # Sam James <sam@gentoo.org> (2021-03-08)
 # Broken without USE=unicode
 # Needs to link with libiconv, bug #774507
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 662415c672b6..64a1414519cf 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,16 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Stephan Hartmann <sultan@gentoo.org> (2021-09-16)
+# Uses a function that is not available in media-video/ffmpeg.
+>=www-client/chromium-94 system-ffmpeg
+
+# Petr Vanek <arkamar@atlas.cz> (2021-09-12)
+# rspamd-3.0 segfaults a lot with jemalloc enabled (Bug #810337)
+# It is caused by -Wl,--as-needed linker flag,
+# see also: https://github.com/rspamd/rspamd/issues/3871
+~mail-filter/rspamd-3.0 jemalloc
+
 # James Le Cuirot <chewi@gentoo.org> (2021-09-04)
 # Currently requires an unreleased version of FFmpeg. If you really want it,
 # unmask the flag and emerge ffmpeg-9999 with this environment variable set:
@@ -32,7 +42,6 @@ net-print/hplip-plugin orblite
 # Bugs: #684580, #750893
 app-office/kexi webkit
 dev-libs/kreport webkit
-dev-python/PyQt5 webkit
 media-plugins/mythplugins mythbrowser mythmusic
 net-irc/kvirc webkit
 
@@ -58,10 +67,6 @@ dev-libs/libffi exec-static-trampoline
 # lto does not work on dev-lang/gnat-gpl-2021
 dev-lang/gnat-gpl:10 lto
 
-# Stephan Hartmann <sultan@gentoo.org> (2021-06-26)
-# Requires unreleased media-video/ffmpeg.
->=www-client/chromium-93 system-ffmpeg
-
 # Mike Gilbert <floppym@gentoo.org> (2021-06-14)
 # Avoid running failing tests by default.
 sys-kernel/dracut test
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
 # and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
 net-wireless/bluez user-session
+sys-apps/dbus user-session
diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
 # and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
 net-wireless/bluez user-session
+sys-apps/dbus user-session
diff --git a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
 # and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
 net-wireless/bluez user-session
+sys-apps/dbus user-session
diff --git a/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
 # and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
 net-wireless/bluez user-session
+sys-apps/dbus user-session
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/parent
new file mode 100644
index 000000000000..d5a56a13f692
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..288aeccdce82
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/parent
new file mode 100644
index 000000000000..fae96e8d36b2
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/parent
new file mode 100644
index 000000000000..0317df26cc9b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/package.use b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/package.use
new file mode 100644
index 000000000000..269791a40b12
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/package.use
@@ -0,0 +1,8 @@
+# Copyright 2019-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Brian Evans <grknight@gentoo.org> (2019-02-27)
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
+net-wireless/bluez user-session
+sys-apps/dbus user-session
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/parent
new file mode 100644
index 000000000000..5d9d87f6d91e
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/parent
new file mode 100644
index 000000000000..d5a56a13f692
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..288aeccdce82
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/parent
new file mode 100644
index 000000000000..fae96e8d36b2
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/parent
new file mode 100644
index 000000000000..0317df26cc9b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/package.use b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/package.use
new file mode 100644
index 000000000000..269791a40b12
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/package.use
@@ -0,0 +1,8 @@
+# Copyright 2019-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Brian Evans <grknight@gentoo.org> (2019-02-27)
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
+net-wireless/bluez user-session
+sys-apps/dbus user-session
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/parent
new file mode 100644
index 000000000000..5d9d87f6d91e
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
 # and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
 net-wireless/bluez user-session
+sys-apps/dbus user-session
diff --git a/profiles/default/linux/x86/17.0/musl/package.mask b/profiles/default/linux/x86/17.0/musl/package.mask
index 48c3e6db7a7e..ea771f7580c3 100644
--- a/profiles/default/linux/x86/17.0/musl/package.mask
+++ b/profiles/default/linux/x86/17.0/musl/package.mask
@@ -1,10 +1,2 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
-
-# Sam James <sam@gentoo.org> (2021-07-06)
-# Forces -fstack-protector, masking for now to allow stage3s to be built.
-# Masking this forces sys-apps/opentmpfiles to provide virtual/tmpfiles.
-# bug #800893
-# Temporarily unmask opentmpfiles here to get working stages.
-sys-apps/systemd-tmpfiles
--sys-apps/opentmpfiles
diff --git a/profiles/package.mask b/profiles/package.mask
index 76df766f24bf..0c1dc5e8fa4e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -4,7 +4,8 @@
 ####################################################################
 #
 # When you add an entry to the top of this file, add your name, the date
-# in the UTC timezone, and an explanation of why something is getting masked.
+# in the UTC timezone with a format of YYYY-MM-DD, and an explanation of why
+# something is getting masked.
 # Please be extremely careful not to commit atoms that are not valid, as it can
 # cause large-scale breakage, especially if it ends up in the daily snapshot.
 #
@@ -32,6 +33,95 @@
 
 #--- END OF EXAMPLES ---
 
+# Alice Ferrazzi <alicef@gentoo.org> (2021-09-16)
+# Regression in POSIX CPU timers.
+# Please upgrade your gentoo-sources.
+# Adding affected vanilla-sources
+# https://www.spinics.net/lists/stable/msg499206.html
+=sys-kernel/gentoo-sources-5.14.4
+=sys-kernel/gentoo-sources-5.13.17
+=sys-kernel/gentoo-sources-5.10.65
+=sys-kernel/gentoo-sources-5.4.146
+=sys-kernel/vanilla-sources-5.14.4
+=sys-kernel/vanilla-sources-5.13.17
+=sys-kernel/vanilla-sources-5.10.65
+=sys-kernel/vanilla-sources-5.4.146
+
+# Michał Górny <mgorny@gentoo.org> (2021-09-16)
+# POSIX CPU timers are broken.  Please downgrade or wait for next bump
+# before rebooting.
+# See e.g. https://lkml.org/lkml/2021/9/15/799
+~sys-kernel/gentoo-kernel-5.13.17
+~sys-kernel/gentoo-kernel-5.10.65
+~sys-kernel/gentoo-kernel-5.4.146
+~sys-kernel/gentoo-kernel-bin-5.13.17
+~sys-kernel/gentoo-kernel-bin-5.10.65
+~sys-kernel/gentoo-kernel-bin-5.4.146
+~sys-kernel/vanilla-kernel-5.13.17
+~sys-kernel/vanilla-kernel-5.10.65
+~sys-kernel/vanilla-kernel-5.4.146
+~virtual/dist-kernel-5.13.17
+~virtual/dist-kernel-5.10.65
+~virtual/dist-kernel-5.4.146
+
+# Mart Raudsepp <leio@gentoo.org> (2021-09-15)
+# New major parallel-installable release which needs special care to not
+# end up loaded into the same process together with the earlier libsoup ABI.
+# Migration to it is expected for GNOME 42, NOT to be unmasked with GNOME 41.
+net-libs/libsoup:3.0
+
+# Gnome Team <gnome@gentoo.org> (2021-09-13)
+# GNOME 41 mask, bug #812986
+>=dev-util/gdbus-codegen-2.69
+>=dev-util/glib-utils-2.69
+>=dev-libs/glib-2.69
+>=net-libs/glib-networking-2.69
+
+# Ionen Wolkens <ionen@gentoo.org> (2021-09-12)
+# No reverse dependencies, stuck on EAPI-5.
+# Replaced by dev-libs/spsdeclib.
+# Removal on 2021-10-12. bug #812806
+games-emulation/caps
+
+# Ionen Wolkens <ionen@gentoo.org> (2021-09-12)
+# No reverse dependencies, stuck on EAPI-5, last release in 2006.
+# Please report if anyone still need this.
+# Removal on 2021-10-12. bug #776904
+media-libs/sdl-terminal
+
+# Ionen Wolkens <ionen@gentoo.org> (2021-09-12)
+# Stuck on x86 / amd64-multilib, no upstream, code relies on
+# several implicit constructs and undefined behavior, ebuild
+# semi-broken and runtime seems broken even if built.
+# Removal on 2021-10-12. bug #701414, bug #739188.
+games-emulation/nestra
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-09-11)
+# No reverse dependencies. Implements ordered set, which was needed
+# for the python 2.6 era, and since python 2.7 isn't needed and is
+# builtin in the language. Upstream isn't active at all.
+# No other distros package it anymore.
+# Removal on 2021-10-11.  Bug #812554
+dev-python/oset
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-09-11)
+# No reverse dependencies. Has issues with porting to python 3.10.
+# Has known upstream issues with latest GitHub's markdown parsing.
+# Last year upstream planned to archive the repository, no activity
+# since. No other distros package it anymore.
+# Extra bug: #798195
+# Removal on 2021-10-11.  Bug #812530.
+dev-python/py-gfm
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2021-09-11)
+# Upstream repository was archived. No reverse dependencies (only blocked
+# by one other package). Implements GitHub API in python, while better and
+# maintained packages are in tree. Has non trivial issues with bump to
+# python 3.10. No other distros package it anymore.
+# Extra bugs: #791673, #723542, #802999
+# Removal on 2021-10-11.  Bug #812521.
+dev-python/txgithub
+
 # Jakov Smolić <jsmolic@gentoo.org> (2021-09-09)
 # Relies on setuptools' deprecated use_2to3 option.
 # Last release in 2019, no revdeps.
@@ -162,60 +252,6 @@ net-analyzer/netwag
 # Removal on 2021-09-17.
 sys-fs/e4rat
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-08-15)
-# Broken since Perl 5.22, bug 662318. Removal in 30 days.
-dev-perl/POE-API-Peek
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-08-15)
-# Broken-ish, upstream unmaintained, only one un-used revdep.
-# Removal in 30 days. Bug 623674.
-dev-perl/MooseX-Types-DateTime-ButMaintained
-dev-perl/MooseX-Types-DateTimeX
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-08-15)
-# Broken for years, see bug 642466. No reverse dependencies,
-# no easy fix. Removal in 30 days.
-dev-perl/Perlbal-XS-HTTPHeaders
-
-# David Seifert <soap@gentoo.org> (2021-08-13)
-# Dead upstream, new "forked" upstream that just added the last version
-# on Github but doesn't maintain them. Unmaintained for the past 10
-# years in ::gentoo, no other real distros package these anymore.
-# HOMEPAGE leads to some scammy site.
-# Bug #318143, #626666, #626668, Removal in ~30 days.
-dev-libs/libbrahe
-dev-libs/libcoyotl
-dev-libs/libevocosm
-app-benchmarks/acovea
-app-benchmarks/acovea-gtk
-
-# Agostino Sarubbo <ago@gentoo.org> (2021-08-12)
-# Latest release 2012, not anymore useful for current routers
-# Removal in ~30 days.
-app-crypt/WiRouterKeyRec
-
-# Joonas Niilola <juippis@gentoo.org> (2021-08-11)
-# Broken since 2016. Latest upstream release 2014, no ebuild activity
-# from maintainer since 2016, EAPI-5 and the rest. HOMEPAGE leads to
-# some scammy site. Removal in ~30 days. #584668
-dev-util/emilpro
-
-# Joonas Niilola <juippis@gentoo.org> (2021-08-11)
-# A library without revdeps, broken for a long time. No maintainer
-# reply. Package not updated in Gentoo since 2016 even though upstream
-# is still active. Removal in ~30 days. #774147
-dev-libs/caliper
-
-# Joonas Niilola <juippis@gentoo.org> (2021-08-11)
-# Broken with gcc >=10, even the latest upstream release fails with
-# gcc-11. Unmaintained. Removal in ~30 days. #739904
-app-office/plan
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-10)
-# EAPI-5, dead, unused; last consumer dropped in bug #352952
-# Removal on 2021-09-09.
-net-print/libgnomecups
-
 # David Seifert <soap@gentoo.org> (2021-08-04)
 # Last release over 4 years ago, upstream pretty much dead, the
 # ecosystem has switched to dev-util/pkgconf, which is alive. Testing
@@ -263,14 +299,6 @@ dev-qt/qtwebkit:5
 # Masked for testing
 >=mail-client/claws-mail-4.0.0
 
-# Hans de Graaff <graaff@gentoo.org> (2021-07-09)
-# Mask ruby25 for removal. This version is no longer supported
-# upstream. Use a newer ruby version, e.g ruby26.
-# Masked for removal in 30 days.
-dev-lang/ruby:2.5
-=dev-ruby/rubygems-2.7*
-dev-ruby/did_you_mean:2.5
-
 # Michał Górny <mgorny@gentoo.org> (2021-07-06)
 # Upstream changed license to GPL-3+ in order to deliberately cause
 # incompatiblity with revdep licenses.  Mask until the situation
@@ -296,14 +324,6 @@ sys-libs/db:5.1
 # which is currently not available in Gentoo.
 >=games-server/minecraft-server-1.17
 
-# Davide Pesavento <pesa@gentoo.org> (2021-06-15)
-# Masked for revdep testing.
->=dev-python/sip-6
->=dev-python/PyQt5-5.15.5_pre
->=dev-python/PyQtWebEngine-5.15.5_pre
->=dev-python/qscintilla-python-2.13
->=app-text/calibre-5.25.0
-
 # Sam James <sam@gentoo.org> (2021-06-12)
 # Masked until all reverse dependencies support
 # OCaml 4.12.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index e7e19692b5dc..362bc02c60cd 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -198,19 +198,31 @@ ppc64		default/linux/ppc64le/17.0/musl/hardened		exp
 
 # RISC-V Profiles
 # @MAINTAINER: riscv@gentoo.org
-riscv		default/linux/riscv/17.0/rv64gc			exp
-riscv		default/linux/riscv/17.0/rv64gc/lp64d		exp
-riscv		default/linux/riscv/17.0/rv64gc/lp64d/systemd	exp
-riscv		default/linux/riscv/17.0/rv64gc/lp64		exp
-riscv		default/linux/riscv/17.0/rv64gc/lp64/systemd	exp
-riscv		default/linux/riscv/17.0/rv32imac/ilp32		exp
-riscv		default/linux/riscv/17.0/rv32imac/ilp32d	exp
-riscv		default/linux/riscv/20.0/rv64gc/lp64d		stable
-riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd	stable
-riscv		default/linux/riscv/20.0/rv64gc/lp64		stable
-riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd	stable
-riscv		default/linux/riscv/20.0/rv64gc/multilib		exp
-riscv		default/linux/riscv/20.0/rv64gc/multilib/systemd	exp
+riscv		default/linux/riscv/17.0/rv64gc						exp
+riscv		default/linux/riscv/17.0/rv64gc/lp64d					exp
+riscv		default/linux/riscv/17.0/rv64gc/lp64d/systemd				exp
+riscv		default/linux/riscv/17.0/rv64gc/lp64					exp
+riscv		default/linux/riscv/17.0/rv64gc/lp64/systemd				exp
+riscv		default/linux/riscv/17.0/rv32imac/ilp32					exp
+riscv		default/linux/riscv/17.0/rv32imac/ilp32d				exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d					stable
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop				dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome			dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd		dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma			dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd		dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd			dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd				stable
+riscv		default/linux/riscv/20.0/rv64gc/lp64					stable
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop				dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome			dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd		dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma			dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd		dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd			dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd				stable
+riscv		default/linux/riscv/20.0/rv64gc/multilib				exp
+riscv		default/linux/riscv/20.0/rv64gc/multilib/systemd			exp
 
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
diff --git a/profiles/targets/desktop/plasma/package.mask b/profiles/targets/desktop/plasma/package.mask
deleted file mode 100644
index a74631167f35..000000000000
--- a/profiles/targets/desktop/plasma/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Breaks build of kde-plasma/kwin, bug 810511, KDE-bug 440372
-~media-libs/libglvnd-1.3.4
diff --git a/profiles/updates/3Q-2020 b/profiles/updates/3Q-2020
index 7fa9b939bfbc..d7e42a928724 100644
--- a/profiles/updates/3Q-2020
+++ b/profiles/updates/3Q-2020
@@ -44,7 +44,6 @@ move app-dicts/sword-geneva app-dicts/sword-Geneva
 move app-dicts/sword-geneva1599 app-dicts/sword-Geneva1599
 move app-dicts/sword-gerelb1871 app-dicts/sword-GerElb1871
 move app-dicts/sword-gerelb1905 app-dicts/sword-GerElb1905
-move app-dicts/sword-gerlut1545 app-dicts/sword-GerLut1545
 move app-dicts/sword-gersch app-dicts/sword-GerSch
 move app-dicts/sword-greekhebrew app-dicts/sword-GreekHebrew
 move app-dicts/sword-hebrewgreek app-dicts/sword-HebrewGreek
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
index 9dee69041650..1672dcae1c5c 100644
--- a/profiles/updates/3Q-2021
+++ b/profiles/updates/3Q-2021
@@ -11,3 +11,5 @@ move dev-python/u-msgpack dev-python/u-msgpack-python
 move sci-physics/geant-vmc sci-physics/geant4_vmc
 move dev-python/beautifulsoup dev-python/beautifulsoup4
 slotmove dev-python/beautifulsoup4 4 0
+move dev-python/pyro dev-python/Pyro4
+slotmove dev-python/Pyro4 4 0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e9bac414093f..b622fa0b394f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2415,11 +2415,6 @@ dev-python/icalendar:doc - Generate examples and other extra documentation
 dev-python/ipython:matplotlib - Add support for dev-python/matplotlib
 dev-python/ipython:nbconvert - Enable support for converting notebooks to various formats using app-text/pandoc
 dev-python/ipython:notebook - Install requirements for the web notebook based on www-servers/tornado
-dev-python/kombu:mongodb - Enables MongoDB backend
-dev-python/kombu:msgpack - Enables MessagePack (de)serializer for Python
-dev-python/kombu:redis - Enables Redis backend
-dev-python/kombu:sqs - Enables Amazon SQS transport module for Kombu
-dev-python/kombu:yaml - Enables yaml backend
 dev-python/matplotlib:excel - Pull dev-python/xlwt for the exceltools toolkit
 dev-python/matplotlib:gtk3 - Enable x11-libs/gtk+:3 support
 dev-python/matplotlib:webagg - Enable webagg backend that uses www-servers/tornado
@@ -2498,6 +2493,7 @@ dev-python/simplespectral:faster - Use dev-python/scipy to speed up drawing
 dev-python/simplespectral:fastest - Use dev-python/pyFFTW to speed up drawing to the max
 dev-python/socketpool:eventlet - Install dev-python/eventlet as needed for the eventlet backend.
 dev-python/socketpool:gevent - Install dev-python/gevent as needed for the gevent backend.
+dev-python/subprocess-tee:test-full - Enable full test mode. Pulls in many additional dependencies, and requires having been emerged without this flag first in order to avoid a circular dependency.
 dev-python/sympy:imaging - Add support for dev-python/pillow
 dev-python/sympy:ipython - Add support for dev-python/ipython
 dev-python/sympy:mathml - Add support for mathml
@@ -2730,6 +2726,7 @@ dev-util/anjuta:terminal - Enable terminal plugin based on x11-libs/vte
 dev-util/bazel:static-libs - Link libstdc++ statically
 dev-util/bazel:tools - Install extra bazel tools to build from sources
 dev-util/bitcoin-tx:knots - Build enhanced Bitcoin Knots version, rather than Bitcoin Core
+dev-util/bpftool:caps - Use sys-libs/libcap to enable unprivileged run support
 dev-util/bpftrace:fuzzing - Build bpftrace for fuzzing
 dev-util/buildbot:docker - Add support for worker docker command steps
 dev-util/buildbot:irc - Add support for status delivery through an ircbot.
@@ -2779,7 +2776,6 @@ dev-util/diffoscope:tcpdump - Use net-analyzer/tcpdump
 dev-util/diffoscope:zip - Use app-arch/unzip
 dev-util/edb-debugger:jumbo-build - Experimental jumbo (also known as unity) build capability
 dev-util/edi:clang - Provide integration with sys-devel/clang and dev-util/bear for autocompletion, inline errors and information about compilation units.
-dev-util/emilpro:system-binutils - Use the gentoo binutils instead of building against an unpatched vanilla version
 dev-util/flatpak-builder:yaml - Use libyaml for yaml support
 dev-util/geany:gtk2 - Use GTK+2 instead of GTK+3
 dev-util/geany:gtk3 - Use GTK+3 instead of GTK+2
@@ -3563,7 +3559,6 @@ kde-plasma/kdeplasma-addons:comic - Enable comic applet (requires deprecated kde
 kde-plasma/kdeplasma-addons:share - Enable applet for quickly sharing data to a variety of sources
 kde-plasma/kdeplasma-addons:webengine - Enable dictionary and web browser applets using dev-qt/qtwebengine
 kde-plasma/kinfocenter:pci - Show advanced PCI information
-kde-plasma/ksysguard:networkmanager - Enable improved backend for Network statistics using kde-frameworks/networkmanager-qt
 kde-plasma/ksystemstats:networkmanager - Enable improved backend for Network statistics using kde-frameworks/networkmanager-qt
 kde-plasma/kwin:multimedia - Enable effect video button in desktop effects KCM
 kde-plasma/kwin:screencast - Enable screencast portal using media-video/pipewire
@@ -5496,6 +5491,7 @@ net-dns/dnsmasq:dnssec - Enable support DNSSEC validation and caching.
 net-dns/dnsmasq:dumpfile - Include code to dump packets to a libpcap-format file for debugging
 net-dns/dnsmasq:id - Whether report *.bind CHAOS info to clients, otherwise forward such requests upstream instead
 net-dns/dnsmasq:libidn2 - Enable support for Internationalized Domain Names, via net-dns/libidn2 rather than net-dns/libidn
+net-dns/dnsmasq:loop - Include functionality to probe for and remove DNS forwarding loops
 net-dns/dnsmasq:nettlehash - Use hashing functions from dev-libs/nettle
 net-dns/dnsmasq:script - Enable support for calling scripts when leases change.
 net-dns/dnsmasq:tftp - Enables built in TFTP server for netbooting.
@@ -6623,6 +6619,7 @@ net-misc/wget:uuid - Generate UUIDs for the WARC (Web ARChive file format) using
 net-misc/wget2:brotli - Enable support for brotli compression
 net-misc/wget2:gpgme - Build app-crypt/gpgme backend
 net-misc/wget2:http2 - Enable HTTP/2.0 support via net-libs/nghttp2
+net-misc/wget2:lzip - Enable app-arch/lzip support
 net-misc/wget2:openssl - Enable crypto support via dev-libs/openssl
 net-misc/wget2:psl - Use public suffix list via net-libs/libpsl
 net-misc/wget2:valgrind - Depend on dev-util/valgrind for test suite