9 files changed, 36 insertions, 6 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 53b7d9420ed2..7faf3d80a7d8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 8b3916f24493..c25fc2368777 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# WANG Xuerui <xen0n@gentoo.org> (2022-10-07)
+# sys-libs/libsmbios is available here.
+app-laptop/pbbuttonsd -macbook
+sys-apps/fwupd -dell
+
 # Alfredo Tupone <tupone@gentoo.org> (2022-08-30)
 # ada bootstrap currently only available on amd64/x86
 sys-devel/gcc -ada
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index f2c917613122..9f6f97a22618 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WANG Xuerui <xen0n@gentoo.org> (2022-10-07)
+# sys-libs/libsmbios unavailable on most arches (requires the very low-level
+# <sys/io.h> header that is only ever present on alpha, amd64, ia64 and x86),
+# only unmask on relevant arches.
+# bug #875830
+app-laptop/pbbuttonsd macbook
+sys-apps/fwupd dell
+
 # Conrad Kostecki <conikost@gentoo.org> (2022-07-19)
 # www-servers/nginx requires keywording
 www-servers/nginx nginx_modules_http_security
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index a54a8f826041..4d3bbd739f61 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -123,7 +123,7 @@ net-irc/quassel urlpreview
 net-analyzer/suricata hyperscan
 
 # Yixun Lan <dlan@gentoo.org> (2021-08-29)
-#  sys-apps/fwupd not tested, USE=spi,uefi,dell
+# sys-apps/fwupd not tested, USE=spi,uefi
 sys-apps/fwupd spi uefi
 
 # Marek Szuba <marecki@gentoo.org> (2021-08-23)
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 00ea2c232625..a5789fc65f75 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WANG Xuerui <xen0n@gentoo.org> (2022-10-07)
+# sys-libs/libsmbios is available here.
+app-laptop/pbbuttonsd -macbook
+sys-apps/fwupd -dell
+
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-08-09)
 # dev-java/jaxws-api not keyworded
 >=dev-java/jmock-2.12.0 test
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 173ed23b289a..1a4ba5711826 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,13 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2022-08-07)
+# media-sound/rplay is masked for removal.
+x11-wm/fvwm3 rplay
+x11-wm/ctwm rplay
+x11-wm/fvwm rplay
+x11-wm/vtwm rplay
+
 # Viorel Munteanu <ceamac.paragon@gmail.com> (2022-10-07)
 # Cannot test and fix pax-kernel related bugs on a current grsec kernel
 # Mask the flag for now
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 6da1b547609d..ae5446930a55 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -23,11 +23,6 @@ sci-electronics/kicad ngspice
 # app-text/pandoc is not stable
 app-text/nuspell doc
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-05-05)
-# fop[test] depends on mockito:4, which is not yet stable (bug #727504),
-# and itself blocked by libffi stabilization (bug #813756).
-dev-java/fop test
-
 # Sam James <sam@gentoo.org> (2022-02-11)
 # Needs glibc-2.35(?) (or <2.34) which is not yet even keyworded but
 # won't be stable for a while. Can be unmasked then.
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 73cf842b502d..2ed6186c95b2 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -79,4 +79,5 @@ ros-meta/ros_comm
 sci-geosciences/gnome-maps
 >=sys-apps/bat-0.18.1
 virtual/rust
+www-apps/radicale
 >=x11-themes/adwaita-icon-theme-3.36
diff --git a/profiles/package.mask b/profiles/package.mask
index 869f11e9c9d1..8c2cd9f81a8f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-10-07)
+# Ancient K&R C codebase which fails to compile with modern Clang; surface
+# level fixes are doable, but then get into various dangerous constructs
+# in the async code which is non-trivial to port to modern compilers.
+# bug #731070, bug #802108, bug #875164.
+# Use media-sound/mpd if looking for a modern alternative. Removal on 2022-11-07.
+media-sound/rplay
+
 # Mike Gilbert <floppym@gentoo.org> (2022-10-05)
 # Implements the obsolete BOOTP protocol; use DHCP instead.
 # No activity upstream for over two decades.
@@ -488,6 +496,7 @@ net-libs/libsoup:3.0
 net-libs/rest:1.0
 net-libs/uhttpmock:1.0
 net-libs/webkit-gtk:4.1
+net-libs/webkit-gtk:5
 >=net-misc/rygel-0.42
 sci-geosciences/geocode-glib:2
 >=sci-geosciences/gnome-maps-43