gentoo auto-resync : 23:03:2024 - 01:00:42

7 files changed, 289 insertions, 275 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 62693fa3e1a3..f8ea52beee1a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index f7d287da3287..b65aebba34ee 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-03-22)
+# Building with qt6 requires (masked) kde-frameworks:6
+app-admin/calamares qt6
+
 # Viorel Munteanu <ceamac@gentoo.org> (2024-03-19)
 # The live version needs a new BDEPEND for doc
 =app-emulation/virtualbox-9999 doc
diff --git a/profiles/default/linux/make.defaults b/profiles/default/linux/make.defaults
index 4e21cd58fdf2..12dd86f25c53 100644
--- a/profiles/default/linux/make.defaults
+++ b/profiles/default/linux/make.defaults
@@ -20,13 +20,10 @@ USE="${USE} seccomp"
 # These USE flags were originally inserted here because of PHP
 # and were later removed by me. Reinserting the USE flags again because they are
 # global USE flags that may be expected to be set by other packages.
-USE="${USE} cli pcre"
-
-# Donnie Berkholz <dberkholz@gentoo.org> (2006-03-07)
-# Modular X: Support direct rendering by default
-# Andreas K. Huettel <dilfridge@gentoo.org> (2013-01-21)
-# Re-added following discussion with chithead
-USE="${USE} dri"
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2024-03-22)
+# Moving cli to 17.0, so it can be unset in 23.0 and this way overridden by
+# use defaults...
+USE="${USE} pcre"
 
 # Luca Barbato <lu_zero@gentoo.org> (2006-10-28)
 # on glibc system you cannot turn it off
diff --git a/profiles/package.mask b/profiles/package.mask
index 024da3dc217e..23ce2c574d70 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Conrad Kostecki <conikost@gentoo.org> (2024-03-22)
+# Stuck on old EAPI6. Last stable release over 10 years ago.
+# Not compatible with PHP8. Removal on 2024-04-22.
+dev-php/onphp
+
+# Conrad Kostecki <conikost@gentoo.org> (2024-03-22)
+# Stuck on old EAPI6. PEAR channel long dead.
+# Removal on 2024-04-22.
+dev-php/mockery
+
+# Conrad Kostecki <conikost@gentoo.org> (2024-03-22)
+# Stuck on old EAPI6. Not compatible with PHP7 and newer.
+# Upstream stopped development.
+# Removal on 2024-04-22.
+dev-php/libchart
+
 # Michał Górny <mgorny@gentoo.org> (2024-03-22)
 # New versions of Hatchling counterintuitively ignore changes
 # to pyproject.toml when PKG-INFO exists (i.e. when unpacking
@@ -694,14 +710,6 @@ www-plugins/gosuslugi-plugin
 # Removal on 2024-03-21.  Bug #924881.
 dev-python/pendulum
 
-# Alfredo Tupone <tupone@gentoo.org> (2024-02-18)
-# Not ported to python3_12
-# Removal on 2024-03-18.
-=sci-libs/pytorch-2.0*
-=sci-libs/caffe2-2.0*
-=sci-libs/pytorch-1*
-=sci-libs/caffe2-1*
-
 # Sam James <sam@gentoo.org> (2024-02-18)
 # Lots of changes, including a port to a new build system. Needs lots of testing.
 =sys-apps/gentoo-functions-1*
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 06a7cad5d516..85bdea555918 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -210,40 +210,40 @@ arm		default/linux/arm/23.0/split-usr/armv7a_hf/desktop/plasma	dev
 
 # ARM64 Profiles
 # @MAINTAINER: arm64@gentoo.org
-arm64		default/linux/arm64/17.0					stable
+arm64		default/linux/arm64/17.0					exp
 arm64		default/linux/arm64/17.0/hardened				exp
-arm64		default/linux/arm64/17.0/hardened/selinux			dev
-arm64		default/linux/arm64/17.0/desktop				stable
-arm64		default/linux/arm64/17.0/desktop/gnome				stable
-arm64		default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr	stable
-arm64		default/linux/arm64/17.0/desktop/plasma				stable
-arm64		default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr	stable
-arm64		default/linux/arm64/17.0/desktop/systemd/merged-usr		stable
+arm64		default/linux/arm64/17.0/hardened/selinux			exp
+arm64		default/linux/arm64/17.0/desktop				exp
+arm64		default/linux/arm64/17.0/desktop/gnome				exp
+arm64		default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr	exp
+arm64		default/linux/arm64/17.0/desktop/plasma				exp
+arm64		default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr	exp
+arm64		default/linux/arm64/17.0/desktop/systemd/merged-usr		exp
 arm64		default/linux/arm64/17.0/developer				exp
-arm64		default/linux/arm64/17.0/systemd/merged-usr			stable
+arm64		default/linux/arm64/17.0/systemd/merged-usr			exp
 arm64		default/linux/arm64/17.0/systemd/selinux/merged-usr		exp
 arm64		default/linux/arm64/17.0/llvm					exp
 arm64		default/linux/arm64/17.0/systemd/llvm/merged-usr		exp
 arm64		default/linux/arm64/23.0					stable
