diff --git a/profiles/default/linux/x86/23.0/desktop/gnome/parent b/profiles/default/linux/x86/23.0/desktop/gnome/parent
deleted file mode 100644
index 6589a0e01478e..0000000000000
--- a/profiles/default/linux/x86/23.0/desktop/gnome/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent b/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent
deleted file mode 100644
index f5c1ae438de47..0000000000000
--- a/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/x86/23.0/desktop/parent b/profiles/default/linux/x86/23.0/desktop/parent
deleted file mode 100644
index ad6c5e126fbb6..0000000000000
--- a/profiles/default/linux/x86/23.0/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/desktop
diff --git a/profiles/default/linux/x86/23.0/desktop/plasma/parent b/profiles/default/linux/x86/23.0/desktop/plasma/parent
deleted file mode 100644
index ff3a7b1ec8141..0000000000000
--- a/profiles/default/linux/x86/23.0/desktop/plasma/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent b/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent
deleted file mode 100644
index 44f88d3e2df0f..0000000000000
--- a/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/23.0/hardened/parent b/profiles/default/linux/x86/23.0/hardened/parent
deleted file mode 100644
index 40a1173682f51..0000000000000
--- a/profiles/default/linux/x86/23.0/hardened/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/hardened/x86
diff --git a/profiles/default/linux/x86/23.0/hardened/selinux/parent b/profiles/default/linux/x86/23.0/hardened/selinux/parent
deleted file mode 100644
index 2190e9797eaa5..0000000000000
--- a/profiles/default/linux/x86/23.0/hardened/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/desktop/eapi b/profiles/default/linux/x86/23.0/i486/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/desktop/eapi
rename to profiles/default/linux/x86/23.0/i486/eapi
diff --git a/profiles/default/linux/x86/23.0/desktop/gnome/eapi b/profiles/default/linux/x86/23.0/i486/hardened/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/desktop/gnome/eapi
rename to profiles/default/linux/x86/23.0/i486/hardened/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/hardened/parent b/profiles/default/linux/x86/23.0/i486/hardened/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/hardened/parent
rename to profiles/default/linux/x86/23.0/i486/hardened/parent
diff --git a/profiles/default/linux/x86/23.0/desktop/gnome/systemd/eapi b/profiles/default/linux/x86/23.0/i486/hardened/selinux/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/desktop/gnome/systemd/eapi
rename to profiles/default/linux/x86/23.0/i486/hardened/selinux/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/parent b/profiles/default/linux/x86/23.0/i486/hardened/selinux/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/hardened/selinux/parent
rename to profiles/default/linux/x86/23.0/i486/hardened/selinux/parent
diff --git a/profiles/default/linux/x86/23.0/make.defaults b/profiles/default/linux/x86/23.0/i486/make.defaults
similarity index 100%
rename from profiles/default/linux/x86/23.0/make.defaults
rename to profiles/default/linux/x86/23.0/i486/make.defaults
diff --git a/profiles/default/linux/x86/23.0/desktop/plasma/eapi b/profiles/default/linux/x86/23.0/i486/musl/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/desktop/plasma/eapi
rename to profiles/default/linux/x86/23.0/i486/musl/eapi
diff --git a/profiles/default/linux/x86/23.0/musl/make.defaults b/profiles/default/linux/x86/23.0/i486/musl/make.defaults
similarity index 100%
rename from profiles/default/linux/x86/23.0/musl/make.defaults
rename to profiles/default/linux/x86/23.0/i486/musl/make.defaults
diff --git a/profiles/default/linux/x86/23.0/musl/package.mask b/profiles/default/linux/x86/23.0/i486/musl/package.mask
similarity index 100%
rename from profiles/default/linux/x86/23.0/musl/package.mask
rename to profiles/default/linux/x86/23.0/i486/musl/package.mask
diff --git a/profiles/default/linux/x86/23.0/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
similarity index 100%
rename from profiles/default/linux/x86/23.0/musl/package.use.mask
rename to profiles/default/linux/x86/23.0/i486/musl/package.use.mask
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/parent b/profiles/default/linux/x86/23.0/i486/musl/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/musl/parent
rename to profiles/default/linux/x86/23.0/i486/musl/parent
diff --git a/profiles/default/linux/x86/23.0/desktop/plasma/systemd/eapi b/profiles/default/linux/x86/23.0/i486/musl/selinux/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/desktop/plasma/systemd/eapi
rename to profiles/default/linux/x86/23.0/i486/musl/selinux/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/selinux/parent b/profiles/default/linux/x86/23.0/i486/musl/selinux/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/musl/selinux/parent
rename to profiles/default/linux/x86/23.0/i486/musl/selinux/parent
diff --git a/profiles/default/linux/x86/23.0/musl/use.force b/profiles/default/linux/x86/23.0/i486/musl/use.force
similarity index 100%
rename from profiles/default/linux/x86/23.0/musl/use.force
rename to profiles/default/linux/x86/23.0/i486/musl/use.force
diff --git a/profiles/default/linux/x86/23.0/musl/use.mask b/profiles/default/linux/x86/23.0/i486/musl/use.mask
similarity index 100%
rename from profiles/default/linux/x86/23.0/musl/use.mask
rename to profiles/default/linux/x86/23.0/i486/musl/use.mask
diff --git a/profiles/default/linux/x86/23.0/prefix/parent b/profiles/default/linux/x86/23.0/i486/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/prefix/parent
rename to profiles/default/linux/x86/23.0/i486/parent
diff --git a/profiles/default/linux/x86/23.0/hardened/eapi b/profiles/default/linux/x86/23.0/i486/split-usr/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/hardened/eapi
rename to profiles/default/linux/x86/23.0/i486/split-usr/eapi
diff --git a/profiles/default/linux/x86/23.0/hardened/selinux/eapi b/profiles/default/linux/x86/23.0/i486/split-usr/hardened/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/hardened/selinux/eapi
rename to profiles/default/linux/x86/23.0/i486/split-usr/hardened/eapi
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/hardened/parent b/profiles/default/linux/x86/23.0/i486/split-usr/hardened/parent
new file mode 100644
index 0000000000000..e5d746a4ea0cb
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i486/split-usr/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened/x86
diff --git a/profiles/default/linux/x86/23.0/musl/eapi b/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/musl/eapi
rename to profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/eapi
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/parent b/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/parent
new file mode 100644
index 0000000000000..23c5fe07a248a
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/musl/selinux/eapi b/profiles/default/linux/x86/23.0/i486/split-usr/musl/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/musl/selinux/eapi
rename to profiles/default/linux/x86/23.0/i486/split-usr/musl/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/make.defaults b/profiles/default/linux/x86/23.0/i486/split-usr/musl/make.defaults
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/musl/make.defaults
rename to profiles/default/linux/x86/23.0/i486/split-usr/musl/make.defaults
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/package.mask b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.mask
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/musl/package.mask
rename to profiles/default/linux/x86/23.0/i486/split-usr/musl/package.mask
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/musl/package.use.mask
rename to profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/musl/parent b/profiles/default/linux/x86/23.0/i486/split-usr/musl/parent
new file mode 100644
index 0000000000000..b488e1ca01b8b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i486/split-usr/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/musl
diff --git a/profiles/default/linux/x86/23.0/prefix/eapi b/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/prefix/eapi
rename to profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/eapi
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/parent b/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/parent
new file mode 100644
index 0000000000000..23c5fe07a248a
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/use.force b/profiles/default/linux/x86/23.0/i486/split-usr/musl/use.force
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/musl/use.force
rename to profiles/default/linux/x86/23.0/i486/split-usr/musl/use.force
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/use.mask b/profiles/default/linux/x86/23.0/i486/split-usr/musl/use.mask
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/musl/use.mask
rename to profiles/default/linux/x86/23.0/i486/split-usr/musl/use.mask
diff --git a/profiles/default/linux/x86/23.0/i486/split-usr/parent b/profiles/default/linux/x86/23.0/i486/split-usr/parent
new file mode 100644
index 0000000000000..2528102682903
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i486/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/split-usr
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/x86/23.0/i486/systemd/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/eapi
rename to profiles/default/linux/x86/23.0/i486/systemd/eapi
diff --git a/profiles/default/linux/x86/23.0/i486/systemd/parent b/profiles/default/linux/x86/23.0/i486/systemd/parent
new file mode 100644
index 0000000000000..7e061533c1514
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i486/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/x86/23.0/i686/desktop/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/eapi
rename to profiles/default/linux/x86/23.0/i686/desktop/eapi
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/eapi b/profiles/default/linux/x86/23.0/i686/desktop/gnome/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/prefix/kernel-3.2+/eapi
rename to profiles/default/linux/x86/23.0/i686/desktop/gnome/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/parent b/profiles/default/linux/x86/23.0/i686/desktop/gnome/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/desktop/gnome/parent
rename to profiles/default/linux/x86/23.0/i686/desktop/gnome/parent
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/eapi b/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/desktop/eapi
rename to profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/eapi
diff --git a/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/parent b/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/parent
new file mode 100644
index 0000000000000..2122741fb81c0
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/parent b/profiles/default/linux/x86/23.0/i686/desktop/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/desktop/parent
rename to profiles/default/linux/x86/23.0/i686/desktop/parent
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/eapi b/profiles/default/linux/x86/23.0/i686/desktop/plasma/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/desktop/gnome/eapi
rename to profiles/default/linux/x86/23.0/i686/desktop/plasma/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/parent b/profiles/default/linux/x86/23.0/i686/desktop/plasma/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/desktop/plasma/parent
rename to profiles/default/linux/x86/23.0/i686/desktop/plasma/parent
diff --git a/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/eapi b/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/desktop/plasma/eapi
rename to profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/eapi
diff --git a/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/parent b/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/parent
new file mode 100644
index 0000000000000..f7739b4058774
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/23.0/split-usr/eapi b/profiles/default/linux/x86/23.0/i686/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/eapi
rename to profiles/default/linux/x86/23.0/i686/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/hardened/eapi b/profiles/default/linux/x86/23.0/i686/hardened/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/hardened/eapi
rename to profiles/default/linux/x86/23.0/i686/hardened/eapi
diff --git a/profiles/default/linux/x86/23.0/i686/hardened/parent b/profiles/default/linux/x86/23.0/i686/hardened/parent
new file mode 100644
index 0000000000000..178c392e9fe32
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/x86
diff --git a/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/eapi b/profiles/default/linux/x86/23.0/i686/hardened/selinux/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/hardened/selinux/eapi
rename to profiles/default/linux/x86/23.0/i686/hardened/selinux/eapi
diff --git a/profiles/default/linux/x86/23.0/i686/hardened/selinux/parent b/profiles/default/linux/x86/23.0/i686/hardened/selinux/parent
new file mode 100644
index 0000000000000..23c64bb44399c
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/i686/make.defaults b/profiles/default/linux/x86/23.0/i686/make.defaults
new file mode 100644
index 0000000000000..05f8f6a365421
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 2023 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs"
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/eapi b/profiles/default/linux/x86/23.0/i686/musl/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/musl/eapi
rename to profiles/default/linux/x86/23.0/i686/musl/eapi
diff --git a/profiles/default/linux/x86/23.0/i686/musl/make.defaults b/profiles/default/linux/x86/23.0/i686/musl/make.defaults
new file mode 100644
index 0000000000000..7dc7895c6db46
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/musl/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="i686-pc-linux-musl"
+CHOST_x86="${CHOST}"
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.mask b/profiles/default/linux/x86/23.0/i686/musl/package.mask
new file mode 100644
index 0000000000000..ea771f7580c35
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/musl/package.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
new file mode 100644
index 0000000000000..b794980bdad7b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+# Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
+# The patch added for 5.39-r1 breaks on musl i686
+# file-5.39-seccomp_sandbox.patch is okay
+# file-5.39-portage_sandbox.patch is broken
+sys-apps/file seccomp
diff --git a/profiles/default/linux/x86/23.0/i686/musl/parent b/profiles/default/linux/x86/23.0/i686/musl/parent
new file mode 100644
index 0000000000000..5bbe8700f1a67
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/musl
diff --git a/profiles/default/linux/x86/23.0/split-usr/musl/selinux/eapi b/profiles/default/linux/x86/23.0/i686/musl/selinux/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/musl/selinux/eapi
rename to profiles/default/linux/x86/23.0/i686/musl/selinux/eapi
diff --git a/profiles/default/linux/x86/23.0/i686/musl/selinux/parent b/profiles/default/linux/x86/23.0/i686/musl/selinux/parent
new file mode 100644
index 0000000000000..23c64bb44399c
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/musl/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/i686/musl/use.force b/profiles/default/linux/x86/23.0/i686/musl/use.force
new file mode 100644
index 0000000000000..8e450e58d6d34
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/musl/use.force
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Many packages break without this, like app-arch/gzip
+pic
diff --git a/profiles/default/linux/x86/23.0/i686/musl/use.mask b/profiles/default/linux/x86/23.0/i686/musl/use.mask
new file mode 100644
index 0000000000000..fe008ec19efdf
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/musl/use.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2021 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License, v2
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/parent b/profiles/default/linux/x86/23.0/i686/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/prefix/parent
rename to profiles/default/linux/x86/23.0/i686/parent
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/eapi b/profiles/default/linux/x86/23.0/i686/prefix/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/prefix/eapi
rename to profiles/default/linux/x86/23.0/i686/prefix/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.16+/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/eapi
rename to profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.16+/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/parent b/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.16+/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/parent
rename to profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.16+/parent
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.32+/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/eapi
rename to profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.32+/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/parent b/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.32+/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/parent
rename to profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.32+/parent
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/eapi b/profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/eapi
rename to profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/eapi
diff --git a/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/parent b/profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/parent
similarity index 100%
rename from profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/parent
rename to profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/parent
diff --git a/profiles/default/linux/x86/23.0/i686/prefix/parent b/profiles/default/linux/x86/23.0/i686/prefix/parent
new file mode 100644
index 0000000000000..f3229c5b98768
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/x86/23.0/systemd/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/eapi
similarity index 100%
rename from profiles/default/linux/x86/23.0/systemd/eapi
rename to profiles/default/linux/x86/23.0/i686/split-usr/desktop/eapi
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/parent b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/parent
new file mode 100644
index 0000000000000..d5a56a13f6922
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/desktop/parent b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/parent
new file mode 100644
index 0000000000000..fae96e8d36b2f
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/parent b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/parent
new file mode 100644
index 0000000000000..0317df26cc9b3
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/hardened/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/hardened/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/hardened/parent b/profiles/default/linux/x86/23.0/i686/split-usr/hardened/parent
new file mode 100644
index 0000000000000..e5d746a4ea0cb
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened/x86
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/parent b/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/parent
new file mode 100644
index 0000000000000..23c5fe07a248a
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/musl/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/make.defaults b/profiles/default/linux/x86/23.0/i686/split-usr/musl/make.defaults
new file mode 100644
index 0000000000000..7dc7895c6db46
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="i686-pc-linux-musl"
+CHOST_x86="${CHOST}"
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.mask b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.mask
new file mode 100644
index 0000000000000..ea771f7580c35
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
new file mode 100644
index 0000000000000..b794980bdad7b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+# Anthony G. Basile <blueness@gentoo.org> (2020-09-06)
+# The patch added for 5.39-r1 breaks on musl i686
+# file-5.39-seccomp_sandbox.patch is okay
+# file-5.39-portage_sandbox.patch is broken
+sys-apps/file seccomp
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/parent b/profiles/default/linux/x86/23.0/i686/split-usr/musl/parent
new file mode 100644
index 0000000000000..b488e1ca01b8b
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/musl
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/parent b/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/parent
new file mode 100644
index 0000000000000..23c5fe07a248a
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.force b/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.force
new file mode 100644
index 0000000000000..8e450e58d6d34
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.force
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Many packages break without this, like app-arch/gzip
+pic
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.mask b/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.mask
new file mode 100644
index 0000000000000..fe008ec19efdf
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.mask
@@ -0,0 +1,2 @@
+# Copyright 1999-2021 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License, v2
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/parent b/profiles/default/linux/x86/23.0/i686/split-usr/parent
new file mode 100644
index 0000000000000..2528102682903
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/split-usr
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/prefix/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/parent b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/parent
new file mode 100644
index 0000000000000..ca2bf4c92bb73
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/parent b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/parent
new file mode 100644
index 0000000000000..6d5495a6cf341
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/eapi b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/parent b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/parent
new file mode 100644
index 0000000000000..df2c40188f350
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/x86/23.0/i686/split-usr/prefix/parent b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/parent
new file mode 100644
index 0000000000000..f3229c5b98768
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/split-usr/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/x86/23.0/i686/systemd/eapi b/profiles/default/linux/x86/23.0/i686/systemd/eapi
new file mode 100644
index 0000000000000..7ed6ff82de6bc
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/23.0/i686/systemd/parent b/profiles/default/linux/x86/23.0/i686/systemd/parent
new file mode 100644
index 0000000000000..7e061533c1514
--- /dev/null
+++ b/profiles/default/linux/x86/23.0/i686/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/23.0/musl/parent b/profiles/default/linux/x86/23.0/musl/parent
deleted file mode 100644
index 58651906cb674..0000000000000
--- a/profiles/default/linux/x86/23.0/musl/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/musl
diff --git a/profiles/default/linux/x86/23.0/musl/selinux/parent b/profiles/default/linux/x86/23.0/musl/selinux/parent
deleted file mode 100644
index 2190e9797eaa5..0000000000000
--- a/profiles/default/linux/x86/23.0/musl/selinux/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/selinux
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent
deleted file mode 100644
index c4bb168d81b29..0000000000000
--- a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent b/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent
deleted file mode 100644
index b4882488fc0c5..0000000000000
--- a/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent b/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent
deleted file mode 100644
index b8a505e58f6c5..0000000000000
--- a/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/x86/23.0/split-usr/parent b/profiles/default/linux/x86/23.0/split-usr/parent
deleted file mode 100644
index 598ca888c8c26..0000000000000
--- a/profiles/default/linux/x86/23.0/split-usr/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../features/split-usr
diff --git a/profiles/default/linux/x86/23.0/systemd/parent b/profiles/default/linux/x86/23.0/systemd/parent
deleted file mode 100644
index ced72403bde94..0000000000000
--- a/profiles/default/linux/x86/23.0/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../targets/systemd