gentoo resync : 04.01.2022

67 files changed, 210 insertions, 221 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 4424f1abce12..dbe79219b8b2 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-30)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.mask.
+dev-lang/python-exec -python_targets_python3_10
+
 # Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
 # ts-cli requires rust to be built, and rust is unavailable here ATM.
 dev-libs/tree-sitter ts-cli
@@ -31,7 +36,7 @@ sys-libs/libcap tools
 sys-apps/rng-tools rtlsdr
 
 # Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/{thor,tty-editor} not keyworded here yet (Bug #807685)
+# dev-ruby/thor not keyworded here
 app-text/htmltidy test
 
 # Matt Turner <mattst88@gentoo.org> (2021-07-23)
@@ -278,12 +283,6 @@ net-libs/gnutls test-full
 # Requires USE=bluetooth that is masked in this profile.
 media-sound/pulseaudio native-headset
 
-# Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
-<dev-vcs/git-2.31.0 pcre-jit
-
 # Tobias Klausmann <klausman@gentoo.org> (2017-05-18)
 # Stack protector code is not ported to alpha (and may not ever be)
 >=sys-devel/gcc-6 ssp
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index e4411cb89cb1..8ceefa57faa7 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -31,6 +31,7 @@ app-emulation/crossover-bin
 app-emulation/protontricks
 app-emulation/q4wine
 app-emulation/winetricks
+<=app-shells/scsh-0.6.9
 dev-embedded/libftd2xx
 dev-embedded/openocd
 dev-util/android-ndk
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index df910ea0ebe9..eb5449388b24 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,12 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl is not stable, needs online registration to even run pkg_setup
 mkl
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 0eea5cd8321e..77b4e5870b93 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2021-10-31)
@@ -25,9 +25,8 @@ media-video/mjpg-streamer -input-raspicam
 dev-util/diffoscope pascal pdf
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-18)
-# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
 # and media-plugins/zam-plugins not keyworded here
-media-sound/easyeffects rnnoise webrtc zamaudio
+media-sound/easyeffects zamaudio
 
 # Miroslav Šulc <fordfrog@gentoo.org> (2021-04-12)
 # no stable virtual/jdk on this arch
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 8fa70e683bc3..d06f8e1c9383 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,12 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
 # Sam James <sam@gentoo.org> (2020-12-22)
 # Not yet stable
 lirc
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 58c25a4ae688..8cba9766d5b3 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-01-02)
+# sys-fabric/ofed is not keyworded here
+sys-cluster/slurm ofed
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-16)
 # requires sys-apps/dbus-broker, which keyworded here.
 sys-apps/systemd -hostnamed-fallback
@@ -39,9 +43,8 @@ sys-boot/grub grub_platforms_qemu grub_platforms_uboot
 dev-util/diffoscope pascal
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-18)
-# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
-# and media-plugins/zam-plugins not keyworded here
-media-sound/easyeffects rnnoise webrtc zamaudio
+# media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects zamaudio
 
 # Sam James <sam@gentoo.org> (2021-04-14)
 # Supports 64-bit NEON
@@ -356,11 +359,6 @@ media-sound/mumble g15
 # media-libs/libemf fails with #error unknown CPU.
 media-gfx/pstoedit emf
 
-# Alexis Ballier <aballier@gentoo.org> (2017-07-14)
-# zfs does not build on arm64 (yet?)
-app-emulation/libvirt zfs
-sys-cluster/ceph zfs
-
 # Alexis Ballier <aballier@gentoo.org> (2017-07-10)
 # openvz-sources are likely too old for any proper arm64 usage
 app-emulation/libvirt openvz
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 1cec2de5360c..af59a1a97147 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
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.stable.mask.
+dev-lang/python-exec -python_targets_pypy3
+
 # Sam James <sam@gentoo.org> (2021-11-20)
 # dev-python/networkx is not yet marked stable on arm*
 app-admin/setools infoflow
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index ff0cafe9ef98..03d4cb4097f4 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -4,12 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
 # Sam James <sam@gentoo.org> (2020-12-23)
 # dev-lang/luajit is not yet stable
 lua_single_target_luajit
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index f438ef894cc3..3071bbb0f102 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
@@ -235,12 +235,6 @@ app-forensics/sleuthkit java
 # Requires USE=seccomp that is masked in this profile.
 net-libs/gnutls test-full
 
-# Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
-<dev-vcs/git-2.31.0 pcre-jit
-
 # Michał Górny <mgorny@gentoo.org> (2017-06-28)
 # app-misc/dtach is not keyworded, and tests are restricted anyway, so
 # no point in pursuing it right now.
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index eec8e480fd60..54706b70567e 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -16,12 +16,6 @@ openexr
 bluetooth
 pipewire
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-20)
-# Unresolved keywordreqs are getting in the way.
-# https://bugs.gentoo.org/789606
-python_targets_python3_10
-python_single_target_python3_10
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
 # sys-libs/llvm-libunwind not supported on HPPA.
 llvm-libunwind
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index b73cd857e2fa..873d96ddd30c 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -26,12 +26,6 @@ colord
 # media-libs/libsamplerate is not stable on hppa
 libsamplerate
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
 # Matt Turner <mattst88@gentoo.org> (2020-12-23)
 # dev-db/postgresql is not stable on hppa
 postgres
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index f7d836375ea4..d739b62aacb1 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
@@ -264,12 +264,6 @@ media-video/ffmpeg libv4l
 # Requires USE=bluetooth that is masked in this profile.
 media-sound/pulseaudio native-headset
 
-# Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
-<dev-vcs/git-2.31.0 pcre-jit
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-07-20)
 # pulls in unkeyworded java
 sci-libs/gdal mdb
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index b478a13dfc42..1cab9568abcd 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (2022-01-01)
+# Some optional emacs dependencies are not keyworded.
+app-editors/emacs gui mailutils
+
 # James Le Cuirot <chewi@gentoo.org> (2021-09-28)
 # Needs a lot of Perl packages to be keyworded.
 dev-vcs/git doc
@@ -17,6 +21,7 @@ media-gfx/graphviz lefty pdf
 # Requires Rust, which is currently unavailable on m68k.
 app-editors/emacs svg
 media-gfx/graphviz svg
+media-gfx/imagemagick svg
 
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
 # Requires Ruby, which is broken on m68k.
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index d06346dd9a9b..56fb20679473 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -1,9 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# James Le Cuirot <chewi@gentoo.org> (2022-01-01)
+# Hardware that probably doesn't apply to m68k.
+input_devices_elographics
+video_cards_amdgpu
+video_cards_glint
+video_cards_mga
+video_cards_nouveau
+video_cards_nv
+video_cards_r128
+video_cards_radeon
+video_cards_radeonsi
+
 # James Le Cuirot <chewi@gentoo.org> (2021-10-02)
 # Keywording aside, m68k CPUs are probably too slow for PulseAudio.
 pulseaudio
@@ -11,6 +23,7 @@ pulseaudio
 # James Le Cuirot <chewi@gentoo.org> (2021-09-28)
 # Too many unkeyworded dependencies for now.
 efl
+openexr
 subversion
 
 # James Le Cuirot <chewi@gentoo.org> (2021-09-27)
@@ -24,7 +37,12 @@ mpi
 
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
 # I tried Mesa under qemu-system-m68k with VirtIO-GPU. It didn't work.
+egl
+gles1
+gles2
+opencl
 opengl
+vulkan
 
 # James Le Cuirot <chewi@gentoo.org> (2021-09-17)
 # Ruby just crashes on startup.
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index d6929b9f383b..2bf76153d4ca 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-12-31)
+# dev-lang/julia not keyworded here
+# sci-mathematics/polymake not keyworded here
+sci-mathematics/singular julia polymake
+
 # Sam James <sam@gentoo.org> (2021-12-08)
 # Masks involving webkit-gtk; webkit-gtk was dekeyworded on ppc for a while.
 # We haven't (yet?) restored keywords for all the bits we had to drop, so