-arm64		default/linux/arm64/23.0/hardened				exp
-arm64		default/linux/arm64/23.0/hardened/selinux			exp
-arm64		default/linux/arm64/23.0/hardened/selinux/systemd		exp
-arm64		default/linux/arm64/23.0/desktop				exp
-arm64		default/linux/arm64/23.0/desktop/gnome				exp
-arm64		default/linux/arm64/23.0/desktop/gnome/systemd			exp
-arm64		default/linux/arm64/23.0/desktop/plasma				exp
-arm64		default/linux/arm64/23.0/desktop/plasma/systemd			exp
-arm64		default/linux/arm64/23.0/desktop/systemd			exp
-arm64		default/linux/arm64/23.0/systemd				exp
-arm64		default/linux/arm64/23.0/llvm					exp
-arm64		default/linux/arm64/23.0/llvm/systemd				exp
-arm64		default/linux/arm64/23.0/split-usr				exp
-arm64		default/linux/arm64/23.0/split-usr/hardened			exp
-arm64		default/linux/arm64/23.0/split-usr/hardened/selinux		exp
-arm64		default/linux/arm64/23.0/split-usr/desktop			exp
-arm64		default/linux/arm64/23.0/split-usr/desktop/gnome		exp
-arm64		default/linux/arm64/23.0/split-usr/desktop/plasma		exp
-arm64		default/linux/arm64/23.0/split-usr/llvm				exp
+arm64		default/linux/arm64/23.0/hardened				dev
+arm64		default/linux/arm64/23.0/hardened/selinux			dev
+arm64		default/linux/arm64/23.0/hardened/selinux/systemd		dev
+arm64		default/linux/arm64/23.0/desktop				stable
+arm64		default/linux/arm64/23.0/desktop/gnome				stable
+arm64		default/linux/arm64/23.0/desktop/gnome/systemd			stable
+arm64		default/linux/arm64/23.0/desktop/plasma				stable
+arm64		default/linux/arm64/23.0/desktop/plasma/systemd			stable
+arm64		default/linux/arm64/23.0/desktop/systemd			stable
+arm64		default/linux/arm64/23.0/systemd				stable
+arm64		default/linux/arm64/23.0/llvm					dev
+arm64		default/linux/arm64/23.0/llvm/systemd				dev
+arm64		default/linux/arm64/23.0/split-usr				stable
+arm64		default/linux/arm64/23.0/split-usr/hardened			dev
+arm64		default/linux/arm64/23.0/split-usr/hardened/selinux		dev
+arm64		default/linux/arm64/23.0/split-usr/desktop			stable
+arm64		default/linux/arm64/23.0/split-usr/desktop/gnome		stable
+arm64		default/linux/arm64/23.0/split-usr/desktop/plasma		stable
+arm64		default/linux/arm64/23.0/split-usr/llvm				dev
 
 
 # ARM64 Profiles (big-endian)
@@ -259,71 +259,71 @@ arm64		default/linux/arm64/23.0/split-usr/big-endian			exp
 
 # HPPA Profiles
 # @MAINTAINER: hppa@gentoo.org
-hppa		default/linux/hppa/17.0						stable
+hppa		default/linux/hppa/17.0						exp
 hppa		default/linux/hppa/17.0/systemd/merged-usr			exp
-hppa		default/linux/hppa/17.0/desktop					stable
+hppa		default/linux/hppa/17.0/desktop					exp
 hppa		default/linux/hppa/17.0/developer				exp
 hppa		default/linux/hppa/23.0/hppa1.1					stable
-hppa		default/linux/hppa/23.0/hppa1.1/systemd				exp
+hppa		default/linux/hppa/23.0/hppa1.1/systemd				stable
 hppa		default/linux/hppa/23.0/hppa1.1/desktop				exp
 hppa		default/linux/hppa/23.0/hppa1.1/desktop/systemd			exp
-hppa		default/linux/hppa/23.0/hppa1.1/split-usr			exp
+hppa		default/linux/hppa/23.0/hppa1.1/split-usr			stable
 hppa		default/linux/hppa/23.0/hppa1.1/split-usr/desktop		exp
-hppa		default/linux/hppa/23.0/hppa2.0					exp
-hppa		default/linux/hppa/23.0/hppa2.0/systemd				exp
+hppa		default/linux/hppa/23.0/hppa2.0					stable
+hppa		default/linux/hppa/23.0/hppa2.0/systemd				stable
 hppa		default/linux/hppa/23.0/hppa2.0/desktop				exp
 hppa		default/linux/hppa/23.0/hppa2.0/desktop/systemd			exp
-hppa		default/linux/hppa/23.0/hppa2.0/split-usr			exp
+hppa		default/linux/hppa/23.0/hppa2.0/split-usr			stable
 hppa		default/linux/hppa/23.0/hppa2.0/split-usr/desktop		exp
 
 
 # IA64 Profiles
 # @MAINTAINER: ia64@gentoo.org
-ia64		default/linux/ia64/17.0						stable
-ia64		default/linux/ia64/17.0/desktop					stable
-ia64		default/linux/ia64/17.0/desktop/gnome				stable
-ia64		default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr	stable
+ia64		default/linux/ia64/17.0						exp
+ia64		default/linux/ia64/17.0/desktop					exp
+ia64		default/linux/ia64/17.0/desktop/gnome				exp
+ia64		default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr	exp
 ia64		default/linux/ia64/17.0/developer				exp
 ia64		default/linux/ia64/17.0/systemd/merged-usr			exp
 ia64		default/linux/ia64/23.0						stable
-ia64		default/linux/ia64/23.0/desktop					exp
-ia64		default/linux/ia64/23.0/desktop/gnome				exp
-ia64		default/linux/ia64/23.0/desktop/gnome/systemd			exp
-ia64		default/linux/ia64/23.0/systemd					exp
-ia64		default/linux/ia64/23.0/split-usr				exp
+ia64		default/linux/ia64/23.0/desktop					stable
+ia64		default/linux/ia64/23.0/desktop/gnome				stable
+ia64		default/linux/ia64/23.0/desktop/gnome/systemd			stable
+ia64		default/linux/ia64/23.0/systemd					stable
+ia64		default/linux/ia64/23.0/split-usr				stable
 ia64		default/linux/ia64/23.0/split-usr/desktop			exp
 ia64		default/linux/ia64/23.0/split-usr/desktop/gnome			exp
 
 
 # LoongArch Profiles
 # @MAINTAINER: loong@gentoo.org
