15 files changed, 34 insertions, 0 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 3fe0940c1940..82ed7f64ef2e 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/sparc/64ul/package.mask b/profiles/arch/sparc/64ul/package.mask
index 62fc845c83d1..9258d74abe37 100644
--- a/profiles/arch/sparc/64ul/package.mask
+++ b/profiles/arch/sparc/64ul/package.mask
@@ -1,6 +1,16 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2022-11-07)
+# SILO is designed for the old 64-bit kernel/32-bit userland combo
+# before there was a 64-bit userland available.  It requires a 32-bit
+# userland to build, so mask it on 64ul.  sys-boot/grub:2 support for
+# sparc was added in ~2018 and is documented in the handbook per #854954
+# See: https://github.com/esnowberg/grub2-sparc/wiki
+# See: https://wiki.gentoo.org/wiki/Handbook:SPARC/Blocks/Disks
+# See: https://wiki.gentoo.org/wiki/Handbook:SPARC/Blocks/Bootloader
+sys-boot/silo
+
 # Sam James <sam@gentoo.org> (2022-02-28)
 # Binary (needed for bootstrap) is sparc32?
 dev-lisp/sbcl
diff --git a/profiles/default/linux/amd64/17.0/x32/systemd/eapi b/profiles/default/linux/amd64/17.0/x32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/x32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/eapi b/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/parent b/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/amd64/17.0/x32/systemd/parent b/profiles/default/linux/amd64/17.0/x32/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/x32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/17.0/mipsel/o32/systemd/eapi b/profiles/default/linux/mips/17.0/mipsel/o32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/o32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/eapi b/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/parent b/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/parent
new file mode 100644
index 000000000000..1b7f7eef0a7e
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/mips/17.0/mipsel/o32/systemd/parent b/profiles/default/linux/mips/17.0/mipsel/o32/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/mipsel/o32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/default/linux/mips/17.0/o32/systemd/eapi b/profiles/default/linux/mips/17.0/o32/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/o32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/eapi b/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/parent b/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/mips/17.0/o32/systemd/parent b/profiles/default/linux/mips/17.0/o32/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/o32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 610a2d5937b5..36158072835e 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -67,6 +67,8 @@ amd64		default/linux/amd64/17.0/no-multilib/hardened		exp
 amd64		default/linux/amd64/17.0/no-multilib/hardened/selinux	exp
 amd64		default/linux/amd64/17.0/systemd			dev
 amd64		default/linux/amd64/17.0/x32				dev
+amd64		default/linux/amd64/17.0/x32/systemd			exp
+amd64		default/linux/amd64/17.0/x32/systemd/merged-usr		exp
 
 # ARM Profiles
 # @MAINTAINER: arm@gentoo.org
@@ -190,12 +192,16 @@ 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/o32/systemd				exp
+mips		default/linux/mips/17.0/o32/systemd/merged-usr			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/o32/systemd			exp
+mips		default/linux/mips/17.0/mipsel/o32/systemd/merged-usr		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