@@ -31,10 +36,6 @@ app-i18n/uim kde
 # media-libs/libheif not keyworded here
 sci-libs/gdal heif
 
-# 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> (07-25-2021)
 # gdm requires gnome-shell requires rustified librsvg.
 x11-misc/xscreensaver gdm
@@ -44,9 +45,8 @@ x11-misc/xscreensaver gdm
 net-libs/gssdp gtk
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-18)
-# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
-# and media-plugins/zam-plugins not keyworded here
-media-sound/easyeffects rnnoise webrtc zamaudio
+# media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects zamaudio
 
 # Matt Turner <mattst88@gentoo.org> (2021-06-10)
 # dev-python/django is not keyworded here
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index fa7b5a672925..7b64f1a1fe16 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2021-12-31)
+# 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
+
 # Sam James <sam@gentoo.org> (2021-02-06)
 # Drags in too much unstable GNOME for now
 # bug #727572
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index 408d42d9aa94..57875ce2a1bf 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,12 +1,6 @@
 # Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-08-13)
 # media-gfx/gimp is not stable
 gimp
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index 57513f24743e..ad5616188460 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.stable.mask.
+dev-lang/python-exec -python_targets_pypy3
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-13)
 # ppc64 has pipewire keyworded
 www-client/firefox -screencast
diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask
index 1e05b89c6963..b596bd803519 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 is keyworded here.
+-python_targets_pypy3
+-python_single_target_pypy3
+
 # Sam James <sam@gentoo.org> (2021-10-16)
 # media-libs/openexr doesn't work on BE, but should on LE.
 # ...and openscenegraph needs openexr.
diff --git a/profiles/arch/powerpc/ppc64/64le/use.stable.mask b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
index ea967fc953b8..9d8490097912 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
@@ -1,13 +1,12 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 target is not ready for stable.
+python_targets_pypy3
+python_single_target_pypy3
+
 # Sam James <sam@gentoo.org> (2021-11-14)
 # media-libs/openexr is not marked stable on ppc64
 # (it's broken on BE and it's more convenient to keep it at ~arch here for now)
 openexr
-
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index b6e15b3d13f1..ca0dd80c2085 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.stable.mask.
+dev-lang/python-exec -python_targets_pypy3
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-27)
 # deps are keyworded
 gnome-base/gnome-extra-apps -tracker
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 0587005a8db1..598e625a645e 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 is keyworded here.
+-python_targets_pypy3
+-python_single_target_pypy3
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-03)
 # clang is keyworded and works on ppc64
 -clang
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.stable.mask b/profiles/arch/powerpc/ppc64/64ul/use.stable.mask
index 9bf68847141b..fee4cfaa3747 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.stable.mask
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 target is not ready for stable.
+python_targets_pypy3
+python_single_target_pypy3
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-26)
 # media-plugins/frei0r-plugins not stable yet
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 5c49713bc423..7a0bdb803f0e 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.stable.mask.
+dev-lang/python-exec -python_targets_pypy3
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-12)
 # telepathy stack is not keyworded
 dev-util/kdevelop reviewboard
@@ -17,14 +22,9 @@ net-dns/dnscrypt-proxy pie
 # Needs media-libs/libldac which builds on ppc64le, but not be
 media-video/pipewire -bluetooth
 
-# Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/tty-editor not keyworded here yet (Bug #807685)
-app-text/htmltidy test
-
 # Marek Szuba <marecki@gentoo.org> (2021-07-18)
-# media-plugins/gst-plugins-webrtc and media-plugins/zam-plugins
-# not keyworded here
-media-sound/easyeffects webrtc zamaudio
+# media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects zamaudio
 
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
 # Feature currently relies on amd64 prebuilt binaries.
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index ad8e800ab267..46b6dcd3e2f7 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2021-12-31)
+# 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
+
 # Georgy Yakovlev <gyakovlev@gentoo.org (2021-06-25)
 # ceph is not going to be stable on ppc64
 # https://bugs.gentoo.org/798744
diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask
index 63cd97f2d51e..ab9cefcf66ac 100644
--- a/profiles/arch/powerpc/ppc64/use.mask
+++ b/profiles/arch/powerpc/ppc64/use.mask
@@ -3,6 +3,11 @@
 
 ### THIS FILE IS ONLY FOR PACKAGES MASKED ON BOTH 64-BIT AND 32-BIT USERLAND!!!
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 is keyworded here.
+-python_targets_pypy3
+-python_single_target_pypy3
+
 # Sam James <sam@gentoo.org> (2021-10-16)
 # media-libs/openexr doesn't work on BE (bug #818424)
 # ...and openscenegraph needs openexr.
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index 013b344a472d..49d27fdb8144 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -4,13 +4,12 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 target is not ready for stable.
+python_targets_pypy3
+python_single_target_pypy3
+
 # Sam James <sam@gentoo.org> (2021-11-14)
 # media-libs/openexr is not marked stable on ppc64
 # (it's broken on BE and it's more convenient to keep it at ~arch here for now)
 openexr
-
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
diff --git a/profiles/arch/riscv/1level/make.defaults b/profiles/arch/riscv/1level/make.defaults
deleted file mode 100644
index 2a8d8bdc9bb3..000000000000
--- a/profiles/arch/riscv/1level/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-LIBDIR_lp64d="lib64"
-LIBDIR_lp64="lib64"
-LIBDIR_ilp32d="lib"
-LIBDIR_ilp32="lib"
diff --git a/profiles/arch/riscv/1level/package.mask b/profiles/arch/riscv/1level/package.mask
deleted file mode 100644
index eb4368881cc3..000000000000
--- a/profiles/arch/riscv/1level/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Doesnt work properly with the one-level libdirs
-<sys-apps/baselayout-2.7-r3
diff --git a/profiles/arch/riscv/1level/package.unmask b/profiles/arch/riscv/1level/package.unmask
deleted file mode 100644
index 61bf895f5679..000000000000
--- a/profiles/arch/riscv/1level/package.unmask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Does work properly with the one-level libdirs
-<dev-lang/python-3.7
diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults
index 3a7d4ac18e7f..6006d582a10a 100644
--- a/profiles/arch/riscv/make.defaults
+++ b/profiles/arch/riscv/make.defaults
@@ -15,6 +15,15 @@ FCFLAGS="${CFLAGS}"
 
 SYMLINK_LIB="no"
 
+# Note about LIBDIR_*: 
+# 1) To keep in step with other arches and distributions we use "lib" for 32bit
+#    and "lib64" for 64bit for the *default* ABI.
+#    NOT the two level dirs from the specification, and NOT lib32 as specified
+#    as 32bit fallback.
+# 2) The LIBDIRs provided *here* are the ones for secondary ABI in the multilib
+#    case.
+#    The LIBDIR for the *primary* ABI MUST be overridden in an inheriting profile.
+
 # Flags for lp64d
 LIBDIR_lp64d="lib64/lp64d"
 CFLAGS_lp64d="-mabi=lp64d"
@@ -42,7 +51,8 @@ CHOST_ilp32="riscv32-unknown-linux-gnu"
 # Since many people will want to test this in qemu...
 FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox"
 
-# The following stuff is, e.g., defined in subdirs:
+# The following stuff MUST be defined in subdirs:
 # ABI
 # DEFAULT_ABI
 # MULTILIB_ABIS