-loong		default/linux/loong/22.0/la64v100/lp64d						stable
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop					stable
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/gnome				dev
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/gnome/systemd			dev
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/gnome/systemd/merged-usr	dev
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/plasma				stable
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/plasma/systemd			stable
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/plasma/systemd/merged-usr	stable
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd				stable
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr		stable
+loong		default/linux/loong/22.0/la64v100/lp64d						exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop					exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/gnome				exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/gnome/systemd			exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/gnome/systemd/merged-usr	exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/plasma				exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/plasma/systemd			exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/plasma/systemd/merged-usr	exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd				exp
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr		exp
 loong		default/linux/loong/22.0/la64v100/lp64d/developer				exp
-loong		default/linux/loong/22.0/la64v100/lp64d/systemd					stable
-loong		default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr			stable
+loong		default/linux/loong/22.0/la64v100/lp64d/systemd					exp
+loong		default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr			exp
 loong		default/linux/loong/23.0/la64v100/lp64d						stable
-loong		default/linux/loong/23.0/la64v100/lp64d/llvm					exp
-loong		default/linux/loong/23.0/la64v100/lp64d/llvm/systemd				exp
-loong		default/linux/loong/23.0/la64v100/lp64d/desktop					exp
-loong		default/linux/loong/23.0/la64v100/lp64d/desktop/gnome				exp
-loong		default/linux/loong/23.0/la64v100/lp64d/desktop/gnome/systemd			exp
-loong		default/linux/loong/23.0/la64v100/lp64d/desktop/plasma				exp
-loong		default/linux/loong/23.0/la64v100/lp64d/desktop/plasma/systemd			exp
-loong		default/linux/loong/23.0/la64v100/lp64d/desktop/systemd				exp
-loong		default/linux/loong/23.0/la64v100/lp64d/systemd					exp
-loong		default/linux/loong/23.0/la64v100/split-usr/lp64d				exp
-loong		default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop			exp
-loong		default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/gnome			exp
-loong		default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/plasma		exp
+loong		default/linux/loong/23.0/la64v100/lp64d/llvm					dev
+loong		default/linux/loong/23.0/la64v100/lp64d/llvm/systemd				dev
+loong		default/linux/loong/23.0/la64v100/lp64d/desktop					stable
+loong		default/linux/loong/23.0/la64v100/lp64d/desktop/gnome				dev
+loong		default/linux/loong/23.0/la64v100/lp64d/desktop/gnome/systemd			dev
+loong		default/linux/loong/23.0/la64v100/lp64d/desktop/plasma				stable
+loong		default/linux/loong/23.0/la64v100/lp64d/desktop/plasma/systemd			stable
+loong		default/linux/loong/23.0/la64v100/lp64d/desktop/systemd				stable
+loong		default/linux/loong/23.0/la64v100/lp64d/systemd					stable
+loong		default/linux/loong/23.0/la64v100/split-usr/lp64d				stable
+loong		default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop			stable
+loong		default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/gnome			dev
+loong		default/linux/loong/23.0/la64v100/split-usr/lp64d/desktop/plasma		stable
 
 
 # M68K Profiles
@@ -334,6 +334,7 @@ m68k		default/linux/m68k/23.0						exp
 m68k		default/linux/m68k/23.0/systemd					exp
 m68k		default/linux/m68k/23.0/split-usr				exp
 
+
 # MIPS Profiles
 # @MAINTAINER: mips@gentoo.org
 mips		default/linux/mips/17.0/o32					exp
@@ -394,6 +395,7 @@ mips		default/linux/mips/23.0/split-usr/n64				exp
 mips		default/linux/mips/23.0/split-usr/multilib/n32			exp
 mips		default/linux/mips/23.0/split-usr/multilib/n64			exp
 
+
 # Deprecated PPC64 Profiles
 # @MAINTAINER: ppc64@gentoo.org
 ppc		default/linux/powerpc/ppc64/17.0/32bit-userland				exp
@@ -402,259 +404,249 @@ ppc		default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome		exp
 ppc		default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd	exp
 ppc		default/linux/powerpc/ppc64/17.0/32bit-userland/developer		exp
 
+
 # PPC profiles
 # @MAINTAINER: gyakovlev@gentoo.org, ppc@gentoo.org, musl@gentoo.org
-ppc		default/linux/ppc/17.0						stable
-ppc		default/linux/ppc/17.0/desktop					stable
-ppc		default/linux/ppc/17.0/desktop/gnome				stable
-ppc		default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr		stable
-ppc		default/linux/ppc/17.0/systemd/merged-usr			stable
+ppc		default/linux/ppc/17.0						exp
+ppc		default/linux/ppc/17.0/desktop					exp
+ppc		default/linux/ppc/17.0/desktop/gnome				exp
+ppc		default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr		exp
+ppc		default/linux/ppc/17.0/systemd/merged-usr			exp
 ppc		default/linux/ppc/17.0/developer				exp
-ppc		default/linux/ppc/17.0/musl					dev
-ppc		default/linux/ppc/17.0/musl/hardened				exp
 ppc		default/linux/ppc/23.0						stable
