gentoo auto-resync : 30:06:2024 - 08:00:50

27 files changed, 1107 insertions, 37 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 303a135f1147..777e8bfbe1d0 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 5013efd0e82e..9bda78727230 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,8 @@
 DIST checkpolicy-3.5.tar.gz 69904 BLAKE2B e02ccad07534568a1bbb612330018bbe486800ea40df20ed6f9dc38c88aff7f8858782a28ba7915a58c3bb384f180eb8da7a8fe97a92bcb9baa61eec18da6cbc SHA512 fcd490d865af3b4350c32c5dd9916f8406219841e1e255d8945c6dcc958535247aa27af5597a6988e19f11faea7beeabcb46e8ba2431112bb4aa5c7697bca529
 DIST checkpolicy-3.6.tar.gz 70684 BLAKE2B d32a8b86897bd4a08caf61a096a691c8d049fa7b5b4561f4847e0dfbb62a82fc6c3ddb5be163c7cd6163491c50513aec14e4c67842f256f48688b26178c2887a SHA512 0d48fb385b4d1e66d562e40b6e794406f46d8803cc504705b26547130cb13b65fab5fdb4fc032b1c95d4f91862ff134a89fffde854c5ce466c2dd2657e416070
+DIST checkpolicy-3.7.tar.gz 74992 BLAKE2B 78f419fa89981ad16364b3d6406e313fda5230588063c9a9dbb70535f0421c5b402b9c86d2f63d4ab7b8119c38044b6dc556fb2dd40240428c914cb25a2facbe SHA512 f428edcbe17bd5b5f22dd827cf21c89c2cf645bae6c0342c6663743cafd9f8a8d7c8b5a1b48c04569fdb0cce11ffcb6c0b6d7fa76075a1a274948ba418bcc5b4
 EBUILD checkpolicy-3.5.ebuild 1089 BLAKE2B aa0a7a244530c2b7a8231750b0479c485c567bacf53b79570ffc7ad4cf1c5cc9b6060d63dfc86f16e6fbfbeff69a85cfa773080953d241d6029fd0c0b14f8d66 SHA512 86d8586db0842ab0df9da87739c2e40fde0483777921e3b67a1933ba27e233ede07cefd6668664f2c25b74eda8281ad5b52bd07363ac4080f1f725f047d059f5
 EBUILD checkpolicy-3.6.ebuild 1089 BLAKE2B c97f101f5bbb63f1c7b72fc33e8d4ed33e4914382eb3f5a738b2a039290a461c37203734ecea404402b896349b640669a3be7273c79a54ecfb22db7dac7876da SHA512 99d35ee4f3ff91ce859b5e2bea6e8c8fd1099c6939ff661c99934d706bb5e86ec59f8809dc5a81279df210f63a22dbd4619e5f7839ea6757eb21c68a81e09ffe
-EBUILD checkpolicy-9999.ebuild 1093 BLAKE2B 3593f18258575213cdd8ed15117789d5ccd325028dad25cec4a670f88e7e0d124af3880b49a59bed9f76cbf596aa154a4c3879a5bb42fac5c1a1e446c7c0afe5 SHA512 adbb39edafcc2a5987d8c2588ae19dd2eeff58f8df5d25b41d4a3036cfe1b6c6ae6391796219b0d9c423d941af9cd362746cf16643f09841139d34c1d4c2719d
+EBUILD checkpolicy-3.7.ebuild 1093 BLAKE2B 82387b89549b4b215f629dcea9dff9d255ff176acf99828496853ee4269a67dd8d2af288e43e94c7b9ab3d90871250d68ad50fe1d9c657eb3f6088296f7daab9 SHA512 a52181876492b152a08d879cbcf291e8d7b3874f56266a1918095da50ed9d9db557116fe2ec66d4ca54fd11cfc776d5bf8d5e34361674525b9bcb63041537b67
+EBUILD checkpolicy-9999.ebuild 1093 BLAKE2B 82387b89549b4b215f629dcea9dff9d255ff176acf99828496853ee4269a67dd8d2af288e43e94c7b9ab3d90871250d68ad50fe1d9c657eb3f6088296f7daab9 SHA512 a52181876492b152a08d879cbcf291e8d7b3874f56266a1918095da50ed9d9db557116fe2ec66d4ca54fd11cfc776d5bf8d5e34361674525b9bcb63041537b67
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/checkpolicy/checkpolicy-3.7.ebuild b/sys-apps/checkpolicy/checkpolicy-3.7.ebuild
new file mode 100644
index 000000000000..35ff8c551e28
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-3.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+BDEPEND="sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsepol-${PV}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		YACC="bison -y" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)"
+}
+
+src_install() {
+	default
+
+	if use debug; then
+		dobin "${S}/test/dismod"
+		dobin "${S}/test/dispol"
+	fi
+}
+
+pkg_postinst() {
+	if ! tc-is-cross-compiler; then
+		einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+	fi
+}
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 6d5e91d8b18a..35ff8c551e28 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit toolchain-funcs
 
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index acf1fe9516f4..bf4ccfcdf280 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -1,7 +1,9 @@
 AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97ec51f20541863111de4298b7d6eb0911ded757cadc1ba4deefd500d8a6e335693191e2e65286a585 SHA512 8de0df316d8c926bd99515b4c6eb5bc9d51df3925d3dbad49fe0229193e82f008b09a7343c0d1c2cdc9dd35ad8fd7c82e29ba2bd6a7ab6cf882afe78985e9579
 DIST mcstrans-3.5.tar.gz 45091 BLAKE2B c6604075a6b37d7bf10e2daee40d9f034a26c5d56b81973cbc3b39621bdf5e2cb1d5906e91942e09ff077a14facafcc2464995675d8df31930707033fac5db90 SHA512 f4d3b04750e197c6abd31f1642af4b53a4fe0e968952a7ade992909f903d7486c1e72733963453563fcbc9745273c8238f169f520550df1470e7f6e4d6e56665
 DIST mcstrans-3.6.tar.gz 42199 BLAKE2B 0f1b4ed212994037b062c42887e2629ae7374e0cbbd79692588ce164440eafddc6d7ab15d58f6064d68781a5a8fd614c9cfa734c4dbe1d3fea1dbb0f8191ddc1 SHA512 2c01a70741675faa41e8a9243f3cf08b558e568d7ae343874ff9c269473ba2748d42e0b45871d82d6c9b01bf71547835d547683f1aa5a8cf626708c7c69569fc
+DIST mcstrans-3.7.tar.gz 42501 BLAKE2B b1112a5098a6681ade55e9fada8b0e4629bda8ff4334242b570bc042113204374bd2ca72face7fd7bc0958981a3c39284fa953a02e0860c4101e966f77f7e49a SHA512 51483ce4fd0b0a4bcba0d52eb418aa56104732888782f32c27a855c167cdb267de22eeb414ad8c6b2e733620c3e59db39646136c97f7bcb8901ce12fed44583a
 EBUILD mcstrans-3.5.ebuild 1060 BLAKE2B 13380e1ed9b6aa3eb2176749619722da35e2654d54f79715f85389a0f8f3f4c9789001f1f4cba61d5509dd01c2ec8ad1307099f893e5b771efb21b5a97caf2dc SHA512 e7544d50c5448e3c03acc9fa38474dcd89ce28a309d26478436d9861a8add24890232fdd92f85e99bca3fa2aac4d4047fb73894db617e3e42204fc150dc74507
 EBUILD mcstrans-3.6.ebuild 1052 BLAKE2B 260337989b710f112db1d705d214462cb4b9d9e4c3305555ca445ec0feae3f6322cb5dbc453617c00fdfd0848792ba07af8c9d0702dc1aac9c0e07152e30684d SHA512 c9f0f52efdd46ced4ecad6745f9fc03a093210698ef6b0c5b0a34809788be6867be3450320e312e3a19bf3d0e482cd3cb1040d11ba72c8443053a705e80bba0b
