9 files changed, 24 insertions, 9 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5b7164a5b8d4..0ad0c36ab84e 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 5e1dd355a774..f430ba409c29 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -180,7 +180,7 @@ gnome-base/nautilus previewer
 # needs libgdata[gnome-online-accounts], depends on net-libs/webkit-gtk
 gnome-base/gvfs google
 # needs app-text/libgepub which depends on webkit-gtk
-xfce-extra/tumbler epub
+xfce-base/tumbler epub
 
 # Michał Górny <mgorny@gentoo.org> (2020-06-14)
 # Requires dev-python/networkx.
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index d0252e32de15..db6b6881c340 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -181,7 +181,7 @@ gnome-base/nautilus previewer
 # - net-libs/gnome-online-accounts: depends on webkit-gtk
 gnome-base/gvfs google
 # app-text/libgepub depends on webkit-gtk.
-xfce-extra/tumbler epub
+xfce-base/tumbler epub
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-03-15)
 # Mask USE=libtesseract, app-text/tesseract is not keyworded
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 26e504e5b907..226d7b004f97 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -147,7 +147,7 @@ net-libs/webkit-gtk gamepad
 
 # Joonas Niilola <juippis@gentoo.org> (2020-11-16)
 # app-text/libgepub not yet keyworded on this arch. #754762
-xfce-extra/tumbler epub
+xfce-base/tumbler epub
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
 # app-i18n/fcitx:4 not keyworded.
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 63b5e5671e7d..2238d696f8e2 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -7,9 +7,12 @@
 dev-db/pgbouncer
 dev-libs/cgreen
 media-sound/xwax
+net-analyzer/gsad
+net-analyzer/gvm
 net-analyzer/gvmd
 net-analyzer/gvm-libs
 net-analyzer/openvas-scanner
+net-analyzer/ospd-openvas
 net-misc/grive
 net-print/pnm2ppa
 net-wireless/neard
@@ -171,6 +174,9 @@ sys-block/hpssacli
 sys-block/megacli
 sys-power/dptfxtract
 www-apps/chromedriver-bin
+www-apps/grafana-bin
+www-apps/jellyfin
+www-apps/kibana-bin
 www-client/chromium-bin
 www-client/google-chrome
 www-client/google-chrome-beta
diff --git a/profiles/package.mask b/profiles/package.mask
index 34524f4dd5b0..8f95c378606d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,6 +34,12 @@
 #--- END OF EXAMPLES ---
 
 # Michał Górny <mgorny@gentoo.org> (2022-10-08)
+# Repository and SRC_URI gone.  Last release in 2012 (guessing
+# by filename).
+# Removal on 2022-11-07.  Bug #876151.
+xfce-extra/transd
+
+# Michał Górny <mgorny@gentoo.org> (2022-10-08)
 # This package is not really required for anything, as it being missing
 # only disables enforcing install_requires.  At the same time, it being
 # installed causes unexpected verbose output that randomly breaks more
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index d5338d2db472..5cd8f03c92a3 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -325,7 +325,7 @@ x86		default/linux/x86/17.0/systemd/merged-usr			dev
 
 # musl profiles
 # @MAINTAINER: musl@gentoo.org
-amd64		default/linux/amd64/17.0/musl				exp
+amd64		default/linux/amd64/17.0/musl				dev
 amd64		default/linux/amd64/17.0/musl/clang			exp
 amd64		default/linux/amd64/17.0/musl/hardened			exp
 amd64		default/linux/amd64/17.0/musl/hardened/selinux		exp
@@ -342,8 +342,8 @@ mips		default/linux/mips/17.0/musl/o32			exp
 mips		default/linux/mips/17.0/musl/n64			exp
 mips		default/linux/mips/17.0/musl/mipsel/o32			exp
 mips		default/linux/mips/17.0/musl/mipsel/n64			exp
-riscv		default/linux/riscv/20.0/rv64gc/lp64d/musl		exp
-riscv		default/linux/riscv/20.0/rv64gc/lp64/musl		exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/musl		dev
+riscv		default/linux/riscv/20.0/rv64gc/lp64/musl		dev
 x86		default/linux/x86/17.0/musl				exp
 x86		default/linux/x86/17.0/musl/selinux			exp
 
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 6561c40ede22..544205da5752 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -20,3 +20,6 @@ move mail-mta/protonmail-bridge mail-mta/proton-mail-bridge
 move app-emulation/distrobox app-containers/distrobox
 move www-servers/tornado dev-python/tornado
 move dev-python/path-py dev-python/path
+move xfce-extra/thunar-volman xfce-base/thunar-volman
+move xfce-extra/tumbler xfce-base/tumbler
+move xfce-extra/xfce4-power-manager xfce-base/xfce4-power-manager
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f634b9b8ac4c..aaeaf585c6dd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -9142,16 +9142,16 @@ x11-wm/xpra:xdg - Enable support for XDG-based menus
 xfce-base/libxfce4ui:glade - Build support for Glade 3's GtkBuilder implementation
 xfce-base/libxfce4ui:system-info - Enable system information in xfce4-about.
 xfce-base/thunar:trash-panel-plugin - Build the trash status indicator plugin for the XFCE panel
+xfce-base/tumbler:epub - Enable support for .epub thumbnailer using app-text/libgepub
+xfce-base/tumbler:odf - Enable support for .odf thumbnailers by using gnome-extra/libgsf
 xfce-base/xfce4-panel:dbusmenu - Enable dev-libs/libdbusmenu integration (in status notifier plugin)
+xfce-base/xfce4-power-manager:panel-plugin - Build the power management plugin for the XFCE panel
 xfce-base/xfce4-settings:libcanberra - Enable sound event support using media-libs/libcanberra
 xfce-base/xfce4-settings:xklavier - Enable keyboard layout selection support using x11-libs/libxklavier
 xfce-base/xfdesktop:thunar - Build support for desktop icons (for example, launchers and folders)
 xfce-base/xfwm4:xpresent - Enable the XPresent extension for sync to vblank
-xfce-extra/tumbler:epub - Enable support for .epub thumbnailer using app-text/libgepub
-xfce-extra/tumbler:odf - Enable support for .odf thumbnailers by using gnome-extra/libgsf
 xfce-extra/xfce4-clipman-plugin:qrcode - Enable support for media-gfx/qrencode
 xfce-extra/xfce4-mpc-plugin:libmpd - Build using media-libs/libmpd backend, instead of native fallback which is preferred
-xfce-extra/xfce4-power-manager:panel-plugin - Build the power management plugin for the XFCE panel
 xfce-extra/xfce4-pulseaudio-plugin:keybinder - Enable support for global hotkeys using dev-libs/keybinder.
 xfce-extra/xfce4-pulseaudio-plugin:libcanberra - Enable sound event support using media-libs/libcanberra
 xfce-extra/xfce4-pulseaudio-plugin:wnck - Enable experimental support for raising media player windows using x11-libs/libwnck.