-ppc		default/linux/ppc/23.0/desktop					exp
-ppc		default/linux/ppc/23.0/desktop/gnome				exp
-ppc		default/linux/ppc/23.0/desktop/gnome/systemd			exp
-ppc		default/linux/ppc/23.0/systemd					exp
-ppc		default/linux/ppc/23.0/musl					exp
-ppc		default/linux/ppc/23.0/musl/hardened				exp
-ppc		default/linux/ppc/23.0/split-usr				exp
-ppc		default/linux/ppc/23.0/split-usr/desktop			exp
-ppc		default/linux/ppc/23.0/split-usr/desktop/gnome			exp
-ppc		default/linux/ppc/23.0/split-usr/musl				exp
-ppc		default/linux/ppc/23.0/split-usr/musl/hardened			exp
+ppc		default/linux/ppc/23.0/desktop					stable
+ppc		default/linux/ppc/23.0/desktop/gnome				stable
+ppc		default/linux/ppc/23.0/desktop/gnome/systemd			stable
+ppc		default/linux/ppc/23.0/systemd					stable
+ppc		default/linux/ppc/23.0/split-usr				stable
+ppc		default/linux/ppc/23.0/split-usr/desktop			stable
+ppc		default/linux/ppc/23.0/split-usr/desktop/gnome			stable
+
 
 # PPC64 profiles
 # @MAINTAINER: gyakovlev@gentoo.org, ppc64@gentoo.org, musl@gentoo.org
-ppc64		default/linux/ppc64/17.0					stable
-ppc64		default/linux/ppc64/17.0/desktop				stable
-ppc64		default/linux/ppc64/17.0/desktop/gnome				stable
-ppc64		default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr	stable
-ppc64		default/linux/ppc64/17.0/systemd/merged-usr			stable
+ppc64		default/linux/ppc64/17.0					exp
+ppc64		default/linux/ppc64/17.0/desktop				exp
+ppc64		default/linux/ppc64/17.0/desktop/gnome				exp
+ppc64		default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr	exp
+ppc64		default/linux/ppc64/17.0/systemd/merged-usr			exp
 ppc64		default/linux/ppc64/17.0/developer				exp
-ppc64		default/linux/ppc64/17.0/musl					dev
-ppc64		default/linux/ppc64/17.0/musl/hardened				exp
 ppc64		default/linux/ppc64/23.0					stable
-ppc64		default/linux/ppc64/23.0/desktop				exp
-ppc64		default/linux/ppc64/23.0/desktop/gnome				exp
-ppc64		default/linux/ppc64/23.0/desktop/gnome/systemd			exp
-ppc64		default/linux/ppc64/23.0/systemd				exp
-ppc64		default/linux/ppc64/23.0/musl					exp
-ppc64		default/linux/ppc64/23.0/musl/hardened				exp
-ppc64		default/linux/ppc64/23.0/split-usr				exp
-ppc64		default/linux/ppc64/23.0/split-usr/desktop			exp
-ppc64		default/linux/ppc64/23.0/split-usr/desktop/gnome		exp
-ppc64		default/linux/ppc64/23.0/split-usr/musl				exp
-ppc64		default/linux/ppc64/23.0/split-usr/musl/hardened		exp
+ppc64		default/linux/ppc64/23.0/desktop				stable
+ppc64		default/linux/ppc64/23.0/desktop/gnome				stable
+ppc64		default/linux/ppc64/23.0/desktop/gnome/systemd			stable
+ppc64		default/linux/ppc64/23.0/systemd				stable
+ppc64		default/linux/ppc64/23.0/split-usr				stable
+ppc64		default/linux/ppc64/23.0/split-usr/desktop			stable
+ppc64		default/linux/ppc64/23.0/split-usr/desktop/gnome		stable
+
 
 # PPC64LE profiles
 # @MAINTAINER: gyakovlev@gentoo.org, ppc64@gentoo.org, musl@gentoo.org
-ppc64		default/linux/ppc64le/17.0					stable
-ppc64		default/linux/ppc64le/17.0/desktop				stable
-ppc64		default/linux/ppc64le/17.0/desktop/gnome			stable
-ppc64		default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr	stable
-ppc64		default/linux/ppc64le/17.0/desktop/plasma			stable
-ppc64		default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr	stable
-ppc64		default/linux/ppc64le/17.0/desktop/systemd/merged-usr		stable
-ppc64		default/linux/ppc64le/17.0/systemd/merged-usr			stable
+ppc64		default/linux/ppc64le/17.0					exp
+ppc64		default/linux/ppc64le/17.0/desktop				exp
+ppc64		default/linux/ppc64le/17.0/desktop/gnome			exp
+ppc64		default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr	exp
+ppc64		default/linux/ppc64le/17.0/desktop/plasma			exp
+ppc64		default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr	exp
+ppc64		default/linux/ppc64le/17.0/desktop/systemd/merged-usr		exp
+ppc64		default/linux/ppc64le/17.0/systemd/merged-usr			exp
 ppc64		default/linux/ppc64le/17.0/developer				exp
-ppc64		default/linux/ppc64le/17.0/musl					dev
-ppc64		default/linux/ppc64le/17.0/musl/hardened			exp
 ppc64		default/linux/ppc64le/17.0/ieee-long-double			exp
 ppc64		default/linux/ppc64le/23.0					stable