-EBUILD mcstrans-9999.ebuild 1056 BLAKE2B 96c4afa9019306bbfb420cb34a626bf45129b90ed103f23df3c4cfea1bfce11c013c8da1fb35e6a55819c814038f5cf5c9d0559f9e94ed451b473be614bb21a6 SHA512 93c4833c33c9bbbfefe0f3c65dba768e10873ee8c18bcfeb3656c89802ac9dab9fb3f000d651364a2d19ea5e5563fc5114c761cebed9ea1d630fdc2c847dd42b
+EBUILD mcstrans-3.7.ebuild 1056 BLAKE2B 05534d904f4eedc23d690c4dc6ae56417a89530a92ff07bf9c16aaf9bfefa1d693d27b32192d4ed36c239e34c7712afe1f5379c2091e4df8563ed3b7be2589fb SHA512 fe04ad3261391e3bb87595ebb02fad0c656f18cb9ec96e6708a554402ec8a88c5cda24efe96970720ed3b1916e7efb211249f37a31dbcf305bf3d7048ab4d97a
+EBUILD mcstrans-9999.ebuild 1056 BLAKE2B 05534d904f4eedc23d690c4dc6ae56417a89530a92ff07bf9c16aaf9bfefa1d693d27b32192d4ed36c239e34c7712afe1f5379c2091e4df8563ed3b7be2589fb SHA512 fe04ad3261391e3bb87595ebb02fad0c656f18cb9ec96e6708a554402ec8a88c5cda24efe96970720ed3b1916e7efb211249f37a31dbcf305bf3d7048ab4d97a
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/mcstrans/mcstrans-3.7.ebuild b/sys-apps/mcstrans/mcstrans-3.7.ebuild
new file mode 100644
index 000000000000..184e15644712
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-3.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre2:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index bbd7a4cc0378..184e15644712 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit toolchain-funcs
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index e2b6285c1921..f9fa55ce74ec 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,8 +1,10 @@
 AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b122b16e88190cad74891434c57fff3d9d4fa2529ac5e88cbbf572e710cf0bc313ffb83d8e80261265c121230f3975900a7ed97093dbd2f8930 SHA512 2e42dcc62be3a224b0bb153c615e12dc7febcb11bc46dca32d1ccafe51a8ceb4e57c63080b6cd8c8e87e16ea901dcfdc6aab9dd9c6f48b691a23da4eadad007d
 DIST policycoreutils-3.5.tar.gz 775639 BLAKE2B 777b8564484e89385db7a184c4cad9a99aabf1fd1ac41abd5826c7e6ad29118ae9d6f0d0fd968b6ced87f2f04bc6d7cd207b67428151522915367f656fb8d3f8 SHA512 7978ef6b7a278c6384c9b397734d03c4932c8aefecceaa1e6a1345be27b253dbe276fdcd219ce83ad732c6ed55d53bbc3254e39bccadd67d2cd1152a14749444
 DIST policycoreutils-3.6.tar.gz 755682 BLAKE2B a8b180c8006989192d152651dcfa51856956780bfe1139cc1dc0162eb66ba1eef4f7d64f68a48479572b02e2e97a68c7082722a745d22a9453e8378373319e3c SHA512 e1f32e6e0310b879a5aadab157b103314a61bf3b8fd59c1212d701fbf39900e3b9a0b727338988103d784a7e505355a871ba519dd91520b135a3b9dae40bf1b0
+DIST policycoreutils-3.7.tar.gz 757142 BLAKE2B 95794d48ef80882803199af5330f0ac4f1cee6710562a559e3d8fd94475d117286f8b612ffc5dc9027f4f8f4cd55e82ddb4d328e91d6c9846b18460c9bee159b SHA512 30e3413b15df0bf1a994d2b3a03a719f89b3ee521a708b92fcc684822152145722cb3ef28fd5b7c42b779281b0bd4d69d65c0bc2605eec1af3f388609d985500
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-3.5.ebuild 4648 BLAKE2B 1c728597f8b0b13e2bb513a81acdeecd45a3eba75f4a20e9ac779e7e315d75a337355452b1d6338aef0d44c1e7d25c65103a56c81cc35160119b400365f19541 SHA512 76b1b2cfa0d1dbb591351cd4ee14ebaf187e3a34c3f4af5695df86ecf28acb94126098e37bb99b066c3f8f77fd410e87b5c6963c18f8e2e54efe1dede36d5dbb
 EBUILD policycoreutils-3.6.ebuild 4640 BLAKE2B 238188f7cc14b0e5c59987b57508e3d53519d4163e9a9ea7ab820d1401b23ea1c0ddb127ae1f948dd8018dbf10240da903993071a916ed4dca7805e782269963 SHA512 bc4ec5c2238b357d60d33ab8505b051ffb48925ab10447450cfcd11bf711fdcbdb0b537cc0aef389528f984b0b38c641886dfef646a65d4f2ca89d6c78ac4aa5
-EBUILD policycoreutils-9999.ebuild 4644 BLAKE2B 846ee72913d1a18b12b82c18f14c6057910d8b92389a4259562f454d0c38f74079a62c89e8b21ce1d62faa362136225b8a560479d93e0af5bd9667286cb40b84 SHA512 af7465917a2702c58536aeeabbe7ddfc8ff1595bb5b95b6aaaf0667fbcbe366979460942ce1b82fec08d1177008d7e5e6c5a2c2f61c40fd184aa768356cbaf52
+EBUILD policycoreutils-3.7.ebuild 4644 BLAKE2B dfe0701409bacbbf56e17bee146e51b034c0a3d5d9b767b6491345d7136ab17d0fecf3af5ef4277bd38ef62632f0764d99f6c13352140152da59ca0b7bb48cd9 SHA512 1b8cb3cda7130131e62ac30e758259b4579188787c306284097b499226d3dd8505a00237b769e27deb982edc3e8b13c8760710dec7c028347b7c17e48144ff3a
+EBUILD policycoreutils-9999.ebuild 4644 BLAKE2B dfe0701409bacbbf56e17bee146e51b034c0a3d5d9b767b6491345d7136ab17d0fecf3af5ef4277bd38ef62632f0764d99f6c13352140152da59ca0b7bb48cd9 SHA512 1b8cb3cda7130131e62ac30e758259b4579188787c306284097b499226d3dd8505a00237b769e27deb982edc3e8b13c8760710dec7c028347b7c17e48144ff3a
 MISC metadata.xml 1118 BLAKE2B b77b6c2e9fbc2fe7e0079d08c6e361f91131951db7f3babd217b6a122f780cdb1cf7624ab3af21066d65493b571516da7ba2f2dcb41fe6d1dadef4ffb12852fb SHA512 a1cce588f3d89b33399bc871da491480610c187379d62a4650c02955ff213b93f506a4d82e638a5ffc5ca3a2f4210b89c078406cc0d835d2603676e600b9d8de