+# LIBDIR_* for DEFAULT_ABI
diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/package.mask
index 43580b7b49a0..3b8aa5520537 100644
--- a/profiles/arch/riscv/package.mask
+++ b/profiles/arch/riscv/package.mask
@@ -1,5 +1,5 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Doesnt work properly with the two-level libdirs
-<dev-lang/python-3.7
+# Doesnt work properly with the one-level libdirs
+<sys-apps/baselayout-2.7-r3
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 8a95c710fd15..64bd1d5f56fb 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,22 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrey Grozin <grozin@gentoo.org> (2022-01-03)
+# dev-libs/utfcpp is not keyworded yet
+media-gfx/asymptote lsp
+
+# Yongxinag Liang <tanekliang@gmail.com> (2021-12-30)
+# untested.
+net-misc/vinagre spice
+
+# Alex Fan <alex.fan.q@gmail.com> (2021-12-28)
+# dev-lang/julia doesn't support riscv yet
+sci-mathematics/singular julia
+
+# Alexey Sokolov <alexey+gentoo@asokolov.org> (2012-12-25)
+# Requires dev-qt/qtwebengine
+sci-astronomy/stellarium webengine
+
 # Alex Fan <alex.fan.q@gmail.com> (2021-12-12)
 # dev-python/uvloop fails test #806412
 # but with it installed, anyio passes all tests
diff --git a/profiles/arch/riscv/rv32imac/eapi b/profiles/arch/riscv/rv32imac/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/riscv/rv32imac/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
index 1065af43c9a8..702bf0db5663 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
@@ -1,9 +1,17 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # RISC-V rv32imac/ilp32 no-multilib profile
 
-# We have only one ABI
+CHOST="riscv32-unknown-linux-gnu"
+
 MULTILIB_ABIS="ilp32"
 DEFAULT_ABI="ilp32"
 ABI="ilp32"
+
+LIBDIR_ilp32="lib"
+
+CFLAGS="-O2 -pipe -march=rv32imac -mabi=ilp32"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/riscv/rv32imac/package.mask b/profiles/arch/riscv/rv32imac/ilp32/package.mask
index fae8be793357..fae8be793357 100644
--- a/profiles/arch/riscv/rv32imac/package.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32/package.mask
diff --git a/profiles/arch/riscv/rv32imac/ilp32/package.use.force b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
deleted file mode 100644
index aacc29b1d56e..000000000000
--- a/profiles/arch/riscv/rv32imac/ilp32/package.use.force
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.force b/profiles/arch/riscv/rv32imac/ilp32/use.force
deleted file mode 100644
index 82bb958a577a..000000000000
--- a/profiles/arch/riscv/rv32imac/ilp32/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask b/profiles/arch/riscv/rv32imac/ilp32/use.mask
index 991c792750ad..9779cbad81b5 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask
@@ -1,5 +1,5 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Mask multilib, since we do not want to use it.
-multilib
+# sys-libs/libseccomp has not been ported to rv32 yet
+seccomp
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
index d19b0ba49931..d21fdce62781 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
@@ -1,12 +1,17 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # RISC-V rv32imac/ilp32d no-multilib profile
 
+CHOST="riscv32-unknown-linux-gnu"
+
+MULTILIB_ABIS="ilp32d"
+DEFAULT_ABI="ilp32d"
+ABI="ilp32d"
+
+LIBDIR_ilp32d="lib"
+
 CFLAGS="-O2 -pipe -march=rv32imafdc -mabi=ilp32d"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
-
-# We have only one ABI
-MULTILIB_ABIS="ilp32d"
diff --git a/profiles/arch/riscv/rv32imac/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/package.mask
index 9779cbad81b5..fae8be793357 100644
--- a/profiles/arch/riscv/rv32imac/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32d/package.mask
@@ -1,5 +1,5 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # sys-libs/libseccomp has not been ported to rv32 yet
-seccomp
+sys-libs/libseccomp
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
index d8172baa5f5f..9779cbad81b5 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
@@ -1,5 +1,5 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Mask multilib, since we do not want to use it.
-multilib
+# sys-libs/libseccomp has not been ported to rv32 yet
+seccomp
diff --git a/profiles/arch/riscv/rv32imac/parent b/profiles/arch/riscv/rv32imac/parent
deleted file mode 100644
index 6ee1b9eff10c..000000000000
--- a/profiles/arch/riscv/rv32imac/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../features/multilib
diff --git a/profiles/arch/riscv/rv32imac/use.force b/profiles/arch/riscv/rv32imac/use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv32imac/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/eapi b/profiles/arch/riscv/rv64gc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/riscv/rv64gc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults
index 4aeb573215d2..e811f8eb643a 100644
--- a/profiles/arch/riscv/rv64gc/lp64/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults
@@ -3,12 +3,15 @@
 
 # RISC-V rv64gc/lp64 no-multilib profile
 
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
+CHOST="riscv64-unknown-linux-gnu"
 