-ppc64		default/linux/ppc64le/23.0/desktop				exp
-ppc64		default/linux/ppc64le/23.0/desktop/gnome			exp
-ppc64		default/linux/ppc64le/23.0/desktop/gnome/systemd		exp
-ppc64		default/linux/ppc64le/23.0/desktop/plasma			exp
-ppc64		default/linux/ppc64le/23.0/desktop/plasma/systemd		exp
-ppc64		default/linux/ppc64le/23.0/desktop/systemd			exp
-ppc64		default/linux/ppc64le/23.0/systemd				exp
-ppc64		default/linux/ppc64le/23.0/musl					exp
-ppc64		default/linux/ppc64le/23.0/musl/hardened			exp
-ppc64		default/linux/ppc64le/23.0/split-usr				exp
-ppc64		default/linux/ppc64le/23.0/split-usr/desktop			exp
-ppc64		default/linux/ppc64le/23.0/split-usr/desktop/gnome		exp
-ppc64		default/linux/ppc64le/23.0/split-usr/desktop/plasma		exp
-ppc64		default/linux/ppc64le/23.0/split-usr/musl			exp
-ppc64		default/linux/ppc64le/23.0/split-usr/musl/hardened		exp
+ppc64		default/linux/ppc64le/23.0/desktop				stable
+ppc64		default/linux/ppc64le/23.0/desktop/gnome			stable
+ppc64		default/linux/ppc64le/23.0/desktop/gnome/systemd		stable
+ppc64		default/linux/ppc64le/23.0/desktop/plasma			stable
+ppc64		default/linux/ppc64le/23.0/desktop/plasma/systemd		stable
+ppc64		default/linux/ppc64le/23.0/desktop/systemd			stable
+ppc64		default/linux/ppc64le/23.0/systemd				stable
+ppc64		default/linux/ppc64le/23.0/split-usr				stable
+ppc64		default/linux/ppc64le/23.0/split-usr/desktop			stable
+ppc64		default/linux/ppc64le/23.0/split-usr/desktop/gnome		stable
+ppc64		default/linux/ppc64le/23.0/split-usr/desktop/plasma		stable
+
 
 # RISC-V Profiles
 # @MAINTAINER: riscv@gentoo.org
-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/gnome/systemd/merged-usr	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/plasma/systemd/merged-usr	dev
-riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd			dev
-riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr	dev
-riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd				stable
-riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr		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/gnome/systemd/merged-usr	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/plasma/systemd/merged-usr	dev
-riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd			dev
-riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr		dev
-riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd				stable
-riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr			stable
+riscv		default/linux/riscv/20.0/rv64gc/lp64d					exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop				exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome			exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd		exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr	exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma			exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd		exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr	exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd			exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr	exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd				exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr		exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64					exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop				exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome			exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd		exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr	exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma			exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd		exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr	exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd			exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr		exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd				exp
+riscv		default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr			exp
 riscv		default/linux/riscv/20.0/rv64gc/multilib				exp
 riscv		default/linux/riscv/20.0/rv64gc/multilib/systemd			exp
 riscv		default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr		exp
 riscv		default/linux/riscv/23.0/rv64/lp64d					stable
-riscv		default/linux/riscv/23.0/rv64/lp64d/desktop				exp
-riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/gnome			exp
-riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/systemd		exp
-riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/plasma			exp
-riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/systemd		exp
-riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/systemd			exp
-riscv		default/linux/riscv/23.0/rv64/lp64d/systemd				exp
-riscv		default/linux/riscv/23.0/rv64/lp64					exp
-riscv		default/linux/riscv/23.0/rv64/lp64/desktop				exp
-riscv		default/linux/riscv/23.0/rv64/lp64/desktop/gnome			exp
-riscv		default/linux/riscv/23.0/rv64/lp64/desktop/gnome/systemd		exp
-riscv		default/linux/riscv/23.0/rv64/lp64/desktop/plasma			exp
-riscv		default/linux/riscv/23.0/rv64/lp64/desktop/plasma/systemd		exp
-riscv		default/linux/riscv/23.0/rv64/lp64/desktop/systemd			exp
-riscv		default/linux/riscv/23.0/rv64/lp64/systemd				exp
+riscv		default/linux/riscv/23.0/rv64/lp64d/desktop				dev
+riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/gnome			dev
+riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/gnome/systemd		dev
+riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/plasma			dev
+riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/plasma/systemd		dev
+riscv		default/linux/riscv/23.0/rv64/lp64d/desktop/systemd			dev
+riscv		default/linux/riscv/23.0/rv64/lp64d/systemd				stable
+riscv		default/linux/riscv/23.0/rv64/lp64					stable
+riscv		default/linux/riscv/23.0/rv64/lp64/desktop				dev
+riscv		default/linux/riscv/23.0/rv64/lp64/desktop/gnome			dev
+riscv		default/linux/riscv/23.0/rv64/lp64/desktop/gnome/systemd		dev
+riscv		default/linux/riscv/23.0/rv64/lp64/desktop/plasma			dev
+riscv		default/linux/riscv/23.0/rv64/lp64/desktop/plasma/systemd		dev
+riscv		default/linux/riscv/23.0/rv64/lp64/desktop/systemd			dev
+riscv		default/linux/riscv/23.0/rv64/lp64/systemd				stable
 riscv		default/linux/riscv/23.0/rv64/multilib					exp
 riscv		default/linux/riscv/23.0/rv64/multilib/systemd				exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d				exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop			exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/gnome		exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/plasma		exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64				exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64/desktop			exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/gnome		exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/plasma		exp
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d				stable
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop			dev
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/gnome		dev
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d/desktop/plasma		dev
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64				stable
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64/desktop			dev
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/gnome		dev
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64/desktop/plasma		dev
 riscv		default/linux/riscv/23.0/rv64/split-usr/multilib			exp
 