diff --git a/sys-apps/policycoreutils/policycoreutils-3.7.ebuild b/sys-apps/policycoreutils/policycoreutils-3.7.ebuild
new file mode 100644
index 000000000000..6b54ec0947c1
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-3.7.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit python-r1 toolchain-funcs bash-completion-r1
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+EXTRAS_VER="1.37"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	S1="${WORKDIR}/${P}/${PN}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz
+		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S1="${WORKDIR}/${MY_P}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="audit pam split-usr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=">=sys-libs/libselinux-${PV}:=[python,${PYTHON_USEDEP}]
+	>=sys-libs/libsemanage-${PV}:=[python(+),${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=
+	sys-libs/libcap-ng:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
+	pam? ( sys-libs/pam:= )
+	${PYTHON_DEPS}"
+
+# Avoid dependency loop in the cross-compile case, bug #755173
+# (Still exists in native)
+BDEPEND="sys-devel/gettext"
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+	app-misc/pax-utils"
+
+PDEPEND="sys-apps/semodule-utils
+	sys-apps/selinux-python"
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	S="${S1}"
+	cd "${S}" || die "Failed to switch to ${S}"
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/policycoreutils-3.1-0001-newrole-not-suid.patch"
+	fi
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	eapply_user
+
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			install
+		python_optimize
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d" || die
+
+	# compatibility symlinks
+	if use split-usr; then
+		dosym ../../sbin/setfiles /usr/sbin/setfiles
+	else
+		# remove sestatus symlink
+		rm -f "${D}"/usr/sbin/sestatus || die
+	fi
+
+	bashcomp_alias setsebool getsebool
+
+	# location for policy definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+}
+
+pkg_postinst() {
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		# There have been some changes to the policy store, rebuilding now.
+		# https://marc.info/?l=selinux&m=143757277819717&w=2
+		einfo "Rebuilding store ${POLICY_TYPE} in '${ROOT:-/}' (without re-loading)."
+		semodule -p "${ROOT:-/}" -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+	done
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 7ac02d3d3f39..6b54ec0947c1 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 6c0ef947a0f8..6ba1d898a947 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,7 +1,9 @@
 AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f082c9c9c9ef458ef87c48bf2e6cacc8c2603a51d9c639938056cffb49a0b089eb4b2a088a11af8eec0c SHA512 dd68ba095d67ccc6f698a8ab2d86942458763619d97a68f421eff0a48d72e66021df40121440107b9402a30a4e4351526d0878dca29a7eb57d68399052b1e2a6
 DIST restorecond-3.5.tar.gz 19070 BLAKE2B 6db7d0fc9085a07669d346e025836a94acca610572e986e2c90974b0bd21b55e66b57a2dafd7d42011bed5f06363b654f5431ac43530fccf7b68d3edd9d63850 SHA512 80cb84e62c7072a12fe57ebaafc0bcb441c853862c67f9ea35b86faa2d8e49ea22a70b9e05a3ff24e8ce08ca2999604d7961efd534f89167cd6fcb05c852de40
 DIST restorecond-3.6.tar.gz 18020 BLAKE2B 306b4a7c9990c0b2f229cc7963dbd0481df5f9fbecd709b37d254839177fc604f6f85ac19235209f4fbb12d9186f01dd71a11f98deca5d01bd70c415240ddf5a SHA512 e21fa23bfea488f2bddd01b4bab353f22863e09247078e47db9852995d7a0153aee6483cbeaaaf033b482b60f80affad0b6a3e829f935c3901c034a7efb1ebef
+DIST restorecond-3.7.tar.gz 18072 BLAKE2B 3f352345fa169a438fd6dc073d329c68aca67b3c49d100b1dc619ae40eae3764fa07327306ec0f1232450433e27908493711cc6aec20ebb60f2b66dbceed0cb8 SHA512 6b0ed20a5d6654281cae78a337254558a2170040f09c1f7ba023b40cf2a5b33b36d6f3c57d9e32d55523fbe78a8b212c0de377ce201778e2211aa37dc0b2b936
 EBUILD restorecond-3.5.ebuild 1157 BLAKE2B 4c2ae607b891a74674b86d62645fe393a73fea3b0e0d486d7b063b8acdec7cdde7b6fc21c8ca6088fec0abbbbd6866a2c1e766bab2a4d1a38795c091bd3b89c8 SHA512 abb97b62baf954c97b2627cae73c6db11aeb3945fad5674904c83dff379e3010e0f8723fa07576bc8a15c28c8da38d86c393c66beeb46945f314a354dfca0e80
 EBUILD restorecond-3.6.ebuild 1149 BLAKE2B 3fe366fcfa52447d631c359b30b031af9aa4985fa00cb50fa6578796648b263b7652b5dc3f8d13043dc21af9f5d02bca7de39108b030a0094388a22e65552c41 SHA512 b302c3dd802eaa2ae7647eef4810e97478af6c3b2c08531eb623c4670f3293acef6363281e34485ad52dba3fd0920d67a145f273173fd1f7389404a10c492874
-EBUILD restorecond-9999.ebuild 1153 BLAKE2B c1659b0f8f6445f3a39656a6828ae7f7a40c9a6f246a28f174d7c9328692113be9452300bf81773b673dbe186b58fea92c300117dbf4698bc04a2b64a52ad082 SHA512 65e783a2ed4176330d5a1142b3b86a7ed0a3ceba2dc968fb7497fadf8d0fcedd9cc557f0cf37f6941af416a01fb3a690a1b5086937fb6f16d9edfb2f9a94c9cd
+EBUILD restorecond-3.7.ebuild 1153 BLAKE2B 6ff3636d8a786f9adaceaa36ee6920c8061c455653f99962305c12f86ae4dbaf53a7a7ed1db85138acd75a22ed051c09b6845f3477049526a3426bdd8e7d522c SHA512 087906e6aaae1c86ed4a1fb2557986f55658f5a3a948abed0f2941ffe6d347bdfeecb5207fe3cf7e30a107e603804fd7c35d8c3f8e480b365c9d8ae3d67d9b72
+EBUILD restorecond-9999.ebuild 1153 BLAKE2B 6ff3636d8a786f9adaceaa36ee6920c8061c455653f99962305c12f86ae4dbaf53a7a7ed1db85138acd75a22ed051c09b6845f3477049526a3426bdd8e7d522c SHA512 087906e6aaae1c86ed4a1fb2557986f55658f5a3a948abed0f2941ffe6d347bdfeecb5207fe3cf7e30a107e603804fd7c35d8c3f8e480b365c9d8ae3d67d9b72
 MISC metadata.xml 335 BLAKE2B 72e72bc2d0ca05bf3caafd68121e0d4616306368f355541c2944254262a3ac96a3a6b8e5503ad691c2b7bc18dc6856101c81c47de3a623efc34b23185d9d4e60 SHA512 43cef46780c81459cc75b2a09181e84698a11e81196fea4e962b8081e712de437c8af032349aeb4f1ebe84ccef9cab4978467304d05801317db7a71521cf0664
diff --git a/sys-apps/restorecond/restorecond-3.7.ebuild b/sys-apps/restorecond/restorecond-3.7.ebuild
new file mode 100644
index 000000000000..452a33b36841
--- /dev/null
+++ b/sys-apps/restorecond/restorecond-3.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit systemd toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="dev-libs/glib:2
+	>=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
+		SYSTEMDUSERUNITDIR=$(systemd_get_userunitdir) \
+		install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/restorecond.init" restorecond
+}
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index 794b84bc99e8..452a33b36841 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit systemd toolchain-funcs
 
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index b97c99d16e6f..4d976e9e51f2 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,8 @@
 DIST secilc-3.5.tar.gz 180803 BLAKE2B a42620318b312a5ef35565e3b40a89fd7ff44aaf73de835bc349f927193121b72c07bd2151a8a6b2cee53e2699a3ae6bb246084e18a181d334ebc082fdfdc56e SHA512 eff37a981072c4b9c7c15bf4709db8797d8af5325883515f5c2fe611136b24419f6d01c797e4f131c9c08e1ba40576fcb2094b1e34325aae8351b6299bdba3dd
 DIST secilc-3.6.tar.gz 185186 BLAKE2B 47fdc281cad69339eb23226a277df8c8086557fe3a2c7f013eef38bbfcd62584e318ce2d79552388617687b39c37e67a1328b808becbecad364253b7527d3a52 SHA512 91381aae1444822c7897729c1695ca221a4226dcec042b2223a55800d1247510ef2033b844d8d0627623fb15b8169a626fb0ca2efeee8090635219c4139eabf5
+DIST secilc-3.7.tar.gz 185694 BLAKE2B c7bdfb01bc23008c5f360aeae9473db096a62ba535b2ec54d8f4ec766495f6de2642656c52d5ca8d28335e84bc42e76c9d5294db73a588aa4bceda8f3d59f814 SHA512 1f6061587242b63583370e04cc113b4884060c6071774b90908655df17ddc702187960d1f5b1ed53de9eb6ebd7f0029160e58d8c5f0c1126464bf6222f6f7d3e
 EBUILD secilc-3.5.ebuild 842 BLAKE2B 387d0db499db6576edae25dac89014d5e16525a1603b7562af7ad7e082e0515e22f890c0a938ef648876a4fe2a2b6eb638ed41aab606584b6f9bb78b1b76e7f8 SHA512 522010e0db519d7b55b2cca421ddf80d89ea60f52c3104bfa8a81e6ab7e1e53632f782ecfac04782e2c1d0fd20a5562c038af7e216ae80930a15633a92569f1a
 EBUILD secilc-3.6.ebuild 842 BLAKE2B 11f7831c1f91ed963df835f9a01ab2762ad02254e70fd9d7b34e20fb67c6bf370874d96eb6574c214870be6b81fd9a3a96e1a78c6749c2b8762de0c9ff80b41d SHA512 b1f4f8ef906d92676e2b8cb916ff1d6dca628e849231e326bde9fec9a523f460b3262347d74ffcb5bcbe571513250f8d08d415c9e40677ee6a01ed3cc5b9bdf1
-EBUILD secilc-9999.ebuild 846 BLAKE2B ae4db57ea74b12b316aac674d0200e5b4e2e7a3585d9343ae937b455c169c259de5d38d9bfe743444ca812abc037e48542a856f2d2e97d04460e106dc523a0b4 SHA512 65e49b4b3963335f751de4e2f95156ac62a158fd259d93b184d60ead9604e06a0887bc0970e965b3321564283165144ef9a75924e816e70615543415369402a0
+EBUILD secilc-3.7.ebuild 846 BLAKE2B 4600b06577156482ea74bb92f65098f86c6278b195353169b141c20ccf2c13feaef6c00187e906439480dbc8d64a7ca36bf730f36901650cfd458ba6bb7dbe54 SHA512 829b8dce150f0b6873b009698727a169b323cfafb699711bf0da16841ab686c682093976d67f785cf4e85c8c97d9ecf11aa291990bee7b2bca647acc8ea20ea5
+EBUILD secilc-9999.ebuild 846 BLAKE2B 4600b06577156482ea74bb92f65098f86c6278b195353169b141c20ccf2c13feaef6c00187e906439480dbc8d64a7ca36bf730f36901650cfd458ba6bb7dbe54 SHA512 829b8dce150f0b6873b009698727a169b323cfafb699711bf0da16841ab686c682093976d67f785cf4e85c8c97d9ecf11aa291990bee7b2bca647acc8ea20ea5
 MISC metadata.xml 518 BLAKE2B e04a38178db6390e78057059950b7c7ff090272739b618e75b5231176594a7fb3c2df88cfbf63575a3805bdb22f87c7f6aba7044bfc0c2c5e6ebdfef18b47d95 SHA512 a0d7f84a3578791107f46664b0da8078c37cf9a976d8aca31d462d2b19b82f1c7a0c7d5d43b9af59736983fa223238aabd1000d4eaaf18ee0a7759e2d6b0ce81
diff --git a/sys-apps/secilc/secilc-3.7.ebuild b/sys-apps/secilc/secilc-3.7.ebuild
new file mode 100644
index 000000000000..466a1d0558c5
--- /dev/null
+++ b/sys-apps/secilc/secilc-3.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}"
+RDEPEND="${DEPEND}"
+BDEPEND="app-text/xmlto"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index 5c59b25c3742..466a1d0558c5 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 inherit toolchain-funcs
 
 MY_PV="${PV//_/-}"
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 4f4413e83c8f..1da1910ed3d8 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,8 @@
 DIST selinux-python-3.5.tar.gz 3604439 BLAKE2B 5a7fcd303c337cb0f5ae0066d13c945bb5cacaba472c7b17f0496295294998fcc6d81c153720ef704b749a01590c28b48b4f471a48fc386b8f02564c3550250b SHA512 2ac176a9f078f2b2721e5871ba21e92041eed54fc692fd8d809ff14327beee6de63b3084d0f1053a640b9e40bcc6461498915bb9b038a658cd772f77d80fd217
 DIST selinux-python-3.6.tar.gz 3633272 BLAKE2B c2b99779eda2c7698f7f68740e3136cbfa5ab471a5d154142aafd2694d8c32aa605df3609a3667c687449d3ba44e72bcc3b37c36adecba8e34fcc629b9f04de5 SHA512 6289f3f2a3038b2cb62f6b3b12c729a9981c34a5ee80c0830e6316e8c77f5283dffa46007f6e7dc073332b829ed9953ba54e64c986fb18c7dc40759ec0375dc9
+DIST selinux-python-3.7.tar.gz 3652377 BLAKE2B 59fd7cab0034c175f42f6120ba665701945adcbd4e8af97a0dc2a1c79688a596b199528886ceea079a3f7a969258611fb660449d313d9e893de381293e786381 SHA512 036bc1f0e64cbbaade592dc7899a92765a0bac426140d7d3960f73bad6eb5f95d79d91e0f0e1604f88a991ebf59c4c90ccaaa4158f5dc4d3275ca2aed1673b09
 EBUILD selinux-python-3.5.ebuild 3162 BLAKE2B 0273b02c35abae8d4aa5798b71398f9c949640fe09a2f40ab3347662cb5d12b979bd700ea6841eb6fa3dbdfdbcdcbdd9040840dfead606d24c51a388429981a6 SHA512 346c103082f36ba32ec65831109236df893bf7c9debec153c8a2ce604533a79bfcbb5d9f73d4dffa0366651df32b3c8080b0ed7d1ec4d972f928a0dbbdec32c8
 EBUILD selinux-python-3.6.ebuild 3163 BLAKE2B 7099524305f1bdf2aaac073819a12d37331438789cf3e1c5fbc9abf5b50f58ae573e3dc485bfa49c13cb61a6f02dd4823f5d395df14c4887419ed5a721ce15e3 SHA512 3a03dd1b4b764d6f0150135f7e2a9bb58902255dc304689dd0f61698897772f6dc087456ce909bd3ddfe1cc2a081e3cfba61efa8ec9f305f34c75197b8509c44
-EBUILD selinux-python-9999.ebuild 3167 BLAKE2B b9743d6f36b67d42073bd9022079f440479f9f1c98a12348fc6f5e581cbcc611972e4a19d1b729fee4862799d50ff0892c39a743bc6cc15ecef839e036fa33af SHA512 4890877e21c8bf3bb22fdaa09d236423d961bf0eb1c843dfcb8e58cd1c56abb74c7873de762f920f5fb4ab92b9213b0c19554256d4f92ddf82acc6575344928d
+EBUILD selinux-python-3.7.ebuild 3294 BLAKE2B b620d76eb0678190a35a3f036f8611c98b4b12011cbbd68e7ece42186264e12881b90958487c77f96437ea5c520c3463a7fdead22fd85a82ee1003c050b910f2 SHA512 b5237bb412d33557b45e040a010b85393ae0ec55058911de5afbce83f4e0b116235be4d5f3c99c25c267de643dfcab1a382816efa39b3f79b9d01de0b67551f8
+EBUILD selinux-python-9999.ebuild 3294 BLAKE2B b620d76eb0678190a35a3f036f8611c98b4b12011cbbd68e7ece42186264e12881b90958487c77f96437ea5c520c3463a7fdead22fd85a82ee1003c050b910f2 SHA512 b5237bb412d33557b45e040a010b85393ae0ec55058911de5afbce83f4e0b116235be4d5f3c99c25c267de643dfcab1a382816efa39b3f79b9d01de0b67551f8
 MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304
diff --git a/sys-apps/selinux-python/selinux-python-3.7.ebuild b/sys-apps/selinux-python/selinux-python-3.7.ebuild
new file mode 100644
index 000000000000..f772119ca1ee
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-3.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN#selinux-}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=sys-libs/libselinux-${PV}:=[python]
+	>=sys-libs/libsemanage-${PV}:=[python(+)]
+	>=sys-libs/libsepol-${PV}:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	>=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=sys-apps/secilc-${PV}
+	)"
+
+src_prepare() {
+	default
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	python_foreach_impl building
+}
+
+src_test() {
+	testing() {
+		# The different subprojects have some interproject dependencies:
+		# - audit2allow depens on sepolgen
+		# - chcat depends on semanage
+		# and maybe others.
+		# Add all the modules of the individual subprojects to the
+		# PYTHONPATH, so they get actually found and used. In
+		# particular, already installed versions on the system are not
+		# used.
+		for dir in audit2allow chcat semanage sepolgen/src sepolicy ; do
+			PYTHONPATH="${BUILD_DIR}/${dir}:${PYTHONPATH}"
+		done
+		PYTHONPATH=${PYTHONPATH} \
+			emake -C "${BUILD_DIR}" \
+				test
+	}
+	python_foreach_impl testing
+}
+
+src_install() {
+	installation() {
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+		python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage; do
+		python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" \
+			> "${D}"/etc/selinux/sepolgen.conf || die "Failed to generate sepolgen"
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" \
+				> "${D}"/etc/selinux/sepolgen.conf || die "Failed to generate sepolgen"
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" \
+				> "${D}"/etc/selinux/sepolgen.conf || die "Failed to generate sepolgen"
+		fi
+	fi
+}
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 79bfb3db2006..f772119ca1ee 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
 
@@ -101,14 +101,17 @@ src_install() {
 	then
 		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
 		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
-		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" \
+			> "${D}"/etc/selinux/sepolgen.conf || die "Failed to generate sepolgen"
 	else
 		local selinuxtype="${POLICY_TYPES%% *}";
 		if [[ -n "${selinuxtype}" ]];
 		then
-			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" \
+				> "${D}"/etc/selinux/sepolgen.conf || die "Failed to generate sepolgen"
 		else
-			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" \
+				> "${D}"/etc/selinux/sepolgen.conf || die "Failed to generate sepolgen"
 		fi
 	fi
 }
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index fb9908611af3..d3f3d15fc56e 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,8 @@
 DIST semodule-utils-3.5.tar.gz 14383 BLAKE2B a1bb432013bca1023d99b32f43b2c972b6b807a4677f9d8c9fb9aff10225232506f3ecca86fc231b4c63d04582a91a1c4218f87ce5532a4d35a26a09665c6f10 SHA512 7c32f425ae71745040d1c6a6585149a1efb319913aa9d4c8bf185b0a4216dc66378fa38595b171614ee3ae4ade997d3ae56a060346e334faec55c419a87d71dd
 DIST semodule-utils-3.6.tar.gz 12844 BLAKE2B e5e7501c412649f471e89cc89569d6c51421e0b46f172f243ce778bbe3a2c658ef9a92e3f3e1e07fb3358e25f63e004b6bd4b56619472fbcae8cb5b916d54170 SHA512 16b58bbafcaef9a2e8e34a20d0e1e4024a9044024de8fa3137c5ba1b9af600afac51c15ccb648dd6bff77747c047f4c9feafeea07c19b1eb14955acc92697a48
+DIST semodule-utils-3.7.tar.gz 12896 BLAKE2B 7487c74585e281f6c44e9977efb85e89bf01d93285c6cc6593dd876e948cc385ec9f11b52f3fc182b2bac3621bcc89c53fc217c41b1a01d586274139b0a40fa6 SHA512 133f76ddff0cc4121e59560f4167e15288cc7f6172a39b49ea631803f6e3365fef95166a55498fa2e036de85466e37bb6ec164ef60855eef8c888c9b384b0120
 EBUILD semodule-utils-3.5.ebuild 876 BLAKE2B c9d57a97fb559460aaec7b355a981192ef5b79db015475b7ba923c5b89a2f1df49ac45bd7d1c59de757cafa13b07a89f5dcd924df9f975c9c8c02725ed025081 SHA512 ff1ce29a9662b041a3c18e4d7c8477856c0090111d67bc4f9531e4e3486235432ea4f7b20e46c61516fbbde61ca7c39c9a2f51a5436c9057e67e7b3172194a3e
 EBUILD semodule-utils-3.6.ebuild 868 BLAKE2B d4479078dea00ce5b28c380820ec3049f994905d873ae986e6ba7434d43732fd52a98fb25d3b4958afff435cdca4eefeaf6600ef625e223133fdb91f5b46e839 SHA512 3e9f43bf74a9e0757eb6ca26b4c765fb6a7332d1bc3871cfd8924e4eddf275b4986863d416a075950973b53357a5b36a7641379f606cc4c784079bfd99c06780
-EBUILD semodule-utils-9999.ebuild 872 BLAKE2B 920343123a3612f5c3694a67bd91fb3838e74f63a1b937a6175c071fc7ca80c6063eaefc6cde517c5e365ef56b4d96d99e65d0a88ce459a9e390079656112c1c SHA512 6a8f6dbbb03e49a4318b69dbd23ee0741d44b591450e98365989b7ab2f868b08bd5124f826d873f6487661cd0fb24d28221a0521538a0bf98177d8d32efd55c4
+EBUILD semodule-utils-3.7.ebuild 872 BLAKE2B c226d498965bb773fe1609f72ba7a92d6b9795be6e4062b50fb4f140b2c189d29b8ce1dbeb3b40c24b79c2bf134bf87047afc83bd68a86342be7cfbf088735a2 SHA512 627cede2c56c0d5a8955a4ee999d547dadb4e4207cda6e68c68eed5853d0572ec78683fd58c2babceed3ecbe325880a3bc57c7eb025287ea7bae01e7e85ea9f1
+EBUILD semodule-utils-9999.ebuild 872 BLAKE2B c226d498965bb773fe1609f72ba7a92d6b9795be6e4062b50fb4f140b2c189d29b8ce1dbeb3b40c24b79c2bf134bf87047afc83bd68a86342be7cfbf088735a2 SHA512 627cede2c56c0d5a8955a4ee999d547dadb4e4207cda6e68c68eed5853d0572ec78683fd58c2babceed3ecbe325880a3bc57c7eb025287ea7bae01e7e85ea9f1
 MISC metadata.xml 401 BLAKE2B de9fab42212c80ca7439bc2f09693f17a5da3e0c412a1599e12c9c02087487a68836ecf651b8b016b3215552cc88cd8b398d42eac783f0039d10d962205d280a SHA512 28d7ee52e3e1a41366554857904226d1fa9cea07726538c06913c65f7c12ea9d70a5d6ede253659e14f7672f6cedd90ac4ac572462220493e256f640a40876e5
diff --git a/sys-apps/semodule-utils/semodule-utils-3.7.ebuild b/sys-apps/semodule-utils/semodule-utils-3.7.ebuild
new file mode 100644
index 000000000000..088b9f48cc78
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-3.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="SELinux policy module utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index 621cfaf21ea4..088b9f48cc78 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit toolchain-funcs
 
diff --git a/sys-apps/syd/Manifest b/sys-apps/syd/Manifest
index 841d98cf100c..4047e0e852c3 100644
--- a/sys-apps/syd/Manifest
+++ b/sys-apps/syd/Manifest
@@ -23,7 +23,7 @@ DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4e
 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
 DIST caps-0.5.5.crate 17575 BLAKE2B 77d788f936eb36c2f4776ee719cdc138dac4b840ce632190f34ed26e705175209f9905c71d96d54f0c69f4c6d25f0a203a4d490f2034c330480bedd5ffab149e SHA512 866312aa0f3847dc2779570d1466aaae00945d78a2f5f3b05a833c67a2abd04c0380715f61dce79814845e4e57321adde67fea97f99dca56a970c6e6f80aa029
 DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
-DIST cc-1.0.101.crate 79446 BLAKE2B fbecc04723577abd209d16c34269b5ac2652fbd5385838190c744abf573912fa7a062e2fcf1dc76486c5b61677225a826a65dbd6eca58398ff60ddd1e47a3caf SHA512 6edaf3dcc2e58dffd7221a6b457057c83bdec03b6fad9cbd2d702af6820fd8354fdb3960cd78d8b38568ef408171354f0313f17a32f0caa64f97736c0840a148
+DIST cc-1.0.102.crate 79585 BLAKE2B 2e61bce7eb03a71ff7639f67984ede95fbb0e38489fb29a77cd53f436850c2e67503f1143ceb65afa16ed8a304db6faeb66c12e7ab510d2bfadf2008725f6707 SHA512 49a88d5916bd1d5a78ed6ffb7f6b1b3446e81d713afa4d5ccfadbd34872a3f5d88f3ef568f187389e0c82521db3f89f7e047f177795d3732457670a42e8d0d8b
 DIST cc-1.0.99.crate 76961 BLAKE2B d615f647bc5e4f7f580f878fc41baee172e9513f1157d421c491c36af2ca330dde2a6ddd4238c03aae27feed5e8cc042f4b790d7b145952a8676ac553f72e356 SHA512 2f6c9a0869b3b636b011390efade0085ed5fe616ecb33ff586c948779b9c9bea9169cb1c31441b0aeb63dbaa35cdb76b6e67ace38d561e2c150e06853a2b1757
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST cfg_aliases-0.2.1.crate 6355 BLAKE2B a758d9c88527f0e6e7cfd6d4c83eda1bcb4d6e2438189fe08e8ecbcaa78d56afc5a4873f3b82bf7da96afd690b44cdf1e44466b6da0f37c358b340481017103e SHA512 74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c
@@ -32,8 +32,11 @@ DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05
 DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113ac327ff727953c73b64b60ddae22e5b1b65d8be5aa401f8b13d34074cbc8b47f23abd7a13d551f0b1c78f23575 SHA512 641b8592f9699d5e6c607815c8e6dfc82b2bd01897015e04ef8853420a7d90c2ec5c1140e39eb7623ce05587bea52ef63659eae76baee5b6592d2ac5298ce106
 DIST ciborium-ll-0.2.2.crate 14695 BLAKE2B 3c9ab0b338070359f9565706a504e4f6c65560072380af6e0a57068ae6716773d40e75dee84ded5e1d32f93445a07a0965759bedace58291b68b94479fb16488 SHA512 2f7ef6ad8bf5a862e8b9daa64bc6d8184c87a22c264b10dbb35c00c9effcd5712f354b4ca6c2eb8e6795d4b99d7cb88fa2acf01f3ad6fb28caf81708a500549a
 DIST clap-4.5.7.crate 56343 BLAKE2B e2392ddd11213c8410344c474d84bf40d2d5a0663d25ce8126940ce59085a84334223e92ebd59fc387b4d1334b8f8cd7b76eb15f916adc5ef59b9858929c5787 SHA512 f126132811696d5fcac0242264121a08c1f7c59b4830d73b6b95b8c5b31a2c11928b0d7026151a5d1a0108aa912d7c6157652193ea1ef5a980669bdf388d5bfb
+DIST clap-4.5.8.crate 56338 BLAKE2B d8f07ac09b59f631047a54b0b9918d18d264508d5ba173c9895fc613102b0cfbbc76b89e58abafb43c1fde7dfa129f3a0b478219c3984eb41af6efd3ae138ff9 SHA512 cbfdb79e8020b72c618dcc2d554e41224f4995b6c47512c8406137aeb2df971a29fa198e504254b758c7b87bb2f2ea3cafc542f412d747744abf25a334ed6cb7
 DIST clap_builder-4.5.7.crate 163957 BLAKE2B a1d6e728f05b7f7eab8fd9fc8dd0e25f8a066e0ba72ccd6084e747f5833ef90e98b63f4bb0b3af54b74c193df3ceb4eac63a45c9f3222570ef7ec85562346a01 SHA512 df0ef9adabb61538619d94ead0768fb8291cdef48c0cf47b323aa366fa2564d89ddf65cd0ef0b7162ef5e590be26a357cc775ae5278abf8048c05a5fbf58b5cc
+DIST clap_builder-4.5.8.crate 163870 BLAKE2B 291af36cff2cf7c97cf0b6b58843ebc8a590efcffefd8fadf0db1a1689ded94b2288fd40bfaebdcc827e50f081f8aa1758c4cbf2b5bb9f666e0cf66091fb8896 SHA512 9b0f422369086be254a7034e96d2bd5fc496da9d8be55d962528f765a5e77f003a048deb84569319d4e424abdaa3c653bdff2897fa393e7d34c1ff90a99c4eea
 DIST clap_derive-4.5.5.crate 30017 BLAKE2B 8525d8adba25ec0165936f72f78dec3cdffedc9de8e537b078944b1830640222013e335e86a2337ae9ea3b07dd655275705eeeb8c2155224dc0950ed00e47f7f SHA512 90c2110445c832d81cf66287ebe32155c6bd72a0a75cdbceef4e411d4b9d83268af244adab6755379b6970b5d40b39a9f89df9ef8786429fe73d95a3eee1c134
+DIST clap_derive-4.5.8.crate 30024 BLAKE2B 3d2d7e3652c6e16329a0897b985288d8beb6c68051d3f6216e75c6aa98a773d2cf609c1df82df7ab2b5f43c62c8a028da29ff1e314cbde096376bd43ff6b3b70 SHA512 587b63b99ad47b6902094d40ee4cea6c4e1d547e11fa50095b007a8495b11b25b3b6ef37583526938a56103982aac7d2addda833d2323545b753a852fc830b43
 DIST clap_lex-0.7.1.crate 12766 BLAKE2B e0e3a1a4a65bf9df3c21753f9298a7461046e6b34c7a8d26521efc551ef3511a7d202f25ebdddf285ff68c4073364f48cf739ff0bda32f41d4fd0c87c4cf02fb SHA512 4cdede5eb9fa527567e9f3f94fd8fe7e1022d9e9236e78d30b3068befbaadedd778b5464f800e74bf187c44af9df582365f4d41a0113f8ab0fe9abc936171fc2
 DIST colorchoice-1.0.1.crate 7895 BLAKE2B f1c841e74f01f33fa83cf41c5f0a1286ca3899239d9a188a838550abde507af374a4fe3e85934d10d28bd5eae2c7fa1f662307bd46d5dd4daa52249cb64ebb5b SHA512 3d216ba46cfcca5c52a56884ed09fe7d6d350ccb44144a60c75006582f7f9a28df21d44375a8cb304c721b9de615875675b3a03c485eb209b2a12d745fa609cd
 DIST const-hex-1.12.0.crate 22720 BLAKE2B 5c75e7b189e2f61e59ac7c189104b496e651073f958f139254426560d24dcf5335199bbe8e72267405faf9120eddbf33c7ef022d282a998c2de5f3ee05623a1f SHA512 27c3e9c0f7b7e35faea8f261dc542f571c1e240539049b8ba6c2625558e1cc37cc189a93a5847c3c8b10d358e360255c6bd76c6933cff3296da27f3f878d5a48
@@ -137,6 +140,7 @@ DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996
 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956
 DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
 DIST object-0.36.0.crate 321771 BLAKE2B 6350df2cd8e2cd733397768e3fd9a2a79d182e0e3fe653bffe0d688a944713cb83434b2810a48638b30f89f0fc5311784a7c7dc82291191a8e5bd310c82531a9 SHA512 5a75b296bde7a01a9a5cb59da98b7599b51c3ccdea2c135c5291ed10af8b1fab46dfe936e43de617328c216fd113913545fdedde00adf22fca251149b22bd6bc
+DIST object-0.36.1.crate 323865 BLAKE2B 60afa0ce744d32544b56e982fee69a33114de81ddb8e25156c4f1c6e492b39390a47e14a929cb7a9688bad34923a67d164295a42eb17932433b7d6b5cac72d85 SHA512 a64a7538f4be5473f9f206cdb0c79cc402ff3c868b7b4d33ec899e07754d55999e9a1dea0f7cc465be8effb3dbf9859d1460b083de1e3ee7bbdc7434d242361a
 DIST oci-spec-0.6.5.crate 59030 BLAKE2B 5df5984dce5c5be0aedff102b9ac4e6f183267de5ce07b6688c69e8ceb92c9acd2bac4780d6bc68598fe0cf0e564c2176885f2f164abce834f83808b85de40c7 SHA512 8288f95f6e903e9d48e717a569165512f4f545fa05e776f0a2509a0fe780f4adc3dfb8d51c5ee8eb9bbb7b6cb598e6ad4419c2b2228e7eb0e0324a193a618455
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
@@ -212,7 +216,7 @@ DIST strum-0.26.2.crate 7189 BLAKE2B 7582fe304551e98b121d3a386af22bc022d7d11323b
 DIST strum-0.26.3.crate 7237 BLAKE2B bdc348c718c39609c00b9fa7d47b7090b1467022b7a8a28cc7c8a72a0aef20569c6ab22a8a8d26c2d9272f18d000e4ce94858a6647194f0a7b86d812d52b05a9 SHA512 62f116d5bbc6167a6ac68b049f8045bc660901f1ce1252f8bdcd91cb28bef821aad8098905369db6c2fe74c134a5d549e55ddd28e383d7d78f7175258924b268
 DIST strum_macros-0.26.4.crate 27531 BLAKE2B 7f7d57c957a1591054288fcae6590a5e669fba1b47d8f1a52371ce60fd84f91fdb430e48cc7edbb5fc72914be5ce12af29758b653680da3f4177339b31206750 SHA512 77a17ce47d5e8fe8a89cb6aa6c3ca5d5c2625aea0f93456f05a9994238cd3b08b3f7c6a45e9b3db21bca8fb5759f505f15cc111ac84acbbb34d59cdae8307b0b
 DIST syd-3.22.0.tar.gz 775939 BLAKE2B 727131c9c3fa3c549adadf7f8f161a887b736368117503ba643a023b2ca6f442ed23ba7d878b86d8ff836a18e698299257af11aad0515f927ce8231f7ed33ce7 SHA512 5d02b40f7011627bb027c3c0cea9fa4e9c467da511c6f1fc0ee8083f4283afd95d56cd1fa375f2db0885793ce2fcfa53baaeb5f88ce2c7686191321a153d93b7
-DIST syd-3.23.1.tar.gz 801765 BLAKE2B 7c01ca40847857ba27f865d409b5ef0200283ad5c2cae16a963634f6711df9f84488bafc0a10ca25d6ce7371132f202de602a85a30154ad53befa327a2ff71b2 SHA512 5ef42c5f08fa751ecad6880e8ad5ba8c52076a24adb0497a4ca543335377b6fe4a3fdc5c3d654ea0476fee59841e05a0f080140691170880cb358b6bcca420ad
+DIST syd-3.23.2.tar.gz 801827 BLAKE2B 13bdd25e85b134a9da6bc4d30214199271b0633bf8d58bc5b0a1ff6a936c035066aeb78d1520fe9c3ba2b2d2cbd6a0f70e0438bef13340355c48d1300c3f65b4 SHA512 8be8f181e857e34c4e78afe2346138705b19eb60d886e9690628d80484d37e69b01f42152826d068f18080b0bcae7a446d8cce6e82d64d73ca8c163500284d31
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.66.crate 264855 BLAKE2B 5029091b2cfa88e5c739be913a647dc9492696398c09b891f84089350e6f09baafd9935b81e0f3519d5465eff2e1822ef6cdc96c15d6a40d1b6b8dd2f9e7d073 SHA512 60a617bfd37d74c52e4d4d63ef0a27a2f9b982469a6926922f2f6e96754a0c66affb0847b9a44d505c053cbd788b97e998efb8d1e558ea00ae4a0b7f15bed9b0
 DIST syn-2.0.68.crate 265035 BLAKE2B 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975 SHA512 7b781f8ea2b0d01c06f47d165da99cd96e3b44a33de1d77c78a2cb37ebe3f8304f426ba3d0d1cf766241dcc0537908774504df7d455d63bf89ec22ac0499d372
@@ -280,5 +284,5 @@ DIST zerocopy-0.7.34.crate 151177 BLAKE2B 30b65131370dfa4f41d3c2705d3b75da9b76f2
 DIST zerocopy-derive-0.7.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe
 EBUILD syd-3.22.0.ebuild 6570 BLAKE2B 075bcfa0c5a3be15644deb2e6d87f10d69cd1f366540a49fa3e6dccc87c313b0cb3c49a7f321d38122dc7867a73e88470635ade9752e60180e00e49ea331b91a SHA512 846b70992bb2448f3600a5e042d9861c557b84ea4b560f412c9ea73d9a3c2f85db07dca72cdce6e3239101c63e49582dbc234c3606e9ab34ad8992918a2d8aa6
-EBUILD syd-3.23.1.ebuild 6210 BLAKE2B 9e1d9389c786e564ce8aee7b7cc6a4be3e0b5d3d1d38bfbe1301accc6a8a8836212838f564431aac4307f7000ad0eb7bb58428f04a0909cce30bbf271adac45c SHA512 e52d036c0a60e9f085ecaa5be8779de9447748cfd399d619e2b380770ef910e869ba4751a0a658d1563e3d1f37d09f61b424446e3660ad2fec7cd6aee131287c
+EBUILD syd-3.23.2.ebuild 6210 BLAKE2B bc923395115ebafcfa0a3d55cb924e5d27571eba0654a60cfc119d5f402cf2eb9f5ac45067ddacfc4d396e08e3b6e346be35a8869f0bbef7fc782dc287d775a4 SHA512 57623e416c0c599ad4037a491f0fe4f8997d5ffccc6eeb3b8a525fc23522e5b493921e002432367b2dd9f5794537859558d78e51239d2e911afb18e727d82f1c
 MISC metadata.xml 254 BLAKE2B 0e6d918ec0aa523a1d7ff2da1c9081d8257c2a83396bc5c7033412341b400364ee2d9b155d9d1df05da92b11f6a940dcda2adae7c158e479d082ce4a0583971b SHA512 24b045489397ba3bcd9dc48dbbc8a26189c1220053c04f09035dd735d2a3fb2ad6a55791f943f4502fee20c633c4a30983b76093f31ce752994f424fbb3cd21b
diff --git a/sys-apps/syd/syd-3.23.1.ebuild b/sys-apps/syd/syd-3.23.2.ebuild
index e1a5dee790aa..3deaac5294ca 100644
--- a/sys-apps/syd/syd-3.23.1.ebuild
+++ b/sys-apps/syd/syd-3.23.2.ebuild
@@ -29,16 +29,16 @@ CRATES="
 	bumpalo@3.16.0
 	caps@0.5.5
 	cast@0.3.0
-	cc@1.0.101
+	cc@1.0.102
 	cfg-if@1.0.0
 	cfg_aliases@0.2.1
 	chrono@0.4.38
 	ciborium-io@0.2.2
 	ciborium-ll@0.2.2
 	ciborium@0.2.2
-	clap@4.5.7
-	clap_builder@4.5.7
-	clap_derive@4.5.5
+	clap@4.5.8
+	clap_builder@4.5.8
+	clap_derive@4.5.8
 	clap_lex@0.7.1
 	colorchoice@1.0.1
 	const-hex@1.12.0
@@ -132,7 +132,7 @@ CRATES="
 	nu-ansi-term@0.46.0
 	num-traits@0.2.19
 	num_cpus@1.16.0
-	object@0.36.0
+	object@0.36.1
 	oci-spec@0.6.5
 	once_cell@1.19.0
 	oorandom@11.1.3
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c694b72190e5..4dd354127737 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -7,6 +7,7 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 AUX systemd-253-initrd-generators.patch 1486 BLAKE2B 85a7f714aa1743bd88e01b45624dc4104e4d762732745d9958019063f6ac91ffd89ae84e03f728e6040a58643f253a5ea7f77f44ef71620e686e23aed61876e4 SHA512 f8aab9f4bbf5a73c52144013fd7001dc78974211f11abb58a0f5eceff59b3ebf670409846fff854daec10219074602674176730f85583db0e81275289e89c66b
 AUX systemd-test-process-util.patch 1077 BLAKE2B 0f01ea7641366cdb01a9e310d326ea73052dd0e6fe8b4217e45d0632aa2af3f2ee33b8a8f6dfe70c3b4e3f240f0e2c738a6c4d28f6f38d9e36c4f408b2ac0202 SHA512 ca23effa72da5875ec6ee112e25db51229bf1a03b61053ce4bf2b81becceb31456c137ce9f0fa05071fe1bfc2fe705fa6b885df88d9fe093fc87970936feb071
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
+DIST systemd-256.1.tar.gz 15643508 BLAKE2B 2075f5b927107571a80f09bf09ad84f8f4e3130cc135e098b187ee5e9afa3d6f2784c10b6ebe0a3fb9d3e069fe0a3539e9ea911d0dcd9f2f4a2fc150306711af SHA512 5441f634f43b726c13fe57d1ba0030f1b91427d7c2d4f4f32e4add8ff93aeb5139e9337422653df3b897c241e0a8760dafcd441dc622d1e2c1230bbe27dd1a1c
 DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
 DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
 DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
@@ -23,5 +24,6 @@ EBUILD systemd-255.3-r1.ebuild 14938 BLAKE2B d6f0b4afb9cbea790b4df4b7365eb9b5b3e
 EBUILD systemd-255.4.ebuild 14965 BLAKE2B a33e0820412a9ccde7fec48f3924faf178add50febc66edc2156772cbc355013c3814bb90b2daa402a5fecc7dd23a6402481269aade7d15eed8dcd49f220d8db SHA512 69ec1ba7982efdb33cea7aa1b678475473994afc658d4b7eab337334161eb03c5b838d42f2b258675fd2a45372c4435ae8ed363a2dfb3419c2fe21939013fc23
 EBUILD systemd-255.6.ebuild 14923 BLAKE2B e54f5d74692108f87d090101484b24895678d4ca4fb2d1d4dff1f34ed5c6fec4813c5e6e155ee95554b2fa0ce085970eeace6709c643db8927147f55faac58e1 SHA512 b388d0155fd979e2deeae88728ac2d232320602cbbf541ab844e72ce6d70e90a98cae9eadbc1057b1ad4945cfb527cb7e12cbad1586750127cade6f0fb832e8a
 EBUILD systemd-255.7.ebuild 14910 BLAKE2B f2867db0e274b6d176f0b898f8f3297c76788c76ab2a1640403ee9c0470331b546edd53a7a4afa369494f557014a9e84cfaff104d78d1eb3c3525ad4d615eddb SHA512 fd3a0836f87a5b4b6fde043d82966f2e025b80b54c1a921685c93073b70b668f91f22945e7c1acb01b90b616f2888b56c4ce974ce0e5ba2999297779c09752f1
-EBUILD systemd-9999.ebuild 14821 BLAKE2B 8651144800e92ffc777908a5b3bdaf3ef6bcb877cc063f131d2080ffcb54a900fa3448c0bd06fa5459c0a1fc53e7e542f704ae52b592f15beb17ff371d700bb7 SHA512 e250884f77f75fbc7837d52c2a6ddf26ed485ed1c7a7c6009a2fe5bcce67241d2c3a588c895ca7da70f7f4c564c9222e6078e7cac5e0c1c6142342a569244d95
+EBUILD systemd-256.1-r1.ebuild 14848 BLAKE2B 3b9e7882795de0ddbaf2098900b056c85d8de4cf512a7dc903e9d1e3f85e80c104c68f096906d97485ac1ee9a92ffe10d0c0e298fb8925ea1005f04cb91864ec SHA512 394dd42804479e8dee7f2b786cf5c86d9bd89fc5726af0d716c65c209d8c3cafffa159f6dbb04ee746e32be9d47f45ab84a58013985fac0f61f46de3b141edc9
+EBUILD systemd-9999.ebuild 14848 BLAKE2B 3b9e7882795de0ddbaf2098900b056c85d8de4cf512a7dc903e9d1e3f85e80c104c68f096906d97485ac1ee9a92ffe10d0c0e298fb8925ea1005f04cb91864ec SHA512 394dd42804479e8dee7f2b786cf5c86d9bd89fc5726af0d716c65c209d8c3cafffa159f6dbb04ee746e32be9d47f45ab84a58013985fac0f61f46de3b141edc9
 MISC metadata.xml 2609 BLAKE2B 8947f3b696fbba7b90e838a54fbb4fd933c71907c8011652fc2b7d68d4ce5f78a19f350a309e4c0f66ef0159376c9064ba9c15941ecf1748c359c4ae3b072102 SHA512 dfeea24b7a93f5d4af4ac47b87ba08092d069fb1a4749c0c1f36a669be6115eaea8f67e6183b6a4f155ef90d7714f74299109420d569c2b0545d80584ed0e97e
diff --git a/sys-apps/systemd/systemd-256.1-r1.ebuild b/sys-apps/systemd/systemd-256.1-r1.ebuild
new file mode 100644
index 000000000000..d2c7ad24ef7b
--- /dev/null
+++ b/sys-apps/systemd/systemd-256.1-r1.ebuild
@@ -0,0 +1,527 @@
+# Copyright 2011-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit boot cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dns-over-tls? ( || ( gnutls openssl ) )
+	fido2? ( cryptsetup openssl )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+	boot? ( kernel-install )
+	ukify? ( boot )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.32:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( >=sys-libs/libapparmor-2.13:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( >=net-misc/curl-7.32.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.3:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( >=dev-libs/libpwquality-1.4.1:0= )
+	qrcode? ( >=media-gfx/qrencode-3:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( >=sys-libs/libselinux-2.1.9:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-build/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep "
+		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
+	")
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if use split-usr; then
+		eerror "Please complete the migration to merged-usr."
+		eerror "https://wiki.gentoo.org/wiki/Merge-usr"
+		die "systemd no longer supports split-usr"
+	fi
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use boot && secureboot_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/systemd-test-process-util.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		# default is developer, bug 918671
+		-Dmode=release
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		-Dsplit-bin=false
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# no deps
+		-Dima=true
+		# Match /etc/shells, bug 919749
+		-Ddebug-shell="${EPREFIX}/bin/sh"
+		-Ddefault-user-shell="${EPREFIX}/bin/bash"
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnutls)
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use test tests)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool ukify)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+		$(meson_native_enabled vmspawn)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	(
+		unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+		export COLUMNS=80
+		addpredict /dev
+		addpredict /proc
+		addpredict /run
+		addpredict /sys/fs/cgroup
+		meson_src_test --timeout-multiplier=10
+	) || die
+}
+
+multilib_src_install_all() {
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	insinto /usr/lib/tmpfiles.d
+	doins "${FILESDIR}"/legacy.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}"/usr/bin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}"/usr/bin/{halt,init,poweroff,reboot,shutdown} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir /usr/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use kernel-install; then
+		# Dummy config, remove to make room for sys-kernel/installkernel
+		rm "${ED}/usr/lib/kernel/install.conf" || die
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/sysctl.conf ]]; then
+		# Symlink /etc/sysctl.conf for easy migration.
+		dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+	fi
+
+	if ! use boot && has_version "sys-apps/systemd[gnuefi(-)]"; then
+		ewarn "The 'gnuefi' USE flag has been renamed to 'boot'."
+		ewarn "Make sure to enable the 'boot' USE flag if you use systemd-boot."
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager (systemd)"
+		systemctl daemon-reexec
+		eend $? || FAIL=1
+
+		# https://lists.freedesktop.org/archives/systemd-devel/2024-June/050466.html
+		ebegin "Signaling user managers to reexec"
+		systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if use boot; then
+		optfeature "installing kernels in systemd-boot's native layout and update loader entries" \
+			"sys-kernel/installkernel[systemd-boot]"
+	fi
+	if use ukify; then
+		optfeature "generating unified kernel image on each kernel installation" \
+			"sys-kernel/installkernel[ukify]"
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a17076f3a5c6..d2c7ad24ef7b 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -14,15 +14,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
 	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
