summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-03 22:19:54 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-03 22:19:54 +0100
commit71f9cc21aab4168093940b3d2e267444d712bff5 (patch)
tree15406e14be0cd3cfbafe191468b8825b3ccc1855 /profiles
parent312456186919deebd1ea3b34b9e26b1e15ebd5b6 (diff)
gentoo auto-resync : 03:09:2022 - 22:19:54
Diffstat (limited to 'profiles')
-rw-r--r--profiles/Manifest.gzbin148263 -> 152867 bytes
-rw-r--r--profiles/arch/amd64/package.use.force3
-rw-r--r--profiles/arch/amd64/package.use.stable.mask2
-rw-r--r--profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/alpha/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/amd64/17.1/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/arm64/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/hppa/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/ia64/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/m68k/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/ppc/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/s390/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/s390/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/sparc/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent2
-rw-r--r--profiles/default/linux/x86/17.0/systemd/merged-usr/eapi1
-rw-r--r--profiles/default/linux/x86/17.0/systemd/merged-usr/parent2
-rw-r--r--profiles/features/merged-usr/eapi1
-rw-r--r--profiles/features/merged-usr/make.defaults3
-rw-r--r--profiles/features/merged-usr/use.force3
-rw-r--r--profiles/features/merged-usr/use.mask3
-rw-r--r--profiles/license_groups2
-rw-r--r--profiles/profiles.desc340
-rw-r--r--profiles/use.local.desc8
116 files changed, 378 insertions, 146 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4dc97ffa2af7..67c5f5659a63 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index f0dab08c2bec..6e5b80dfe50c 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -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
# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
@@ -22,6 +22,7 @@ dev-lang/rust llvm_targets_X86
# Packages with optional 64-bit variant
app-emulation/wine-vanilla -abi_x86_64
app-emulation/wine-staging -abi_x86_64
+app-emulation/wine-proton -abi_x86_64
virtual/wine -abi_x86_64
# Michał Górny <mgorny@gentoo.org> (2017-04-08)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index e4d678e532c0..875a20d93645 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -85,7 +85,7 @@ net-misc/chrony html
# Adam Feldman <NP-Hardass@gentoo.org> (2017-09-27)
# patchset variants are not stable
-virtual/wine staging
+virtual/wine proton staging
# Tim Harder <radhermit@gentoo.org> (2017-09-11)
# Pulls in dev-ruby/asciidoctor which has too large of a ruby testing
diff --git a/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi b/profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/alpha/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/alpha/17.0/systemd/merged-usr/parent b/profiles/default/linux/alpha/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/alpha/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/no-multilib/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.1/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.1/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/amd64/17.1/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv4t/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv5te/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv6j/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..5e9458ce54b8
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent
new file mode 100644
index 000000000000..5e9458ce54b8
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/armv7a/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/arm64/17.0/systemd/merged-usr/parent b/profiles/default/linux/arm64/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/arm64/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi b/profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/hppa/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/hppa/17.0/systemd/merged-usr/parent b/profiles/default/linux/hppa/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/hppa/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ia64/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent b/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/ia64/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent
new file mode 100644
index 000000000000..5e9458ce54b8
--- /dev/null
+++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi b/profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/m68k/17.0/systemd/merged-usr/parent b/profiles/default/linux/m68k/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent
new file mode 100644
index 000000000000..5e9458ce54b8
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/n64/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..5e9458ce54b8
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc32/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..05b6f4918b26
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/32bit-userland/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..05b6f4918b26
--- /dev/null
+++ b/profiles/default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc/17.0/systemd/merged-usr/parent b/profiles/default/linux/ppc/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/ppc/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..05b6f4918b26
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent
new file mode 100644
index 000000000000..05b6f4918b26
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent
new file mode 100644
index 000000000000..5e9458ce54b8
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..05b6f4918b26
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent
new file mode 100644
index 000000000000..05b6f4918b26
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent
new file mode 100644
index 000000000000..5e9458ce54b8
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/s390/17.0/s390x/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/s390/17.0/systemd/merged-usr/eapi b/profiles/default/linux/s390/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/s390/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/s390/17.0/systemd/merged-usr/parent b/profiles/default/linux/s390/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/s390/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/64ul/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi b/profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/sparc/17.0/systemd/merged-usr/parent b/profiles/default/linux/sparc/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/sparc/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/desktop/gnome/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/x86/17.0/systemd/merged-usr/eapi b/profiles/default/linux/x86/17.0/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/systemd/merged-usr/parent b/profiles/default/linux/x86/17.0/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c407ca65bdc2
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/merged-usr
diff --git a/profiles/features/merged-usr/eapi b/profiles/features/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/features/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/features/merged-usr/make.defaults b/profiles/features/merged-usr/make.defaults
new file mode 100644
index 000000000000..f6b244c0bf14
--- /dev/null
+++ b/profiles/features/merged-usr/make.defaults
@@ -0,0 +1,3 @@
+# Mike Gilbert <floppym@gentoo.org> (2022-08-31)
+# Avoid removing merged-usr symlinks.
+UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /bin /lib /lib32 /lib64 /libx32 /sbin /usr/sbin"
diff --git a/profiles/features/merged-usr/use.force b/profiles/features/merged-usr/use.force
new file mode 100644
index 000000000000..ccf6210af230
--- /dev/null
+++ b/profiles/features/merged-usr/use.force
@@ -0,0 +1,3 @@
+# Mike Gilbert <floppym@gentoo.org> (2022-08-30)
+# Un-force split-usr.
+-split-usr
diff --git a/profiles/features/merged-usr/use.mask b/profiles/features/merged-usr/use.mask
new file mode 100644
index 000000000000..4d844aa3ab3c
--- /dev/null
+++ b/profiles/features/merged-usr/use.mask
@@ -0,0 +1,3 @@
+# Mike Gilbert <floppym@gentoo.org> (2022-08-30)
+# Mask split-usr.
+split-usr
diff --git a/profiles/license_groups b/profiles/license_groups
index 7d2c6419fa84..9a620c661f4d 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -23,7 +23,7 @@ FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4
# Licenses approved by the Open Source Initiative
# https://www.opensource.org/licenses
# Note that the FSF lists these as nonfree: Artistic NOSA Watcom-1.0
-OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MirOS MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL
+OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MirOS MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat Unicode-DFS-2016 UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL
# Misc licenses that are probably free software, i.e. follow the
# Free Software Definition at https://www.gnu.org/philosophy/free-sw.html
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 894b0377d33e..0eea8fad935b 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -7,40 +7,47 @@
# DO NOT ADD PROFILES WITH A "die" or "exit" IN THEM OR IT KILLS REPOMAN
#
#layout:
-#arch profile_directory status
+#arch profile_directory status
# Alpha Profiles
# @MAINTAINER: alpha@gentoo.org
-alpha default/linux/alpha/17.0 exp
-alpha default/linux/alpha/17.0/systemd exp
-alpha default/linux/alpha/17.0/desktop exp
-alpha default/linux/alpha/17.0/desktop/gnome exp
-alpha default/linux/alpha/17.0/desktop/gnome/systemd exp
-alpha default/linux/alpha/17.0/developer exp
+alpha default/linux/alpha/17.0 exp
+alpha default/linux/alpha/17.0/systemd exp
+alpha default/linux/alpha/17.0/systemd/merged-usr exp
+alpha default/linux/alpha/17.0/desktop exp
+alpha default/linux/alpha/17.0/desktop/gnome exp
+alpha default/linux/alpha/17.0/desktop/gnome/systemd exp
+alpha default/linux/alpha/17.0/desktop/gnome/systemd/merged-usr exp
+alpha default/linux/alpha/17.0/developer exp
# SYMLINK_LIB=no profiles
# Run app-portage/unsymlink-lib *before* switching the profile.
# @MAINTAINER: mgorny@gentoo.org
-amd64 default/linux/amd64/17.1 stable
-amd64 default/linux/amd64/17.1/selinux stable
-amd64 default/linux/amd64/17.1/hardened stable
-amd64 default/linux/amd64/17.1/hardened/selinux stable
-amd64 default/linux/amd64/17.1/desktop stable
-amd64 default/linux/amd64/17.1/desktop/gnome stable
-amd64 default/linux/amd64/17.1/desktop/gnome/systemd stable
-amd64 default/linux/amd64/17.1/desktop/plasma stable
-amd64 default/linux/amd64/17.1/desktop/plasma/systemd stable
-amd64 default/linux/amd64/17.1/desktop/systemd stable
-amd64 default/linux/amd64/17.1/developer exp
-amd64 default/linux/amd64/17.1/no-multilib stable
-amd64 default/linux/amd64/17.1/no-multilib/hardened stable
-amd64 default/linux/amd64/17.1/no-multilib/hardened/selinux stable
-amd64 default/linux/amd64/17.1/no-multilib/systemd dev
-amd64 default/linux/amd64/17.1/no-multilib/systemd/selinux exp
-amd64 default/linux/amd64/17.1/systemd stable
-amd64 default/linux/amd64/17.1/systemd/selinux exp
-amd64 default/linux/amd64/17.1/clang exp
-amd64 default/linux/amd64/17.1/systemd/clang exp
+amd64 default/linux/amd64/17.1 stable
+amd64 default/linux/amd64/17.1/selinux stable
+amd64 default/linux/amd64/17.1/hardened stable
+amd64 default/linux/amd64/17.1/hardened/selinux stable
+amd64 default/linux/amd64/17.1/desktop stable
+amd64 default/linux/amd64/17.1/desktop/gnome stable
+amd64 default/linux/amd64/17.1/desktop/gnome/systemd stable
+amd64 default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr dev
+amd64 default/linux/amd64/17.1/desktop/plasma stable
+amd64 default/linux/amd64/17.1/desktop/plasma/systemd stable
+amd64 default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr dev
+amd64 default/linux/amd64/17.1/desktop/systemd stable
+amd64 default/linux/amd64/17.1/desktop/systemd/merged-usr dev
+amd64 default/linux/amd64/17.1/developer exp
+amd64 default/linux/amd64/17.1/no-multilib stable
+amd64 default/linux/amd64/17.1/no-multilib/hardened stable
+amd64 default/linux/amd64/17.1/no-multilib/hardened/selinux stable
+amd64 default/linux/amd64/17.1/no-multilib/systemd dev
+amd64 default/linux/amd64/17.1/no-multilib/systemd/merged-usr dev
+amd64 default/linux/amd64/17.1/no-multilib/systemd/selinux exp
+amd64 default/linux/amd64/17.1/systemd stable
+amd64 default/linux/amd64/17.1/systemd/merged-usr dev
+amd64 default/linux/amd64/17.1/systemd/selinux exp
+amd64 default/linux/amd64/17.1/clang exp
+amd64 default/linux/amd64/17.1/systemd/clang exp
# AMD64 Profiles
# @MAINTAINER: amd64@gentoo.org
@@ -62,64 +69,78 @@ amd64 default/linux/amd64/17.0/x32 dev
# ARM Profiles
# @MAINTAINER: arm@gentoo.org
-arm default/linux/arm/17.0 stable
-arm default/linux/arm/17.0/desktop dev
-arm default/linux/arm/17.0/desktop/gnome dev
-arm default/linux/arm/17.0/desktop/gnome/systemd dev
-arm default/linux/arm/17.0/desktop/plasma dev
-arm default/linux/arm/17.0/desktop/plasma/systemd dev
-arm default/linux/arm/17.0/developer exp
-arm default/linux/arm/17.0/armv4 dev
-arm default/linux/arm/17.0/armv4/desktop dev
-arm default/linux/arm/17.0/armv4/desktop/gnome dev
-arm default/linux/arm/17.0/armv4/desktop/plasma dev
-arm default/linux/arm/17.0/armv4/developer exp
-arm default/linux/arm/17.0/armv4t dev
-arm default/linux/arm/17.0/armv4t/desktop dev
-arm default/linux/arm/17.0/armv4t/desktop/gnome dev
-arm default/linux/arm/17.0/armv4t/desktop/plasma dev
-arm default/linux/arm/17.0/armv4t/developer exp
-arm default/linux/arm/17.0/armv4t/systemd dev
-arm default/linux/arm/17.0/armv5te dev
-arm default/linux/arm/17.0/armv5te/desktop dev
-arm default/linux/arm/17.0/armv5te/desktop/gnome dev
-arm default/linux/arm/17.0/armv5te/desktop/plasma dev
-arm default/linux/arm/17.0/armv5te/developer exp
-arm default/linux/arm/17.0/armv5te/systemd dev
-arm default/linux/arm/17.0/armv6j stable
-arm default/linux/arm/17.0/armv6j/hardened exp
-arm default/linux/arm/17.0/armv7a/hardened/selinux exp
-arm default/linux/arm/17.0/armv6j/desktop dev
-arm default/linux/arm/17.0/armv6j/desktop/gnome dev
-arm default/linux/arm/17.0/armv6j/desktop/plasma dev
-arm default/linux/arm/17.0/armv6j/developer exp
-arm default/linux/arm/17.0/armv6j/selinux exp
-arm default/linux/arm/17.0/armv6j/systemd dev
-arm default/linux/arm/17.0/armv7a stable
-arm default/linux/arm/17.0/armv7a/hardened exp
-arm default/linux/arm/17.0/armv7a/hardened/selinux dev
-arm default/linux/arm/17.0/armv7a/desktop dev
-arm default/linux/arm/17.0/armv7a/desktop/gnome dev
-arm default/linux/arm/17.0/armv7a/desktop/gnome/systemd dev
-arm default/linux/arm/17.0/armv7a/desktop/plasma dev
-arm default/linux/arm/17.0/armv7a/desktop/plasma/systemd dev
-arm default/linux/arm/17.0/armv7a/developer exp
-arm default/linux/arm/17.0/armv7a/systemd dev
+arm default/linux/arm/17.0 stable
+arm default/linux/arm/17.0/desktop dev
+arm default/linux/arm/17.0/desktop/gnome dev
+arm default/linux/arm/17.0/desktop/gnome/systemd dev
+arm default/linux/arm/17.0/desktop/gnome/systemd/merged-usr dev
+arm default/linux/arm/17.0/desktop/plasma dev
+arm default/linux/arm/17.0/desktop/plasma/systemd dev
+arm default/linux/arm/17.0/desktop/plasma/systemd/merged-usr dev
+arm default/linux/arm/17.0/developer exp
+arm default/linux/arm/17.0/armv4 dev
+arm default/linux/arm/17.0/armv4/desktop dev
+arm default/linux/arm/17.0/armv4/desktop/gnome dev
+arm default/linux/arm/17.0/armv4/desktop/plasma dev
+arm default/linux/arm/17.0/armv4/developer exp
+arm default/linux/arm/17.0/armv4t dev
+arm default/linux/arm/17.0/armv4t/desktop dev
+arm default/linux/arm/17.0/armv4t/desktop/gnome dev
+arm default/linux/arm/17.0/armv4t/desktop/plasma dev
+arm default/linux/arm/17.0/armv4t/developer exp
+arm default/linux/arm/17.0/armv4t/systemd dev
+arm default/linux/arm/17.0/armv4t/systemd/merged-usr dev
+arm default/linux/arm/17.0/armv5te dev
+arm default/linux/arm/17.0/armv5te/desktop dev
+arm default/linux/arm/17.0/armv5te/desktop/gnome dev
+arm default/linux/arm/17.0/armv5te/desktop/plasma dev
+arm default/linux/arm/17.0/armv5te/developer exp
+arm default/linux/arm/17.0/armv5te/systemd dev
+arm default/linux/arm/17.0/armv5te/systemd/merged-usr dev
+arm default/linux/arm/17.0/armv6j stable
+arm default/linux/arm/17.0/armv6j/hardened exp
+arm default/linux/arm/17.0/armv7a/hardened/selinux exp
+arm default/linux/arm/17.0/armv6j/desktop dev
+arm default/linux/arm/17.0/armv6j/desktop/gnome dev
+arm default/linux/arm/17.0/armv6j/desktop/plasma dev
+arm default/linux/arm/17.0/armv6j/developer exp
+arm default/linux/arm/17.0/armv6j/selinux exp
+arm default/linux/arm/17.0/armv6j/systemd dev
+arm default/linux/arm/17.0/armv6j/systemd/merged-usr dev
+arm default/linux/arm/17.0/armv7a stable
+arm default/linux/arm/17.0/armv7a/hardened exp
+arm default/linux/arm/17.0/armv7a/hardened/selinux dev
+arm default/linux/arm/17.0/armv7a/desktop dev
+arm default/linux/arm/17.0/armv7a/desktop/gnome dev
+arm default/linux/arm/17.0/armv7a/desktop/gnome/systemd dev
+arm default/linux/arm/17.0/armv7a/desktop/gnome/systemd/merged-usr dev
+arm default/linux/arm/17.0/armv7a/desktop/plasma dev
+arm default/linux/arm/17.0/armv7a/desktop/plasma/systemd dev
+arm default/linux/arm/17.0/armv7a/desktop/plasma/systemd/merged-usr dev
+arm default/linux/arm/17.0/armv7a/developer exp
+arm default/linux/arm/17.0/armv7a/systemd dev
+arm default/linux/arm/17.0/armv7a/systemd/merged-usr dev
+
# ARM64 Profiles
# @MAINTAINER: arm64@gentoo.org
-arm64 default/linux/arm64/17.0 stable
-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 stable
-arm64 default/linux/arm64/17.0/desktop/plasma stable
-arm64 default/linux/arm64/17.0/desktop/plasma/systemd stable
-arm64 default/linux/arm64/17.0/desktop/systemd stable
-arm64 default/linux/arm64/17.0/developer exp
-arm64 default/linux/arm64/17.0/systemd stable
-arm64 default/linux/arm64/17.0/systemd/selinux exp
+arm64 default/linux/arm64/17.0 stable
+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 stable
+arm64 default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr dev
+arm64 default/linux/arm64/17.0/desktop/plasma stable
+arm64 default/linux/arm64/17.0/desktop/plasma/systemd stable
+arm64 default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr dev
+arm64 default/linux/arm64/17.0/desktop/systemd stable
+arm64 default/linux/arm64/17.0/desktop/systemd/merged-usr dev
+arm64 default/linux/arm64/17.0/developer exp
+arm64 default/linux/arm64/17.0/systemd stable
+arm64 default/linux/arm64/17.0/systemd/merged-usr dev
+arm64 default/linux/arm64/17.0/systemd/selinux exp
+
# ARM64 Profiles (big-endian)
# @MAINTAINER: steev@gentoo.org, slyfox@gentoo.org
@@ -131,46 +152,56 @@ arm64 default/linux/arm64/17.0/big-endian exp
# @MAINTAINER: hppa@gentoo.org
hppa default/linux/hppa/17.0 stable
hppa default/linux/hppa/17.0/systemd 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/developer 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 stable
-ia64 default/linux/ia64/17.0/developer exp
-ia64 default/linux/ia64/17.0/systemd exp
+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 stable
+ia64 default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr dev
+ia64 default/linux/ia64/17.0/developer exp
+ia64 default/linux/ia64/17.0/systemd exp
+ia64 default/linux/ia64/17.0/systemd/merged-usr exp
+
# LoongArch Profiles
# @MAINTAINER: loong@gentoo.org
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/systemd exp
+loong default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr exp
loong default/linux/loong/22.0/la64v100/lp64d/systemd exp
+loong default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr exp
# M68K Profiles
# @MAINTAINER: m68k@gentoo.org
m68k default/linux/m68k/17.0 exp
m68k default/linux/m68k/17.0/systemd exp
+m68k default/linux/m68k/17.0/systemd/merged-usr exp
# MIPS Profiles
# @MAINTAINER: mips@gentoo.org
-mips default/linux/mips/17.0/o32 exp
-mips default/linux/mips/17.0/n32 exp
-mips default/linux/mips/17.0/n64 exp
-mips default/linux/mips/17.0/multilib/o32 exp
-mips default/linux/mips/17.0/multilib/n32 exp
-mips default/linux/mips/17.0/multilib/n64 exp
-mips default/linux/mips/17.0/mipsel/o32 exp
-mips default/linux/mips/17.0/mipsel/n32 exp
-mips default/linux/mips/17.0/mipsel/n64 exp
-mips default/linux/mips/17.0/mipsel/n64/systemd exp
-mips default/linux/mips/17.0/mipsel/multilib/o32 exp
-mips default/linux/mips/17.0/mipsel/multilib/n32 exp
-mips default/linux/mips/17.0/mipsel/multilib/n64 exp
-mips default/linux/mips/17.0/mipsel/multilib/n64/systemd exp
+mips default/linux/mips/17.0/o32 exp
+mips default/linux/mips/17.0/n32 exp
+mips default/linux/mips/17.0/n64 exp
+mips default/linux/mips/17.0/multilib/o32 exp
+mips default/linux/mips/17.0/multilib/n32 exp
+mips default/linux/mips/17.0/multilib/n64 exp
+mips default/linux/mips/17.0/mipsel/o32 exp
+mips default/linux/mips/17.0/mipsel/n32 exp
+mips default/linux/mips/17.0/mipsel/n64 exp
+mips default/linux/mips/17.0/mipsel/n64/systemd exp
+mips default/linux/mips/17.0/mipsel/n64/systemd/merged-usr exp
+mips default/linux/mips/17.0/mipsel/multilib/o32 exp
+mips default/linux/mips/17.0/mipsel/multilib/n32 exp
+mips default/linux/mips/17.0/mipsel/multilib/n64 exp
+mips default/linux/mips/17.0/mipsel/multilib/n64/systemd exp
+mips default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr exp
+
# Deprecated PPC32 Profiles
# @MAINTAINER: ppc@gentoo.org
@@ -199,34 +230,41 @@ 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 stable
+ppc default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr dev
ppc default/linux/ppc/17.0/systemd stable
+ppc default/linux/ppc/17.0/systemd/merged-usr dev
ppc default/linux/ppc/17.0/developer exp
ppc default/linux/ppc/17.0/musl exp
ppc default/linux/ppc/17.0/musl/hardened exp
# 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 stable
-ppc64 default/linux/ppc64/17.0/systemd stable
-ppc64 default/linux/ppc64/17.0/developer exp
-ppc64 default/linux/ppc64/17.0/musl exp
-ppc64 default/linux/ppc64/17.0/musl/hardened exp
+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 stable
+ppc64 default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr dev
+ppc64 default/linux/ppc64/17.0/systemd stable
+ppc64 default/linux/ppc64/17.0/systemd/merged-usr dev
+ppc64 default/linux/ppc64/17.0/developer exp
+ppc64 default/linux/ppc64/17.0/musl exp
+ppc64 default/linux/ppc64/17.0/musl/hardened exp
# 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 stable
-ppc64 default/linux/ppc64le/17.0/desktop/plasma stable
-ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd stable
-ppc64 default/linux/ppc64le/17.0/systemd stable
-ppc64 default/linux/ppc64le/17.0/developer exp
-ppc64 default/linux/ppc64le/17.0/musl exp
-ppc64 default/linux/ppc64le/17.0/musl/hardened exp
+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 stable
+ppc64 default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr dev
+ppc64 default/linux/ppc64le/17.0/desktop/plasma stable
+ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd stable
+ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr dev
+ppc64 default/linux/ppc64le/17.0/systemd stable
+ppc64 default/linux/ppc64le/17.0/systemd/merged-usr dev
+ppc64 default/linux/ppc64le/17.0/developer exp
+ppc64 default/linux/ppc64le/17.0/musl exp
+ppc64 default/linux/ppc64le/17.0/musl/hardened exp
# RISC-V Profiles
# @MAINTAINER: riscv@gentoo.org
@@ -234,52 +272,68 @@ 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 dev
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 dev
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
# 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 stable
-s390 default/linux/s390/17.0/s390x/systemd exp
+s390 default/linux/s390/17.0 stable
+s390 default/linux/s390/17.0/s390x stable
+s390 default/linux/s390/17.0/systemd stable
+s390 default/linux/s390/17.0/systemd/merged-usr dev
+s390 default/linux/s390/17.0/s390x/systemd exp
+s390 default/linux/s390/17.0/s390x/systemd/merged-usr exp
# 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/developer exp
-sparc default/linux/sparc/17.0/systemd stable
-sparc default/linux/sparc/17.0/64ul stable
-sparc default/linux/sparc/17.0/64ul/desktop stable
-sparc default/linux/sparc/17.0/64ul/developer exp
-sparc default/linux/sparc/17.0/64ul/systemd stable
+sparc default/linux/sparc/17.0 stable
+sparc default/linux/sparc/17.0/desktop stable
+sparc default/linux/sparc/17.0/developer exp
+sparc default/linux/sparc/17.0/systemd stable
+sparc default/linux/sparc/17.0/systemd/merged-usr dev
+sparc default/linux/sparc/17.0/64ul stable
+sparc default/linux/sparc/17.0/64ul/desktop stable
+sparc default/linux/sparc/17.0/64ul/developer exp
+sparc default/linux/sparc/17.0/64ul/systemd stable
+sparc default/linux/sparc/17.0/64ul/systemd/merged-usr dev
# 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 stable
-x86 default/linux/x86/17.0/desktop/plasma stable
-x86 default/linux/x86/17.0/desktop/plasma/systemd stable
-x86 default/linux/x86/17.0/developer exp
-x86 default/linux/x86/17.0/systemd stable
+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 stable
+x86 default/linux/x86/17.0/desktop/gnome/systemd/merged-usr dev
+x86 default/linux/x86/17.0/desktop/plasma stable
+x86 default/linux/x86/17.0/desktop/plasma/systemd stable
+x86 default/linux/x86/17.0/desktop/plasma/systemd/merged-usr dev
+x86 default/linux/x86/17.0/developer exp
+x86 default/linux/x86/17.0/systemd stable
+x86 default/linux/x86/17.0/systemd/merged-usr dev
# musl profiles
# @MAINTAINER: musl@gentoo.org
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c7f9f1f7d873..6373b42cf65f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -648,6 +648,13 @@ app-emulation/vkd3d-proton:crossdev-mingw - Use sys-devel/crossdev for the toolc
app-emulation/vkd3d-proton:extras - Install extra tools and demos in /usr/lib/vkd3d-proton
app-emulation/wine-gecko:shared - Install pre-unpacked files which do not need to be copied into the Wine prefix
app-emulation/wine-mono:shared - Install pre-unpacked files which do not need to be copied into the Wine prefix
+app-emulation/wine-proton:crossdev-mingw - Use sys-devel/crossdev for the toolchain rather than dev-util/mingw64-toolchain (requires manual setting up)
+app-emulation/wine-proton:gecko - Enable mshtml support using app-emulation/wine-gecko
+app-emulation/wine-proton:mono - Enable .NET support using app-emulation/wine-mono
+app-emulation/wine-proton:osmesa - Enable off-screen rendering (OpenGL in bitmaps) support
+app-emulation/wine-proton:perl - Install helpers that require perl (winedump/winemaker)
+app-emulation/wine-proton:sdl - Enable gamepad support using media-libs/libsdl2
+app-emulation/wine-proton:vkd3d - Enable DirectX 12 support using app-emulation/vkd3d
app-emulation/wine-staging:capi - Enable ISDN support via CAPI
app-emulation/wine-staging:crossdev-mingw - Use sys-devel/crossdev for the toolchain rather than dev-util/mingw64-toolchain (requires manual setting up)
app-emulation/wine-staging:custom-cflags - Bypass strip-flags; use at your own peril
@@ -8584,6 +8591,7 @@ virtual/podofo-build:boost - Add support for boost
virtual/podofo-build:tools - Build and install commandline tools
virtual/rust:rustfmt - Install rustfmt, Rust code formatter
virtual/ssh:minimal - Prefer net-misc/dropbear over net-misc/openssh
+virtual/wine:proton - Enable Valve Software's fork of Wine
virtual/wine:staging - Enable Wine-Staging's Patchset
www-apache/mod_backtrace:unwind - Use sys-libs/libunwind to provide better resolution of function names.
www-apache/mod_musicindex:archive - Add archive support