+
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
-s390		default/linux/s390/17.0						stable
-s390		default/linux/s390/17.0/s390x					stable
-s390		default/linux/s390/17.0/systemd/merged-usr			stable
+s390		default/linux/s390/17.0						exp
+s390		default/linux/s390/17.0/s390x					exp
+s390		default/linux/s390/17.0/systemd/merged-usr			exp
 s390		default/linux/s390/17.0/s390x/systemd/merged-usr		exp
 s390		default/linux/s390/23.0						stable
-s390		default/linux/s390/23.0/systemd					exp
-s390		default/linux/s390/23.0/split-usr				exp
-s390		default/linux/s390/23.0/split-usr/s390x				exp
-s390		default/linux/s390/23.0/s390x					exp
-s390		default/linux/s390/23.0/s390x/systemd				exp
+s390		default/linux/s390/23.0/systemd					dev
+s390		default/linux/s390/23.0/split-usr				dev
+s390		default/linux/s390/23.0/split-usr/s390x				stable
+s390		default/linux/s390/23.0/s390x					stable
+s390		default/linux/s390/23.0/s390x/systemd				stable
+
 
 # SPARC Profiles
 # @MAINTAINER: sparc@gentoo.org
-sparc		default/linux/sparc/17.0					stable
-sparc		default/linux/sparc/17.0/desktop				stable
+sparc		default/linux/sparc/17.0					exp
+sparc		default/linux/sparc/17.0/desktop				exp
 sparc		default/linux/sparc/17.0/developer				exp
-sparc		default/linux/sparc/17.0/systemd/merged-usr			stable
-sparc		default/linux/sparc/17.0/64ul					stable
-sparc		default/linux/sparc/17.0/64ul/desktop				stable
+sparc		default/linux/sparc/17.0/systemd/merged-usr			exp
+sparc		default/linux/sparc/17.0/64ul					exp
+sparc		default/linux/sparc/17.0/64ul/desktop				exp
 sparc		default/linux/sparc/17.0/64ul/developer				exp
-sparc		default/linux/sparc/17.0/64ul/systemd/merged-usr		stable
+sparc		default/linux/sparc/17.0/64ul/systemd/merged-usr		exp
 sparc		default/linux/sparc/23.0					stable
-sparc		default/linux/sparc/23.0/desktop				exp
-sparc		default/linux/sparc/23.0/systemd				exp
-sparc		default/linux/sparc/23.0/64ul					exp
-sparc		default/linux/sparc/23.0/64ul/desktop				exp
-sparc		default/linux/sparc/23.0/64ul/systemd				exp
-sparc		default/linux/sparc/23.0/split-usr				exp
-sparc		default/linux/sparc/23.0/split-usr/desktop			exp
-sparc		default/linux/sparc/23.0/split-usr/64ul				exp
-sparc		default/linux/sparc/23.0/split-usr/64ul/desktop			exp
+sparc		default/linux/sparc/23.0/desktop				dev
+sparc		default/linux/sparc/23.0/systemd				dev
+sparc		default/linux/sparc/23.0/64ul					stable
+sparc		default/linux/sparc/23.0/64ul/desktop				stable
+sparc		default/linux/sparc/23.0/64ul/systemd				stable
+sparc		default/linux/sparc/23.0/split-usr				dev
+sparc		default/linux/sparc/23.0/split-usr/desktop			dev
+sparc		default/linux/sparc/23.0/split-usr/64ul				stable
+sparc		default/linux/sparc/23.0/split-usr/64ul/desktop			stable
+
 
 # x86 Profiles
 # @MAINTAINER: x86@gentoo.org
-x86		default/linux/x86/17.0						stable
-x86		default/linux/x86/17.0/selinux					stable
-x86		default/linux/x86/17.0/hardened					stable
-x86		default/linux/x86/17.0/hardened/selinux				stable
-x86		default/linux/x86/17.0/desktop					stable
-x86		default/linux/x86/17.0/desktop/gnome				stable
-x86		default/linux/x86/17.0/desktop/gnome/systemd/merged-usr		stable
-x86		default/linux/x86/17.0/desktop/plasma				stable
-x86		default/linux/x86/17.0/desktop/plasma/systemd/merged-usr	stable
+x86		default/linux/x86/17.0						exp
+x86		default/linux/x86/17.0/selinux					exp
+x86		default/linux/x86/17.0/hardened					exp
+x86		default/linux/x86/17.0/hardened/selinux				exp
+x86		default/linux/x86/17.0/desktop					exp
+x86		default/linux/x86/17.0/desktop/gnome				exp
+x86		default/linux/x86/17.0/desktop/gnome/systemd/merged-usr		exp
+x86		default/linux/x86/17.0/desktop/plasma				exp
+x86		default/linux/x86/17.0/desktop/plasma/systemd/merged-usr	exp
 x86		default/linux/x86/17.0/developer				exp
-x86		default/linux/x86/17.0/systemd/merged-usr			stable
+x86		default/linux/x86/17.0/systemd/merged-usr			exp
 x86		default/linux/x86/23.0/i686					stable