-# We have only one ABI
 MULTILIB_ABIS="lp64"
 DEFAULT_ABI="lp64"
 ABI="lp64"
+
+LIBDIR_lp64="lib64"
+
+CFLAGS="-O2 -pipe -march=rv64imac -mabi=lp64"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/riscv/rv64gc/lp64/package.use.force b/profiles/arch/riscv/rv64gc/lp64/package.use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64/package.use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.force b/profiles/arch/riscv/rv64gc/lp64/use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask b/profiles/arch/riscv/rv64gc/lp64/use.mask
deleted file mode 100644
index d8172baa5f5f..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Mask multilib, since we do not want to use it.
-multilib
diff --git a/profiles/arch/riscv/1level/eapi b/profiles/arch/riscv/rv64gc/lp64d-multilib/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/arch/riscv/1level/eapi
+++ b/profiles/arch/riscv/rv64gc/lp64d-multilib/eapi
diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/lp64d-multilib/make.defaults
index e35f63c8d1e1..3546d506abb7 100644
--- a/profiles/arch/riscv/rv64gc/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64d-multilib/make.defaults
@@ -3,7 +3,7 @@
 
 # RISC-V profile for rv64gc multilib
 #
-# This immediate profile is ONLY useful for internal purposes; it can generate
+# This profile is ONLY useful for internal purposes; it can generate
 # stages just fine, but the only "hardware" that can run them is qemu-user ...
 
 CHOST="riscv64-unknown-linux-gnu"
@@ -12,3 +12,6 @@ CHOST="riscv64-unknown-linux-gnu"
 MULTILIB_ABIS="lp64d lp64 ilp32d ilp32"
 DEFAULT_ABI="lp64d"
 ABI="lp64d"
+
+# One-level dir for the default abi
+LIBDIR_lp64d="lib64"
diff --git a/profiles/arch/riscv/rv64gc/lp64d-multilib/parent b/profiles/arch/riscv/rv64gc/lp64d-multilib/parent
new file mode 100644
index 000000000000..d6e19b529616
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64d-multilib/parent
@@ -0,0 +1 @@
+../../../../features/multilib
diff --git a/profiles/arch/riscv/rv64gc/lp64d/make.defaults b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
index f595f6ac4437..80a9bdad63ee 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
@@ -1,12 +1,17 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # RISC-V rv64gc/lp64d no-multilib profile
 
+CHOST="riscv64-unknown-linux-gnu"
+
+MULTILIB_ABIS="lp64d"
+DEFAULT_ABI="lp64d"
+ABI="lp64d"
+
+LIBDIR_lp64d="lib64"
+
 CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64d"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
-
-# We have only one ABI
-MULTILIB_ABIS="lp64d"
diff --git a/profiles/arch/riscv/rv64gc/lp64d/package.use.force b/profiles/arch/riscv/rv64gc/lp64d/package.use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64d/package.use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/lp64d/use.mask b/profiles/arch/riscv/rv64gc/lp64d/use.mask
deleted file mode 100644
index 991c792750ad..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64d/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Mask multilib, since we do not want to use it.
-multilib
diff --git a/profiles/arch/riscv/rv64gc/parent b/profiles/arch/riscv/rv64gc/parent
deleted file mode 100644
index 6ee1b9eff10c..000000000000
--- a/profiles/arch/riscv/rv64gc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../features/multilib
diff --git a/profiles/arch/riscv/rv64gc/use.force b/profiles/arch/riscv/rv64gc/use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/use.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/s390/package.mask b/profiles/arch/s390/package.mask
index 4ec03ac97676..824dc8c81eea 100644
--- a/profiles/arch/s390/package.mask
+++ b/profiles/arch/s390/package.mask
@@ -4,4 +4,4 @@
 # Sam James <sam@gentoo.org> (2021-11-05)
 # Perl segfaults during build on s390(x). Presumably related to
 # now truly respecting CFLAGS. bug #821577