+	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/systemd/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
 	if [[ ${PV} != *rc* ]] ; then
 		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
@@ -33,12 +28,12 @@ inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-singl
 inherit secureboot systemd toolchain-funcs udev
 
 DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://systemd.io/"
+HOMEPAGE="https://systemd.io/"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="
-	acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	acl apparmor audit boot cryptsetup curl +dns-over-tls elfutils
 	fido2 +gcrypt gnutls homed http idn importd iptables +kernel-install +kmod
 	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
 	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
@@ -250,7 +245,6 @@ src_prepare() {
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
 			"${FILESDIR}/gentoo-journald-audit-r1.patch"
 		)
 	fi
@@ -282,7 +276,6 @@ multilib_src_configure() {
 		-Dsysvrcnd-path=
 		# no deps
 		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
 		# Match /etc/shells, bug 919749
 		-Ddebug-shell="${EPREFIX}/bin/sh"
 		-Ddefault-user-shell="${EPREFIX}/bin/bash"
@@ -502,6 +495,11 @@ pkg_postinst() {
 		ebegin "Reexecuting system manager (systemd)"
 		systemctl daemon-reexec
 		eend $? || FAIL=1
+
+		# https://lists.freedesktop.org/archives/systemd-devel/2024-June/050466.html
+		ebegin "Signaling user managers to reexec"
+		systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
+		eend $?
 	fi
 
 	if [[ ${FAIL} ]]; then