-x86		default/linux/x86/23.0/i686/systemd				exp
-x86		default/linux/x86/23.0/i686/hardened				exp
-x86		default/linux/x86/23.0/i686/hardened/selinux			exp
-x86		default/linux/x86/23.0/i686/desktop				exp
-x86		default/linux/x86/23.0/i686/desktop/gnome			exp
-x86		default/linux/x86/23.0/i686/desktop/gnome/systemd		exp
-x86		default/linux/x86/23.0/i686/desktop/plasma			exp
-x86		default/linux/x86/23.0/i686/desktop/plasma/systemd		exp
+x86		default/linux/x86/23.0/i686/systemd				stable
+x86		default/linux/x86/23.0/i686/hardened				stable
+x86		default/linux/x86/23.0/i686/hardened/selinux			stable
+x86		default/linux/x86/23.0/i686/desktop				stable
+x86		default/linux/x86/23.0/i686/desktop/gnome			stable
+x86		default/linux/x86/23.0/i686/desktop/gnome/systemd		stable
+x86		default/linux/x86/23.0/i686/desktop/plasma			stable
+x86		default/linux/x86/23.0/i686/desktop/plasma/systemd		stable
 x86		default/linux/x86/23.0/i686/prefix				exp
 x86		default/linux/x86/23.0/i686/prefix/kernel-2.6.32+		exp
 x86		default/linux/x86/23.0/i686/prefix/kernel-2.6.16+		exp
 x86		default/linux/x86/23.0/i686/prefix/kernel-3.2+			exp
-x86		default/linux/x86/23.0/i686/split-usr				exp
-x86		default/linux/x86/23.0/i686/split-usr/hardened			exp
-x86		default/linux/x86/23.0/i686/split-usr/hardened/selinux		exp
-x86		default/linux/x86/23.0/i686/split-usr/desktop			exp
-x86		default/linux/x86/23.0/i686/split-usr/desktop/gnome		exp
-x86		default/linux/x86/23.0/i686/split-usr/desktop/plasma		exp
+x86		default/linux/x86/23.0/i686/split-usr				stable
+x86		default/linux/x86/23.0/i686/split-usr/hardened			stable
+x86		default/linux/x86/23.0/i686/split-usr/hardened/selinux		stable
+x86		default/linux/x86/23.0/i686/split-usr/desktop			stable
+x86		default/linux/x86/23.0/i686/split-usr/desktop/gnome		stable
+x86		default/linux/x86/23.0/i686/split-usr/desktop/plasma		stable
 x86		default/linux/x86/23.0/i686/split-usr/prefix			exp
 x86		default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+	exp
 x86		default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+	exp
 x86		default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+	exp
 x86		default/linux/x86/23.0/i486					stable
-x86		default/linux/x86/23.0/i486/systemd				exp
-x86		default/linux/x86/23.0/i486/hardened				exp
-x86		default/linux/x86/23.0/i486/hardened/selinux			exp
-x86		default/linux/x86/23.0/i486/split-usr				exp
-x86		default/linux/x86/23.0/i486/split-usr/hardened			exp
-x86		default/linux/x86/23.0/i486/split-usr/hardened/selinux		exp
+x86		default/linux/x86/23.0/i486/systemd				stable
+x86		default/linux/x86/23.0/i486/hardened				dev
+x86		default/linux/x86/23.0/i486/hardened/selinux			dev
+x86		default/linux/x86/23.0/i486/split-usr				dev
+x86		default/linux/x86/23.0/i486/split-usr/hardened			dev
+x86		default/linux/x86/23.0/i486/split-usr/hardened/selinux		dev
+
 
 # musl profiles
 # @MAINTAINER: musl@gentoo.org
-amd64		default/linux/amd64/17.0/musl					dev
+amd64		default/linux/amd64/17.0/musl					exp
 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
-amd64		default/linux/amd64/23.0/musl					exp
+amd64		default/linux/amd64/23.0/musl					dev
 amd64		default/linux/amd64/23.0/musl/llvm				exp
 amd64		default/linux/amd64/23.0/musl/hardened				exp
 amd64		default/linux/amd64/23.0/musl/hardened/selinux			exp
-amd64		default/linux/amd64/23.0/split-usr/musl				exp
+amd64		default/linux/amd64/23.0/split-usr/musl				dev
 amd64		default/linux/amd64/23.0/split-usr/musl/llvm			exp
 amd64		default/linux/amd64/23.0/split-usr/musl/hardened		exp
 amd64		default/linux/amd64/23.0/split-usr/musl/hardened/selinux	exp
-arm		default/linux/arm/17.0/musl/armv6j				dev
+arm		default/linux/arm/17.0/musl/armv6j				exp
 arm		default/linux/arm/17.0/musl/armv6j/hardened			exp
 arm		default/linux/arm/17.0/musl/armv6j/hardened/selinux		exp
-arm		default/linux/arm/17.0/musl/armv7a				dev
+arm		default/linux/arm/17.0/musl/armv7a				exp
 arm		default/linux/arm/17.0/musl/armv7a/hardened			exp
 arm		default/linux/arm/17.0/musl/armv7a/hardened/selinux		exp
-arm		default/linux/arm/23.0/armv6j_hf/musl				exp
+arm		default/linux/arm/23.0/armv6j_hf/musl				dev
 arm		default/linux/arm/23.0/armv6j_hf/musl/hardened			exp
 arm		default/linux/arm/23.0/armv6j_hf/musl/hardened/selinux		exp
-arm		default/linux/arm/23.0/armv7a_hf/musl				exp
+arm		default/linux/arm/23.0/armv7a_hf/musl				dev
 arm		default/linux/arm/23.0/armv7a_hf/musl/hardened			exp
 arm		default/linux/arm/23.0/armv7a_hf/musl/hardened/selinux		exp
-arm		default/linux/arm/23.0/split-usr/armv6j_hf/musl			exp
+arm		default/linux/arm/23.0/split-usr/armv6j_hf/musl			dev
 arm		default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened	exp
 arm		default/linux/arm/23.0/split-usr/armv6j_hf/musl/hardened/selinux	exp
-arm		default/linux/arm/23.0/split-usr/armv7a_hf/musl			exp
+arm		default/linux/arm/23.0/split-usr/armv7a_hf/musl			dev
 arm		default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened		exp
 arm		default/linux/arm/23.0/split-usr/armv7a_hf/musl/hardened/selinux	exp
