gentoo resync : 04.01.2022

3 files changed, 12 insertions, 15 deletions

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