gentoo auto-resync : 03:09:2022 - 22:19:54

106 files changed, 159 insertions, 0 deletions

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