-=dev-lang/perl-5.34.0-r5
+>=dev-lang/perl-5.34.0-r5
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 3c5a79ed8553..0fc4971c703e 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2021-11-05)
@@ -35,11 +35,6 @@ app-arch/rpm test
 # no ceph keyworded
 net-analyzer/rrdtool rados
 
-# Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
-
 # Lars Wendler <polynomial-c@gentoo.org> (2016-11-17)
 # jit not supported on s390
 dev-libs/libpcre2 jit
diff --git a/profiles/arch/s390/s390x/package.use.mask b/profiles/arch/s390/s390x/package.use.mask
index 9d4593ef4b49..9af431104cb5 100644
--- a/profiles/arch/s390/s390x/package.use.mask
+++ b/profiles/arch/s390/s390x/package.use.mask
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # 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?
 dev-libs/libpcre2 jit
-dev-vcs/git pcre-jit
diff --git a/profiles/arch/sparc/64ul/package.use.mask b/profiles/arch/sparc/64ul/package.use.mask
index 343cd157d4d4..cdda3cd66f3b 100644
--- a/profiles/arch/sparc/64ul/package.use.mask
+++ b/profiles/arch/sparc/64ul/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2021-03-20)
@@ -7,10 +7,5 @@
 dev-libs/libpcre jit
 
 # Matt Turner <mattst88@gentoo.org> (2019-08-26)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-<dev-vcs/git-2.31.0 pcre-jit
-
-# Matt Turner <mattst88@gentoo.org> (2019-08-26)
 # jit not supported on sparc64
 dev-libs/libpcre2 jit
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index fec578b5e9ab..f0527a3ac8e4 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,12 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
 # Sam James <sam@gentoo.org> (2021-04-27)
 # Clang and friends aren't (yet?) stable on sparc
 clang
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index b0e644494c6e..3f7965cb15de 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Conrad Kostecki <conikost@gentoo.org> (2021-11-16)
@@ -17,10 +17,6 @@ x11-misc/read-edid -vbe-mode
 # media-libs/webrtc-audio-processing only has amd64 and x86 keywords
 media-video/pipewire -echo-cancel
 
-# Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/tty-editor not keyworded here yet (Bug #807685)
-app-text/htmltidy test
-
 # James Le Cuirot <chewi@gentoo.org> (2021-08-07)
 # The ORBlite scanner plugin only works on amd64 and x86.
 net-print/hplip-plugin -orblite
@@ -31,10 +27,10 @@ net-print/hplip-plugin -orblite
 media-video/obs-studio nvenc
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-17)
-# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
+# media-plugins/gst-plugins-webrtc
 # and media-plugins/zam-plugins not keyworded here
-media-sound/easyeffects rnnoise webrtc zamaudio
-media-sound/pulseeffects rnnoise webrtc zamaudio
+media-sound/easyeffects zamaudio
+media-sound/pulseeffects webrtc zamaudio
 
 # Sam James <sam@gentoo.org> (2021-07-12)
 # Haskell is (only) available on amd64/x86 right now in Gentoo
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 1d2df4a87746..d234bdd14a84 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2022-01-03)
+# no stable media-libs/rnnoise on this arch yet
+media-sound/pulseeffects rnnoise
+
+# Marek Szuba <marecki@gentoo.org> (2022-01-03)
+# no stable dev-ruby/tty-editor on this arch yet
+app-text/htmltidy test
+
 # Joonas Niilola <juippis@gentoo.org> (2021-08-13)
 # dev-libs/efl is stabilized on x86.
 app-crypt/pinentry -efl
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index e0bd80001526..58b15063cd35 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,12 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
 # Sam James <sam@gentoo.org> (2020-11-10)
 # media-gfx/openvdb is not stable on x86
 # ... and has failing tests right now anyway