-arm64		default/linux/arm64/17.0/musl					dev
+arm64		default/linux/arm64/17.0/musl					exp
 arm64		default/linux/arm64/17.0/musl/llvm				exp
 arm64		default/linux/arm64/17.0/musl/hardened				exp
 arm64		default/linux/arm64/17.0/musl/hardened/selinux			exp
-arm64		default/linux/arm64/23.0/musl					exp
+arm64		default/linux/arm64/23.0/musl					dev
 arm64		default/linux/arm64/23.0/musl/llvm				exp
 arm64		default/linux/arm64/23.0/musl/hardened				exp
 arm64		default/linux/arm64/23.0/musl/hardened/selinux			exp
-arm64		default/linux/arm64/23.0/split-usr/musl				exp
+arm64		default/linux/arm64/23.0/split-usr/musl				dev
 arm64		default/linux/arm64/23.0/split-usr/musl/llvm			exp
 arm64		default/linux/arm64/23.0/split-usr/musl/hardened		exp
 arm64		default/linux/arm64/23.0/split-usr/musl/hardened/selinux	exp
@@ -673,21 +665,39 @@ mips		default/linux/mips/23.0/split-usr/mipsel/o32/musl		exp
 mips		default/linux/mips/23.0/split-usr/mipsel/n64/musl		exp
 mips		default/linux/mips/23.0/split-usr/o32/musl			exp
 mips		default/linux/mips/23.0/split-usr/n64/musl			exp
-riscv		default/linux/riscv/20.0/rv64gc/lp64d/musl			dev
-riscv		default/linux/riscv/20.0/rv64gc/lp64/musl			dev
-riscv		default/linux/riscv/23.0/rv64/lp64d/musl			exp
-riscv		default/linux/riscv/23.0/rv64/lp64/musl				exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d/musl		exp
-riscv		default/linux/riscv/23.0/rv64/split-usr/lp64/musl		exp
-x86		default/linux/x86/17.0/musl					dev
+ppc		default/linux/ppc/17.0/musl					exp
+ppc		default/linux/ppc/17.0/musl/hardened				exp
+ppc		default/linux/ppc/23.0/musl					dev
+ppc		default/linux/ppc/23.0/musl/hardened				exp
+ppc		default/linux/ppc/23.0/split-usr/musl				dev
+ppc		default/linux/ppc/23.0/split-usr/musl/hardened			exp
+ppc64		default/linux/ppc64/17.0/musl					exp
+ppc64		default/linux/ppc64/17.0/musl/hardened				exp
+ppc64		default/linux/ppc64/23.0/musl					dev
+ppc64		default/linux/ppc64/23.0/musl/hardened				exp
+ppc64		default/linux/ppc64/23.0/split-usr/musl				dev
+ppc64		default/linux/ppc64/23.0/split-usr/musl/hardened		exp
+ppc64		default/linux/ppc64le/17.0/musl					exp
+ppc64		default/linux/ppc64le/17.0/musl/hardened			exp
+ppc64		default/linux/ppc64le/23.0/musl					dev
+ppc64		default/linux/ppc64le/23.0/musl/hardened			exp
+ppc64		default/linux/ppc64le/23.0/split-usr/musl			dev
+ppc64		default/linux/ppc64le/23.0/split-usr/musl/hardened		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/23.0/rv64/lp64d/musl			dev
+riscv		default/linux/riscv/23.0/rv64/lp64/musl				dev
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64d/musl		dev
+riscv		default/linux/riscv/23.0/rv64/split-usr/lp64/musl		dev
+x86		default/linux/x86/17.0/musl					exp
 x86		default/linux/x86/17.0/musl/selinux				exp
-x86		default/linux/x86/23.0/i686/musl				exp
+x86		default/linux/x86/23.0/i686/musl				dev
 x86		default/linux/x86/23.0/i686/musl/selinux			exp
-x86		default/linux/x86/23.0/i686/split-usr/musl			exp
+x86		default/linux/x86/23.0/i686/split-usr/musl			dev
 x86		default/linux/x86/23.0/i686/split-usr/musl/selinux		exp
-x86		default/linux/x86/23.0/i486/musl				exp
+x86		default/linux/x86/23.0/i486/musl				dev
 x86		default/linux/x86/23.0/i486/musl/selinux			exp
-x86		default/linux/x86/23.0/i486/split-usr/musl			exp
+x86		default/linux/x86/23.0/i486/split-usr/musl			dev
 x86		default/linux/x86/23.0/i486/split-usr/musl/selinux		exp
 
 
diff --git a/profiles/releases/17.0/make.defaults b/profiles/releases/17.0/make.defaults
index f2e63d883298..033d62626f91 100644
--- a/profiles/releases/17.0/make.defaults
+++ b/profiles/releases/17.0/make.defaults
@@ -2,4 +2,5 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # make sure toolchain has sane defaults <toolchain@gentoo.org>
-USE="${USE} fortran openmp"
+# move cli and dri here from default/linux
+USE="${USE} cli dri fortran openmp"
diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults
index 7d96215e456e..9680364430cf 100644
--- a/profiles/releases/23.0/make.defaults
+++ b/profiles/releases/23.0/make.defaults
@@ -10,12 +10,6 @@ USE="lzma zstd"
 # make sure toolchain has sane defaults <toolchain@gentoo.org>
 USE="${USE} openmp"
 
-# bug 831045
-USE="${USE} -cli"
-
-# bug 849875
-USE="${USE} -dri"
-
 # bug 818376 (only on specific arches)
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"