gentoo auto-resync : 12:11:2024 - 03:02:41

42 files changed, 2340 insertions, 323 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f58963e449b6..445ca902f931 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index dca5e5a10662..1b2c2edf5b00 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -1,11 +1,4 @@
-AUX dtc-1.7.0-meson-macos.patch 1303 BLAKE2B 1b479891e150a990fb560aac8e74604ee97373ab7bb26f3171552bcad6c8c649e0c4a57630ab85bdcff1cf49c7318a3e154112be65e70a2fd078774d4ed17ed1 SHA512 ff70b6396410ad45dd49fb83cf2762ba081a8f221e9713934497b562b119951f0a50eb041680ba2318059537af54015047aacf03f38259005cfb86b0f002961f
-AUX dtc-1.7.0-meson-tests.patch 1265 BLAKE2B f121b676e2f711e6be75ff4f2c7a077b7e9efd682cd29dea08135958e8c9f29ce9b4ff42c1bfc22d77927d749d44264647e47e49d260a7760151fa1dae93648b SHA512 4afb9bc6b2615ba58ae5d997807563ec8672a9253a9d5a15ea5ed476ab1cf80229de3ca0289f2b016c31d6bb9adc2ecae46d004425244cc699768159b8929761
-AUX fix-tests-for-Python3.12.patch 1914 BLAKE2B bdb612e1aa3d42a6d17bf1663f40cec2ebc2222ebedcd67bcb6f20c4cdb389f9cc0c4f7513d56de659996f76d0311551dc0e513612cdd7cc367126ca26398de7 SHA512 2fc10469b4c1f5016cdccd1a1e24d1f0984267c88efe88d268d52d9a49c441d832f53bf004a5223810c82e0f10cf5b515d6a6ddb56e49ca5bb86b55724634f0b
-DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
-DIST dtc-1.7.0.tar.xz 165548 BLAKE2B de433a1034b7ef75559bf39f85695d0b275cfd17bf100c12b6186e226a65659053f9b5a053f20e64a5a0670ea3e728edd0e624c26287bd264594569408065bab SHA512 d3ba6902a9a2f2cdbaff55f12fca3cfe4a1ec5779074a38e3d8b88097c7abc981835957e8ce72971e10c131e05fde0b1b961768e888ff96d89e42c75edb53afb
 DIST dtc-1.7.1.tar.xz 169524 BLAKE2B c9d9d7c60ce13c8e138ab8ddf3e8166d7cf3867ca4e5ea53621bf73514319faf6a6bac09fb96c971554db9f77dd3428e01d53990586041092a64849685d8854b SHA512 3195924b374680e367d7be6b9793691efc0441858068c8bc8d8a908db00bbae781a99184b5c5e272af39045ec58cb0f92adbdd00ff808480b635bd632aa74719
-EBUILD dtc-1.6.0.ebuild 1498 BLAKE2B 4453bd177443ef093b2b01820a05c1404d0449678d04087dd84f48c07367ce5e9bd145320e05753808fa03391305e43ee57291a79292ef96745bbc6d30bbf5ec SHA512 9320f0921b710a2a520586daf731c1bd0cc378e6313509bb995803f0f8b7f602617a10a1ebddde96978a60e18441cad3652a5c1e07afc82f6a5cc738c40db90f
-EBUILD dtc-1.7.0.ebuild 1650 BLAKE2B 11b1546968bcb4cd2d1b3919a192e901488d87a85928faf2e8716619f7165fe4cfba7fb40d5f30909c33710e6da7cfd715dc32a38d76a7e55d6a5448df2b1c38 SHA512 a09327a832bee4225d6b9872183692c2e5cc453181284bb0050e474f7f343c30c830a0b170e965ed4c3981d938e78aaf2449b30b333d5ccde4e1d763c991f250
 EBUILD dtc-1.7.1.ebuild 1453 BLAKE2B 3dc43cf0dfebf089ee028e2e6b21b4c4c6ffcab7f5c04481b57c1a57f8f0243f0d39acda3d956dc20fbc2fb54ba1a44ec97d053850fbb9e09360e3f0ad8e14f5 SHA512 2e91e79a732637edb4034ce72c11886f7690fa5f029d46790e72cb400c863ef3d413d3e192e0001d7c06dc6f2bedb77d15e00f1e39241aa851a54e89ad81d414
 EBUILD dtc-9999.ebuild 1445 BLAKE2B 012b66db1ad5b5dd893702469f1a94f642eb55121d8b632fd04dec9b380bafae8265f0bd1b3cbb51fe60babdd29745c72a03d308c343979a0b2fea689101e000 SHA512 88747fa612955175018c74c22c8ca22f9f429126a9b2ec0d95598ee902cdc227d928b6ecb29f6ad45cc73cedb63a7e43fdee9bf5a29615b654eed2037c980eb1
 MISC metadata.xml 492 BLAKE2B dc331e157119b6db3bb419e04722511406295b39ee40bcae29dbbe3f8fa3737aa221c2d61b16b45b8361c1b6ffadd634ffa65377d33cc808d11a8128389bdfd0 SHA512 cf2441cf6ea1075cf633edf903a54a637cbaff2545ccd65290c1c1b3f5452ce3d74df5ce4ffe68ab15857eaea1ffeac7f3e80b42fb4dae3af1c3636e4b0766fb
diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
deleted file mode 100644
index 5490e3ded516..000000000000
--- a/sys-apps/dtc/dtc-1.6.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-DESCRIPTION="Open Firmware device tree compiler"
-HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs yaml"
-
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-"
-RDEPEND="yaml? ( dev-libs/libyaml )"
-DEPEND="${RDEPEND}"
-
-DOCS="
-	Documentation/dt-object-internal.txt
-	Documentation/dts-format.txt
-	Documentation/manual.txt
-"
-
-_emake() {
-	# valgrind is used only in 'make checkm'
-	emake \
-		NO_PYTHON=1 \
-		NO_VALGRIND=1 \
-		NO_YAML=$(usex !yaml 1 0) \
-		\
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		\
-		V=1 \
-		\
-		PREFIX="${EPREFIX}/usr" \
-		\
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		\
-		"$@"
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS =/s:=:+=:' \
-		-e '/^CPPFLAGS =/s:=:+=:' \
-		-e 's:-Werror::' \
-		-e 's:-g -Os::' \
-		Makefile || die
-
-	tc-export AR CC PKG_CONFIG
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/sys-apps/dtc/dtc-1.7.0.ebuild b/sys-apps/dtc/dtc-1.7.0.ebuild
deleted file mode 100644
index 664c10ab974b..000000000000
--- a/sys-apps/dtc/dtc-1.7.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit meson python-single-r1
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/dtc/dtc.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Open Firmware device tree compiler"
-HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python static-libs test yaml"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	python? ( dev-lang/swig )
-"
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	yaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	Documentation/dt-object-internal.txt
-	Documentation/dts-format.txt
-	Documentation/manual.txt
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-tests.patch
-	"${FILESDIR}"/${P}-meson-macos.patch
-	"${FILESDIR}"/fix-tests-for-Python3.12.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if ! use test ; then
-		sed -i -e "/subdir('tests')/d" meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtools=true
-		-Dvalgrind=disabled # only used for some tests
-		$(meson_feature python)
-		$(meson_feature yaml)
-	)
-
-	# bug #909366
-	use static-libs && emesonargs+=( -Dstatic-build=true )
-
-	meson_src_configure
-}
diff --git a/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch b/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch
deleted file mode 100644
index 473cd9a29e1a..000000000000
--- a/sys-apps/dtc/files/dtc-1.7.0-meson-macos.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=71a8b8ef0adf01af4c78c739e04533a35c1dc89c
-
-From 71a8b8ef0adf01af4c78c739e04533a35c1dc89c Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Wed, 31 May 2023 11:41:42 -0300
-Subject: libfdt: meson: Fix linking on macOS linker
-
--undefined error is the equivalent of --no-undefined for the macOS
-linker, but -undefined would also be understood as a valid argument for
-GNU ld so we use the supported linker variant.
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---- a/libfdt/meson.build
-+++ b/libfdt/meson.build
-@@ -16,10 +16,20 @@ sources = files(
-   'fdt_wip.c',
- )
- 
-+link_args = []
-+if cc.has_link_argument('-Wl,--no-undefined')
-+    link_args += '-Wl,--no-undefined'
-+else
-+    # -undefined error is the equivalent of --no-undefined for the macOS linker,
-+    # but -undefined would also be understood as a valid argument for GNU ld!
-+    link_args += cc.get_supported_link_arguments('-Wl,-undefined,error')
-+endif
-+
-+link_args += version_script
- libfdt = library(
-   'fdt', sources,
-   version: '1.6.0',
--  link_args: ['-Wl,--no-undefined', version_script],
-+  link_args: link_args,
-   link_depends: 'version.lds',
-   install: true,
- )
--- 
-cgit
diff --git a/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch b/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch
deleted file mode 100644
index 0bc2d71aea1c..000000000000
--- a/sys-apps/dtc/files/dtc-1.7.0-meson-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=32174a66efa4ad19fc6a2a6422e4af2ae4f055cb
-
-From 32174a66efa4ad19fc6a2a6422e4af2ae4f055cb Mon Sep 17 00:00:00 2001
-From: David Gibson <david@gibson.dropbear.id.au>
-Date: Tue, 28 Feb 2023 10:33:58 +1100
-Subject: meson: Fix cell overflow tests when running from meson
-
-Because meson always builds out-of-tree we need to reference things in the
-original source tree via $SRCDIR from run_tests.sh.  We forgot a couple of
-cases for the cell overflow tests.  Fix them.
-
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---- a/tests/run_tests.sh
-+++ b/tests/run_tests.sh
-@@ -519,8 +519,8 @@ libfdt_tests () {
-     check_tests "$SRCDIR/phandle-args-overflow.dts" clocks_property
- 
-     ## https://github.com/dgibson/dtc/issues/74
--    run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb cell-overflow-results.dts
--    run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb cell-overflow.dts
-+    run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb "$SRCDIR/cell-overflow-results.dts"
-+    run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb "$SRCDIR/cell-overflow.dts"
-     run_test dtbs_equal_ordered cell-overflow.test.dtb cell-overflow-results.test.dtb
- 
-     # check full tests
--- 
-cgit
diff --git a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch b/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
deleted file mode 100644
index 7a08648f3835..000000000000
--- a/sys-apps/dtc/files/fix-tests-for-Python3.12.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Python3.12 causes breakage for get_mem_rsv in pylibfdt.
- 
- Author: Héctor Orón Martínez <zumbi@debian.org>
-
----
-
-Bug: https://github.com/dgibson/dtc/issues/123
-Bug-Debian: https://bugs.debian.org/1061318
-Bug-Ubuntu: https://launchpad.net/bugs/2051399
-Last-Update: 2024-01-30
-
---- device-tree-compiler-1.7.0.orig/tests/pylibfdt_tests.py
-+++ device-tree-compiler-1.7.0/tests/pylibfdt_tests.py
-@@ -418,9 +418,14 @@ class PyLibfdtBasicTests(unittest.TestCa
-     def testReserveMap(self):
-         """Test that we can access the memory reserve map"""
-         self.assertEqual(2, self.fdt.num_mem_rsv())
--        self.assertEqual([ 0xdeadbeef00000000, 0x100000],
--                          self.fdt.get_mem_rsv(0))
--        self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
-+        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
-+            self.assertEqual([0, 0xdeadbeef00000000, 0x100000],
-+                             self.fdt.get_mem_rsv(0))
-+            self.assertEqual([0, 123456789, 0o10000], self.fdt.get_mem_rsv(1))
-+        else:
-+            self.assertEqual([0xdeadbeef00000000, 0x100000],
-+                             self.fdt.get_mem_rsv(0))
-+            self.assertEqual([123456789, 0o10000], self.fdt.get_mem_rsv(1))
- 
-     def testEmpty(self):
-         """Test that we can create an empty tree"""
-@@ -615,7 +620,10 @@ class PyLibfdtSwTests(unittest.TestCase)
- 
-         fdt = sw.as_fdt()
-         self.assertEqual(2, fdt.num_mem_rsv())
--        self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
-+        if sys.version_info.major >= 3 and sys.version_info.minor >= 12:
-+            self.assertEqual([0, TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
-+        else:
-+            self.assertEqual([TEST_ADDR_1, TEST_SIZE_1], fdt.get_mem_rsv(0))
- 
-         # Make sure we can add a few more things
-         with sw.add_node('another'):
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 397625d39ca6..5086c8bbbf93 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,6 +2,6 @@ AUX fwupd-1.9.6-fragile_tests.patch 1051 BLAKE2B 01ae6cae17b911d055eb820a041329e
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.9.24.tar.xz 4305048 BLAKE2B 5ac7bbc5cdcee13a39fe25cd5b83dfbb9615e6349cd39e8b25cc654c0318870de603c1f6ce550da6662d3f9cd7d275cf6254058f6b71dcb9f7916329147ab771 SHA512 2f9935bbfc3ffc49bf0939a75dd52861eea9108d8f7026dbcdf4c07ad234f70f0b1cb6740eefe555dc2a49aba1ea4d65a78427aad7a0ba9de1fe318734255bfe
 DIST fwupd-2.0.1.tar.xz 4971220 BLAKE2B 44d95bae51cb299ab4130805f1a57ebfb0fd5ba8872b6679f5fdde46150cb245f25fdd888f47e57eb35842b6e34f105feefca2f90bb84950ad93748f9f294820 SHA512 bf4e1bdd9ebfc593490a0d5d6fd6e31718e89aff5bb0feda9babf235676e26bff0e6e751a5df96e884a9f86db11b40ad00b63c7a5385c3fa9ab89f7f154b945f
-EBUILD fwupd-1.9.24.ebuild 5381 BLAKE2B 3bfa54ed795adc8c200dd888891a88c72b4f32576a11d42e859629f43c0b099c9e04a9f183ae4870834c788ecda39b9c5a12391e19421a2a1c12e0e40cf8ab69 SHA512 5250d74f29a7fbabb25d3b42837e4f379069b88d6d597d64321fab7f1db52032cb12bce7826a8a311889ea6d27ebc0503768a8314fe8e170538907f774ecfdf0
-EBUILD fwupd-2.0.1.ebuild 4678 BLAKE2B b85980cd91fd7319b42b6a65773083e3f5a23bc98a9a0f95a43e8c25c49023a1095415e5a3e5f2781ddcca8487bbb0a8de7c2d93d7a68fedb48d3ccb70a6ed27 SHA512 0c51d5044b2755044b8ea132a2fdd969c06e5c735e9df9b749a94b06feac8b1e72ee513bfcdfc7a4916ee7b42440a1716fbe3403b10c7b599db4413dbafd5ce9
+EBUILD fwupd-1.9.24.ebuild 5382 BLAKE2B a6bf821e3b1cd9c8722598c1144216ea54d74e59dce5be9e2a0be020c757a74f7530bc84b8f29a405773204632e6139c73f06d434c5b4ce9321b554da67627d0 SHA512 98f4853e366a6319c44786aeab7d116c86d532abe7b6b5fda2761beba94c3acfe6eb2350cad99f8532bd11cca94868d925603cccdce7163a301ac76d7cacba59
+EBUILD fwupd-2.0.1.ebuild 4679 BLAKE2B 9aa673a11bbc75d68b23dd8e2b1225be2a2a3947934b3624b3be828fec84261f07cb2b003e704a1c6b60daf6705c0471c0bb71cfe7d9fadef8aca715406385ef SHA512 4148e4d4bed1e340be554a4d786a18acda0151d466cfad8318531ded9a3d28100fd016a2176da2940d823f2b34fa72ca0abdbe058c33938199b04e1bd4a0139c
 MISC metadata.xml 1674 BLAKE2B b451d794c2be5515f1f5889a88e5c512ab5e8c62f53105b68374cd07007f0032fdb5f99bf2c0c403f4f6ac558fc3fc4513a06cb1acb06dbd321e1e4814c220bf SHA512 e176cca39887ad3eaccf7699c8d8fb8bb76587bec0e797f1952ce8d83bd259e43334870232f9660fe29cf177a2abaa1ca8e8e5527e88ade43e6a7a022510c025
diff --git a/sys-apps/fwupd/fwupd-1.9.24.ebuild b/sys-apps/fwupd/fwupd-1.9.24.ebuild
index b9207dbe5c14..d75ccabfa281 100644
--- a/sys-apps/fwupd/fwupd-1.9.24.ebuild
+++ b/sys-apps/fwupd/fwupd-1.9.24.ebuild
@@ -31,7 +31,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="$(vala_depend)
 	$(python_gen_cond_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
 	')
 	>=dev-build/meson-0.60.0
 	virtual/pkgconfig
diff --git a/sys-apps/fwupd/fwupd-2.0.1.ebuild b/sys-apps/fwupd/fwupd-2.0.1.ebuild
index 324f906650ff..026ea60f9c41 100644
--- a/sys-apps/fwupd/fwupd-2.0.1.ebuild
+++ b/sys-apps/fwupd/fwupd-2.0.1.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="$(vala_depend)
 	$(python_gen_cond_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jinja2[${PYTHON_USEDEP}]
 	')
 	>=dev-build/meson-1.3.2
 	virtual/pkgconfig
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 26af89a6a48c..728760da4cd1 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -18,8 +18,8 @@ DIST iproute2-6.6.0.tar.xz 917964 BLAKE2B 9d20f19c04c2bbde7a3ae53e61e4623b119570
 DIST iproute2-6.8.0.tar.xz 913512 BLAKE2B d30cdff8522627c27c9165f068f42adbec38f15548a8f2cd31276f283880dc402e10c5989e7227e80cdc891bcc4a574b330d634ae550e689758b849c0506c31f SHA512 54e50340a73c8810d69bfd54704b469149731634a97d94da08b5a305592a812131a441e5b646e32b480d61840e2ade29387e54b934effeee8ded4f06e557a5c0
 DIST iproute2-6.9.0.tar.xz 918144 BLAKE2B a7434a2537a55b4875db0e3cc35383dfe4d0c8a118a8a1102c4076bfb154c9c2ab0781dcff324fa18ce7cfde798bf332a9e0ff08003ff39acbb8129b597a93a6 SHA512 1cbb234cb8f94213c3529f0b74fed5a575ff1fb838e783b8d2b440643c2e91246eda42e9b26e9775897aadb8b8133d199b2851b8ea0df06a899dc02acf403325
 EBUILD iproute2-6.10.0.ebuild 6012 BLAKE2B f467ff5d31c3574c838dadc1e881f74d9703e6019ab068d0a9091fc330e3dc20022fe2173735b3e576c53484cb58c1f639c58c2dcb0c8d69a3a9e6f0b821bd2f SHA512 a213cedbd8184d2f99acfb3d76b3cbb890281446b5aecdd9d73be6db2cf9c4590574798e00f115ac643345c34f6a396c2c35b2afd4dfdaa9336fb5140cfaafde
-EBUILD iproute2-6.11.0-r2.ebuild 6114 BLAKE2B 1c709d617c72a3a336d24e1374e6b09016efb76373bcd3da3e5151aa418c92e3d7b906229e2cd5f55863476105eff38e639045d47c2f6b1bb23469201b13c69f SHA512 c5b5b9722b32d4b4ec3a789e882ce39a243420c4ca7ef0c46ae7fcca603bd2a4613a36cd0b13150b7073d6234d2eb4b319fcd3228629ff2a6b840f897b87fd64
-EBUILD iproute2-6.11.0.ebuild 6018 BLAKE2B df1906f4a87a8d5cea3630393faedf8b6e086e8a679b90a81e576bdc0f145005d3cafb27e3ed154968963b126d16d043e03070d395227ac8d96b89aea18a8482 SHA512 2384eeb4b71201f2ed4c378ad7a20c3ec9659fe1ce53b25f8276f185b3ee6f1ddad1f3ed91acb49bcd65880fcd843b9e2e5b2e28f716a87247f9a237bc2806ca
+EBUILD iproute2-6.11.0-r2.ebuild 6113 BLAKE2B f70b9686c5028345c8b1831f12d727a10c3af2a44ed5e39de8906b1c60e48c595cd6d6fd19dc1300b25258bd0dfbcbbb9628d6d58b01e321bc6723eb5b0ee713 SHA512 2aac50f30be8f007df46e9b5b1438376b59655279a763ed107a0a7f8f236d33fde9d81f043ac94af359f5ac3d79e59231eade8e97fd71f45cc4def92fe9a88cf
+EBUILD iproute2-6.11.0.ebuild 6012 BLAKE2B 122e5722af68a2569b673e49e16a9f5d8b796f7c5d2b3b7ad0ddefd3614725c33d16b06fff8a1cb748330d4d5e3cf90a574a3968e43071a212c02b3442f42a0f SHA512 3d81c05203a4eceb1b3b7a00f794359614b6453989460e53ef73d11273ff3d6aa15e00175c32b57c5df1bf4aecbd0c97a3d9bd876e4081094d54bcebd98324c3
 EBUILD iproute2-6.6.0-r3.ebuild 5964 BLAKE2B 9b320266330abe11e474c9b14042bd6ded1f1c29c60cf0383bf3b486d60c1b04fa00c5bb9fb400cce63e437daf1954e1170d8b91c7dc8666c9cb9f4e25f9f718 SHA512 9a7fdfa63120d27e23b878b509c84e1c2aec96416475a1e49b80255bd0a5f20e4fd7ef506370316294dc1c1849b8dab446f660ddafef316033f9ba349ccdfaf3
 EBUILD iproute2-6.8.0-r2.ebuild 6004 BLAKE2B ca9e1eb347e4c3bde3d04bb0e0a1be9b08ebddabff0605ff3a494d48b3e2efd72e7a4da1059314cf1d9cf29c51094102353a34c09065084b072dbdb8c7f69037 SHA512 62ee1d358b3b279436a31e41d4ee4c8afbd41a0073249f0764a3e3558abb3bda4a059b32da42ba3c6f507b81b335718a3c2539f80615ae3dcad5527704e87b9b
 EBUILD iproute2-6.9.0.ebuild 5960 BLAKE2B 32f9b4782ce90bbd05b171923b78823d3feb4896688a0321c927456e8dbd7a4e98442b9a6044c40f3819ef71499dbfd960e6708b4a9e9a2e3895d3c537b0fb6f SHA512 d114a393563220a556821d5b7c64041755dc135ff30eb9e88bfbfbde1bd1eef57d87d355e6b9f06c812165181dc787c3e6a0c5292f41eea17b46e96ba83fb2fd
diff --git a/sys-apps/iproute2/iproute2-6.11.0-r2.ebuild b/sys-apps/iproute2/iproute2-6.11.0-r2.ebuild
index e06e6cd952a9..7634169516ef 100644
--- a/sys-apps/iproute2/iproute2-6.11.0-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-6.11.0-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-6.11.0.ebuild b/sys-apps/iproute2/iproute2-6.11.0.ebuild
index 26b79a0d0847..debd258b42ea 100644
--- a/sys-apps/iproute2/iproute2-6.11.0.ebuild
+++ b/sys-apps/iproute2/iproute2-6.11.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/pkgcraft-tools/Manifest b/sys-apps/pkgcraft-tools/Manifest
index 7bd642cd9ea7..befa2750c1e2 100644
--- a/sys-apps/pkgcraft-tools/Manifest
+++ b/sys-apps/pkgcraft-tools/Manifest
@@ -2,7 +2,7 @@ DIST pkgcraft-tools-0.0.14.tar.xz 30138240 BLAKE2B b9d0b238f26d980f032cfad266023
 DIST pkgcraft-tools-0.0.15.tar.xz 23029344 BLAKE2B 7e5f6e119a98bc061578bcfad954bc286bef2bfa93687d16daab615e17ede1512bb0fcbd7ce342c915f4494397169a05b7846029c1c59f2f5f0565ef34ae1bb3 SHA512 6009582531f21c3896441a04ad462fc6d06b509bc4faaa3944ae3696b7b67a0d492ec6345cc6bedc7388b20d558a01bb8a24f3c439da3972c01fcae9277d2c2c
 DIST pkgcraft-tools-0.0.16.tar.xz 21332400 BLAKE2B 09385a94980a62dcf312161d51d94549cc36247a0e96c001b7b7790d2f879d0c780310d89aa46760ed0312ec935b1c9e0100b3e2e29f94114ae92724aff8b953 SHA512 e37d296474c847a06191c314b95dfdb99f05c7cc655dda7b8cfa4a03659fd7bf5ab83ddc51d19cef93f2a28ad919282edf5d34bf264807292773d4aa21aa35dc
 EBUILD pkgcraft-tools-0.0.14-r1.ebuild 1122 BLAKE2B c3aac0d6c0e54d2456a9542fcd18382a1ace2ae2872415e3f14d95f22cdea3fddbc5adbc22e12cd955592313960cfea7452611cccb6415e87c9ac6edcddc0c36 SHA512 f5f70ef14cbe10b72bb4f8adb81adb93d0908355787f9cbe1468c510e95f88b4f303f4660417cc8a96b49d3c2183c0e32aad8756dbcfc1fdaa0dd49b1d5d84ce
-EBUILD pkgcraft-tools-0.0.15-r1.ebuild 1150 BLAKE2B 904338d0029273f9c4390340ac375110d5213b3b94f1a9df80a3d14e2f2bd3c6cb0122b988952b57918d3ce808e2049b2b4c7cfd11cc8777834092f248a042f1 SHA512 7cb513e9ff31fcc1bb796b48c710ebeb4f80b8ae9b2c8cfbc1b495aeedfa80dc4c4b260529fce46752d4749e6b30db5c692ed6a3c74511c33d8b59d80c2fa998
-EBUILD pkgcraft-tools-0.0.16-r1.ebuild 1150 BLAKE2B 904338d0029273f9c4390340ac375110d5213b3b94f1a9df80a3d14e2f2bd3c6cb0122b988952b57918d3ce808e2049b2b4c7cfd11cc8777834092f248a042f1 SHA512 7cb513e9ff31fcc1bb796b48c710ebeb4f80b8ae9b2c8cfbc1b495aeedfa80dc4c4b260529fce46752d4749e6b30db5c692ed6a3c74511c33d8b59d80c2fa998
-EBUILD pkgcraft-tools-9999.ebuild 1147 BLAKE2B cc5182863e59f2a6cd6939bed9e2323bec55e8f270b3fb74d6ff9776e09ddc612d22e63d1e9570446dc923923fd10b28e921b7eb6e9cfbc6a4d7f601b8f16402 SHA512 1ea142928a26a51f44d88b4aa7bd86768ae02acb1d8d1e1cbf90230cb8d05b896e894d69a26649e9ebb52c4c5d632b0d8d3ab3a88ef2d658a5c172b15d6cf383
+EBUILD pkgcraft-tools-0.0.15-r1.ebuild 1150 BLAKE2B ba86e1a4a9d65467230bd9f77808f356037e7c4f3a98cd555645bce9d92432a802f3609948f46df8c5d8efa59f1e60766c5b4d49b9a53a11013f2fd83473bbf4 SHA512 8770b424f9dad0c28a22f69be39a1fb734bfe9f0c4dd6842f9bf84ad37e61cbe18b7ef613cfaa42ab69d6a4dc48367b01128b50513b709b605fba71453fd512c
+EBUILD pkgcraft-tools-0.0.16-r1.ebuild 1150 BLAKE2B ba86e1a4a9d65467230bd9f77808f356037e7c4f3a98cd555645bce9d92432a802f3609948f46df8c5d8efa59f1e60766c5b4d49b9a53a11013f2fd83473bbf4 SHA512 8770b424f9dad0c28a22f69be39a1fb734bfe9f0c4dd6842f9bf84ad37e61cbe18b7ef613cfaa42ab69d6a4dc48367b01128b50513b709b605fba71453fd512c
+EBUILD pkgcraft-tools-9999.ebuild 1147 BLAKE2B ecd73a78d98c60a66d64e92e956e6fe62d9c7b88d00b0c899bcbb6adaed60f3b64b5358b14e3227d30baa48563f5bda013a85fb65924feeee6c7325f2cbdd0f3 SHA512 bd642942230c851a6b151ea45447444baf8f2b3f5a4f148ab37ff2e33bcb3fd4537a7a5f1a65e5b98d58a0abecdf3e6f9a041a9074b7b6a4e9ccb43f07c09498
 MISC metadata.xml 322 BLAKE2B b0ee0fc53eb8b4b485f74806a78b5560aaf53f1772d7bd3e5af4e03385b3f3aed18fc52462c2d49de6c0d735db0cae3fab175b8adc0e5f7c4baa89e28973776f SHA512 9343cd5028750182fe9325c44f4c4c7df0976b79e0422b66e0fd16f94be76eaa203e8ecad5ec2cbed3535f455f038e51968850ced9afb27af9a98b6b968df88a
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild
index 4dd6b1e8e90e..7f11b210e234 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.15-r1.ebuild
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..18} )
 RUST_MIN_VER="1.77.1"
 
-inherit edo llvm-r1 cargo
+inherit cargo edo llvm-r1
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild
index 4dd6b1e8e90e..7f11b210e234 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-0.0.16-r1.ebuild
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..18} )
 RUST_MIN_VER="1.77.1"
 
-inherit edo llvm-r1 cargo
+inherit cargo edo llvm-r1
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
diff --git a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
index 3739b1a925c3..f2ec46605d6d 100644
--- a/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
+++ b/sys-apps/pkgcraft-tools/pkgcraft-tools-9999.ebuild
@@ -7,7 +7,7 @@ CRATES=" "
 LLVM_COMPAT=( {17..18} )
 RUST_MIN_VER="1.77.1"
 
-inherit edo llvm-r1 cargo
+inherit cargo edo llvm-r1
 
 DESCRIPTION="pkgcraft-based tools for Gentoo"
 HOMEPAGE="https://pkgcraft.github.io/"
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index f55866ae6c0a..03d878ad6814 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -13,14 +13,18 @@ DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270
 DIST systemd-stable-254.16.tar.gz 14564160 BLAKE2B fdf028b128fa8181bc1a4c2d3b5f761431e55613149bee5055a6c2697055a06a52573c4f2ea5a2b9633080a0b7a8d4312d95cb4b61d3943f918bdadf45bc5586 SHA512 0958859610c50f1625a10d67e373c9841678f63dc091abec9d8e7e57bff7e82d2f34a1d54e8ec3c44952f8dc2a5581e65ee54cfbb48c3589561f5bd8658498e0
 DIST systemd-stable-254.17.tar.gz 14566862 BLAKE2B fca04c8db285cf22551f7c980da52a8aa3ef3eb78d6005b38cdece4b53ac43a69aa401f8498ee00fcab037dbb22c996b8c626db32c6e4be481f41f752e7a848b SHA512 11ae971e5463fb511c32fbc1ce4012765c73cf87d68ca44c36b85a2ed12f73655b6d071975008c6dd56a27963d1dff5d3c22039fc813bff30be23e6f2dd425ae
 DIST systemd-stable-254.18.tar.gz 14567354 BLAKE2B 30605ae63bdb650d380bcf4697eeaaba96f5e7a32051aa103ad9f8d32bb9a0c3bd9859ca23fda6b4e6ffab98a814748bc30638a01d03473191013758a958c70b SHA512 437db125a15021a5f51f59f8cc66992c8d2d767fd3fa13331c41502d1d362a3fd0024058a708602bb2760689bd61ec656c6faffcb22932776d54e9815a43d4ed
+DIST systemd-stable-254.19.tar.gz 14571542 BLAKE2B d24cc18737d8155638320c8ae715df879925b3197bf47beba4af8856dd5935505cb1fd06f0188f05bd4ae11c9b034770daadc136d21f00aec550f45ac52375c3 SHA512 736475ea64b0293de79ec56c1448682e2e1698fcd5dfa51f1348d7f51887e9d92457c557f3371ed1d6b43e1e845cf2af5fad91da831e38d3e2dc26982acab5a0
 DIST systemd-stable-255.10.tar.gz 15102376 BLAKE2B ef35c243e98c43230682904a75f36201ea0f6776a5f17026e98c6a697746e5eebbcd19d614bd1107905c5bf23fbf5913918e7b4790a5d01bbd7a2ec79529234c SHA512 f672cfff18ab80136dedb34908b73d8152f9cb07776c27405a90eb2ad49e22ef86b979a5125c66c6b17d9c76ea516ed920cdbc8e929dda1382f632b414a03df0
 DIST systemd-stable-255.11.tar.gz 15107037 BLAKE2B 7839323367d47dc57914fb501c7be38206f3bc882e560c4df25c65d421e5756108711b0ce57df6ad444d5eabb256d6730366e21d283cb02e1ef014b670855669 SHA512 be06010b56f4ea0651ebe921cd2a68f1794a64367fedea6752f7ba71ac5e00c5f0167d52ba5b662fd9781f5aa3f372e174b65f99a9bac66d4bf6af92caa67ba7
 DIST systemd-stable-255.12.tar.gz 15107917 BLAKE2B d3e3922e326f9a06557769800cf21b61562e4d26776be50a87ce04503e16fbcb2ee73e2a78c3ba1ce1b343f0e31bec7c2346188331c5558dcbb4cd7d023906d6 SHA512 bb31854da5a2f2ac7c2c4a5a92457352ceabcb4fc7063a08e29f0d0e500a1a684d2d76bc75695425ebff53e150986bdd925455493928df46c6b4546e1c7fcf72
-EBUILD systemd-utils-254.13.ebuild 13349 BLAKE2B 3ada6ca89512726442cefe7d3e1fc64401f76a0688be936eac7fb0b0cda3f8aa5f357d40cf77e5654c86ad4ec021d82912aafce6333234fa2ccffbdccc865f43 SHA512 dfb4bdb8e4ab97db6408ce2996572115ee0f7531bfc0837effe3aa6f68b0bf2bae9e98e6cc9be7441d883bbc9202df0604dcee124002ac114fa69e2145986ea5
-EBUILD systemd-utils-254.16.ebuild 13357 BLAKE2B 66b0be6fbd1a28a3aaee185a852bb703b4340d6e2eb7c18d3d06b9f153758aa72b3c2b3d4e6acd5eed127bc9d1b69c589998d77f6a7f6482db4882f6398f37aa SHA512 740115818e359dae371c96bc90ebe11b5de2f90bdadeb930495e988789d2d98a2c5e84067b379bb50b3399af212e96bfe11421322bd83b9a41c6d1d3dc23bf9f
-EBUILD systemd-utils-254.17.ebuild 13349 BLAKE2B 3ada6ca89512726442cefe7d3e1fc64401f76a0688be936eac7fb0b0cda3f8aa5f357d40cf77e5654c86ad4ec021d82912aafce6333234fa2ccffbdccc865f43 SHA512 dfb4bdb8e4ab97db6408ce2996572115ee0f7531bfc0837effe3aa6f68b0bf2bae9e98e6cc9be7441d883bbc9202df0604dcee124002ac114fa69e2145986ea5
-EBUILD systemd-utils-254.18.ebuild 13357 BLAKE2B 66b0be6fbd1a28a3aaee185a852bb703b4340d6e2eb7c18d3d06b9f153758aa72b3c2b3d4e6acd5eed127bc9d1b69c589998d77f6a7f6482db4882f6398f37aa SHA512 740115818e359dae371c96bc90ebe11b5de2f90bdadeb930495e988789d2d98a2c5e84067b379bb50b3399af212e96bfe11421322bd83b9a41c6d1d3dc23bf9f
-EBUILD systemd-utils-255.10.ebuild 14233 BLAKE2B 41a83db315b0dcc8d9b1a49af18eaded9b35daf6a8f262b5563565f1a390c957df3e039837a8d21c1c23099f6f1d2a0b5bed866858c1aba3b19bfd2ef50f6ce7 SHA512 982b3d2c3ecd992ae88f336eb191e24c088ddd83ee69e7ddfde03e7763e7c7d296d3cf3e71602f7f6114dbf903ed11270c43562036b5e0d31bd5a3de93a4df60
-EBUILD systemd-utils-255.11.ebuild 14233 BLAKE2B 41a83db315b0dcc8d9b1a49af18eaded9b35daf6a8f262b5563565f1a390c957df3e039837a8d21c1c23099f6f1d2a0b5bed866858c1aba3b19bfd2ef50f6ce7 SHA512 982b3d2c3ecd992ae88f336eb191e24c088ddd83ee69e7ddfde03e7763e7c7d296d3cf3e71602f7f6114dbf903ed11270c43562036b5e0d31bd5a3de93a4df60
-EBUILD systemd-utils-255.12.ebuild 14233 BLAKE2B 787997d6b0076157281bfb165075755024780d95e835e4c90c879b200f72b2b63c4481aac315783014867c2b14d73cc444154c0181003c6003a009564b751824 SHA512 b4f9a7fdf67132906971b97465b1ffb115cc36defa07fdaccb48392771873fc1580ad432b939e798dad675a16fee1543a2e4bceb95773c9c15f5b06f47f90835
+DIST systemd-stable-255.13.tar.gz 15109381 BLAKE2B ae87a46493451ac036ce35de2ba6db7db68228df8f80f82d0fa126852d2becd66083579a8734fe7b04f8460dbcccba304347c21ef967a2e3b7b51426c0d99f10 SHA512 e32986301b3117844232255690a4e5dd1a23b27710f473c9cf12217e366e61d1ca72c3bf670fcf256659e58d934c8f7a36d0c5e0821f86e2ef69306ea8afe39e
+EBUILD systemd-utils-254.13.ebuild 13350 BLAKE2B 728305ead1a6099a64274cc088e46489135db7aa8fa7dd28198442ec4da3492a1e09f532b424e3cb90e055f60c05f90d65bb6516b4480d379ba226b99a47b5ed SHA512 fcdcb169fb5629c308088e2b022b633dc32f191e9adc4b8ae37b3176d75a8eb5df89e00a0ce7337b19b52f41247f1601390c127a7a5578c4ecc2ad2038c26db3
+EBUILD systemd-utils-254.16.ebuild 13358 BLAKE2B 1d52ea3706da5fa213761f737017ae9473513e7e41e33721a148119b35f3a715a4a29930a1712a72909bf5cf3f1939b67745a309d25ff7e0e6e45802c1b2ad4f SHA512 a734aab27311ad7a18dec71554a8bf79052ed56d0e0d8cdf895a0ae305778d210ba5a1ca8477ee7b49f2f00c89c30c2af17e50bd1e704421cc2d6c138d7a9359
+EBUILD systemd-utils-254.17.ebuild 13350 BLAKE2B 728305ead1a6099a64274cc088e46489135db7aa8fa7dd28198442ec4da3492a1e09f532b424e3cb90e055f60c05f90d65bb6516b4480d379ba226b99a47b5ed SHA512 fcdcb169fb5629c308088e2b022b633dc32f191e9adc4b8ae37b3176d75a8eb5df89e00a0ce7337b19b52f41247f1601390c127a7a5578c4ecc2ad2038c26db3
+EBUILD systemd-utils-254.18.ebuild 13358 BLAKE2B 1d52ea3706da5fa213761f737017ae9473513e7e41e33721a148119b35f3a715a4a29930a1712a72909bf5cf3f1939b67745a309d25ff7e0e6e45802c1b2ad4f SHA512 a734aab27311ad7a18dec71554a8bf79052ed56d0e0d8cdf895a0ae305778d210ba5a1ca8477ee7b49f2f00c89c30c2af17e50bd1e704421cc2d6c138d7a9359
+EBUILD systemd-utils-254.19.ebuild 13358 BLAKE2B 1d52ea3706da5fa213761f737017ae9473513e7e41e33721a148119b35f3a715a4a29930a1712a72909bf5cf3f1939b67745a309d25ff7e0e6e45802c1b2ad4f SHA512 a734aab27311ad7a18dec71554a8bf79052ed56d0e0d8cdf895a0ae305778d210ba5a1ca8477ee7b49f2f00c89c30c2af17e50bd1e704421cc2d6c138d7a9359
+EBUILD systemd-utils-255.10.ebuild 14234 BLAKE2B 6fd865b75ae5099bbccd27a234a6b16d646ba88ceebb9f404d80659317088f68db4d7055018db65ed78a220d57dd2acbaefc013e0c68a59796c29d8eda6bcc55 SHA512 2b2918ccd3007e4b25ad9fa795d2c25da168db51cff44f06c1b5cab350c708de7fcce96d902c6317c0a5fd893186ec73f5d9c668713579acc0616b050c13ad35
+EBUILD systemd-utils-255.11.ebuild 14234 BLAKE2B 6fd865b75ae5099bbccd27a234a6b16d646ba88ceebb9f404d80659317088f68db4d7055018db65ed78a220d57dd2acbaefc013e0c68a59796c29d8eda6bcc55 SHA512 2b2918ccd3007e4b25ad9fa795d2c25da168db51cff44f06c1b5cab350c708de7fcce96d902c6317c0a5fd893186ec73f5d9c668713579acc0616b050c13ad35
+EBUILD systemd-utils-255.12.ebuild 14234 BLAKE2B 9cb70d2ca37fa04d40972780cfd8c13ce0519d5199bce21487932ea78914b0edc6cc40acb1fb70cc12febc566bc9da45ca6c03b931e71f6bb6b328765e6581b4 SHA512 d2917330dd79f8182bef323059aaf707bac9b0370a726898b76d5d0087cd0782c5a7116258241f9f879e9d41de7a1f5904c9d75511bde27a5b1ba5c8148b484c
+EBUILD systemd-utils-255.13.ebuild 14234 BLAKE2B 9cb70d2ca37fa04d40972780cfd8c13ce0519d5199bce21487932ea78914b0edc6cc40acb1fb70cc12febc566bc9da45ca6c03b931e71f6bb6b328765e6581b4 SHA512 d2917330dd79f8182bef323059aaf707bac9b0370a726898b76d5d0087cd0782c5a7116258241f9f879e9d41de7a1f5904c9d75511bde27a5b1ba5c8148b484c
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index a209256cd923..9dbd4adecb0d 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -105,7 +105,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
 		ukify? ( test? ( ${PEFILE_DEPEND} ) )
diff --git a/sys-apps/systemd-utils/systemd-utils-254.16.ebuild b/sys-apps/systemd-utils/systemd-utils-254.16.ebuild
index 2703ab5295a2..d286731a7dd0 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.16.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.16.ebuild
@@ -105,7 +105,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
 		ukify? ( test? ( ${PEFILE_DEPEND} ) )
diff --git a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
index a209256cd923..9dbd4adecb0d 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.17.ebuild
@@ -105,7 +105,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
 		ukify? ( test? ( ${PEFILE_DEPEND} ) )
diff --git a/sys-apps/systemd-utils/systemd-utils-254.18.ebuild b/sys-apps/systemd-utils/systemd-utils-254.18.ebuild
index 2703ab5295a2..d286731a7dd0 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.18.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.18.ebuild
@@ -105,7 +105,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
 		ukify? ( test? ( ${PEFILE_DEPEND} ) )
diff --git a/sys-apps/systemd-utils/systemd-utils-254.19.ebuild b/sys-apps/systemd-utils/systemd-utils-254.19.ebuild
new file mode 100644
index 000000000000..d286731a7dd0
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-254.19.ebuild
@@ -0,0 +1,583 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
+inherit python-single-r1 secureboot toolchain-funcs udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-254.3-r1"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+	|| ( kernel-install tmpfiles sysusers udev )
+	boot? ( kernel-install )
+	ukify? ( boot )
+	${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/floppy
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/usb
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_cond_dep "
+		dev-python/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+		ukify? ( test? ( ${PEFILE_DEPEND} ) )
+	")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+	~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+		linux-info_pkg_setup
+	fi
+	use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
+	)
+
+	if use elibc_musl; then
+		PATCHES+=(
+			"${WORKDIR}/${MUSL_PATCHSET}"
+		)
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootpkglibdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+	python_setup
+	meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+		$(meson_native_use_bool ukify)
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-kernel-install-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbpf-framework=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				man/bootctl.1
+				src/boot/efi/linux$(efi_arch).efi.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use kernel-install; then
+			targets+=(
+				kernel-install
+				src/kernel-install/90-loaderentry.install
+				man/kernel-install.8
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+			)
+			if use test; then
+				targets+=( test-tmpfile-util )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				man/libudev.3
+				man/udev_device_get_syspath.3
+				man/udev_device_has_tag.3
+				man/udev_device_new_from_syspath.3
+				man/udev_enumerate_add_match_subsystem.3
+				man/udev_enumerate_new.3
+				man/udev_enumerate_scan_devices.3
+				man/udev_list_entry.3
+				man/udev_monitor_filter_update.3
+				man/udev_monitor_new_from_netlink.3
+				man/udev_monitor_receive_device.3
+				man/udev_new.3
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/60-persistent-storage.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-node
+					test-udev-util
+					udev-rule-runner
+				)
+			fi
+		fi
+		if use ukify; then
+			targets+=(
+				ukify
+				src/kernel-install/60-ukify.install
+				man/ukify.1
+			)
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			libudev
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfile-util
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev
+				test-udev-builtin
+				test-udev-event
+				test-udev-node
+				test-udev-util
+			)
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+src_install() {
+	local rootprefix="$(usex split-usr '' /usr)"
+	meson-multilib_src_install
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl
+			doman man/bootctl.1
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use kernel-install; then
+			dobin kernel-install
+			doman man/kernel-install.8
+			exeinto usr/lib/kernel/install.d
+			doexe src/kernel-install/*.install
+		fi
+		if use sysusers; then
+			into "${rootprefix:-/}"
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into "${rootprefix:-/}"
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+			insinto /usr/lib/tmpfiles.d
+			doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+		fi
+		if use udev; then
+			into "${rootprefix:-/}"
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+			exeinto "${rootprefix}"/lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+			rm -f rules.d/99-systemd.rules
+			insinto "${rootprefix}"/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto "${rootprefix}"/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+			doman man/libudev.3
+			doman man/udev_*.3
+		fi
+		if use ukify; then
+			exeinto "${rootprefix}"/lib/systemd/
+			doexe ukify
+			doman man/ukify.1
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use kernel-install; then
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		exeinto /etc/cron.daily
+		doexe "${FILESDIR}"/systemd-tmpfiles-clean
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+		insinto /usr/lib/tmpfiles.d
+		doins tmpfiles.d/x11.conf
+		doins "${FILESDIR}"/{legacy,tmp}.conf
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto "${rootprefix}"/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto "${rootprefix}"/lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto "${rootprefix}"/lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+
+	if use boot; then
+		optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
+			"sys-kernel/installkernel[systemd-boot]"
+	fi
+	if use ukify; then
+		optfeature "automatically generating an unified kernel image on each kernel installation" \
+			"sys-kernel/installkernel[ukify]"
+	fi
+}
diff --git a/sys-apps/systemd-utils/systemd-utils-255.10.ebuild b/sys-apps/systemd-utils/systemd-utils-255.10.ebuild
index c1918ffcbc32..b05d85ab17e3 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.10.ebuild
@@ -105,7 +105,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? (
 			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
diff --git a/sys-apps/systemd-utils/systemd-utils-255.11.ebuild b/sys-apps/systemd-utils/systemd-utils-255.11.ebuild
index c1918ffcbc32..b05d85ab17e3 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.11.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.11.ebuild
@@ -105,7 +105,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? (
 			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
diff --git a/sys-apps/systemd-utils/systemd-utils-255.12.ebuild b/sys-apps/systemd-utils/systemd-utils-255.12.ebuild
index a073f48a82c8..eecd561e94a9 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.12.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.12.ebuild
@@ -105,7 +105,7 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? (
 			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
diff --git a/sys-apps/systemd-utils/systemd-utils-255.13.ebuild b/sys-apps/systemd-utils/systemd-utils-255.13.ebuild
new file mode 100644
index 000000000000..eecd561e94a9
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-255.13.ebuild
@@ -0,0 +1,621 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils
+inherit python-single-r1 secureboot udev
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-255.6"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
+REQUIRED_USE="
+	|| ( kernel-install tmpfiles sysusers udev )
+	boot? ( kernel-install )
+	ukify? ( boot )
+	${PYTHON_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+"
+
+PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
+
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	ukify? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep "${PEFILE_DEPEND}")
+	)
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/floppy
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/usb
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	dev-util/patchelf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_cond_dep "
+		dev-python/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? (
+			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
+			test? ( ${PEFILE_DEPEND} )
+		)
+	")
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
+	~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
+		linux-info_pkg_setup
+	fi
+	use boot && secureboot_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/systemd-utils-255-musl-fgetxxent.patch"
+	)
+
+	if use elibc_musl; then
+		PATCHES+=(
+			"${WORKDIR}/${MUSL_PATCHSET}"
+			"${FILESDIR}/musl-efi-wchar.patch"
+		)
+	fi
+	default
+}
+
+src_configure() {
+	python_setup
+	meson-multilib_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+		$(meson_native_use_bool ukify)
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbpf-framework=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+have_dmi() {
+	# see dmi_arches in meson.build
+	case ${CHOST} in
+		mips64*)
+			return 1 ;;
+		aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*)
+			return 0 ;;
+	esac
+	return 1
+}
+
+multilib_src_compile() {
+	local targets=() optional_targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			local efi_arch= efi_arch_alt=
+			case ${CHOST} in
+				aarch64*)     efi_arch=aa64 ;;
+				arm*)         efi_arch=arm ;;
+				loongarch32*) efi_arch=loongarch32 ;;
+				loongarch64*) efi_arch=loongarch64 ;;
+				riscv32*)     efi_arch=riscv32 ;;
+				riscv64*)     efi_arch=riscv64 ;;
+				x86_64*)      efi_arch=x64 efi_arch_alt=ia32;;
+				i?86*)        efi_arch=ia32 ;;
+			esac
+			targets+=(
+				bootctl
+				man/bootctl.1
+				src/boot/efi/systemd-boot${efi_arch}.efi
+				src/boot/efi/linux${efi_arch}.efi.stub
+				src/boot/efi/addon${efi_arch}.efi.stub
+			)
+			if [[ -n ${efi_arch_alt} ]]; then
+				# If we have a multilib toolchain, meson.build will build the
+				# "alt" arch (ia32). There's no easy way to detect this, so try
+				# to build it and ignore failure.
+				optional_targets+=(
+					src/boot/efi/systemd-boot${efi_arch_alt}.efi
+					src/boot/efi/linux${efi_arch_alt}.efi.stub
+					src/boot/efi/addon${efi_arch_alt}.efi.stub
+				)
+			fi
+
+		fi
+		if use kernel-install; then
+			targets+=(
+				kernel-install
+				src/kernel-install/90-loaderentry.install
+				man/kernel-install.8
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+			)
+			if use test; then
+				targets+=(
+					test-offline-passwd
+					test-tmpfile-util
+				)
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				ata_id
+				cdrom_id
+				fido_id
+				iocost
+				mtd_probe
+				scsi_id
+				v4l_id
+				src/udev/udev.pc
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				man/libudev.3
+				man/udev_device_get_syspath.3
+				man/udev_device_has_tag.3
+				man/udev_device_new_from_syspath.3
+				man/udev_enumerate_add_match_subsystem.3
+				man/udev_enumerate_new.3
+				man/udev_enumerate_scan_devices.3
+				man/udev_list_entry.3
+				man/udev_monitor_filter_update.3
+				man/udev_monitor_new_from_netlink.3
+				man/udev_monitor_receive_device.3
+				man/udev_new.3
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/60-persistent-storage.rules
+				rules.d/64-btrfs.rules
+				# Needed for tests
+				rules.d/99-systemd.rules
+			)
+			if have_dmi; then
+				targets+=( dmi_memory_id )
+			fi
+			if use test; then
+				targets+=(
+					test-fido-id-desc
+					test-link-config-tables
+					test-udev-builtin
+					test-udev-device-thread
+					test-udev-format
+					test-udev-manager
+					test-udev-node
+					test-udev-rule-runner
+					test-udev-rules
+					test-udev-spawn
+					test-udev-util
+				)
+			fi
+		fi
+		if use ukify; then
+			targets+=(
+				ukify
+				src/kernel-install/60-ukify.install
+				man/ukify.1
+			)
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			libudev
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if [[ ${#targets[@]} -ne 0 ]]; then
+		meson_src_compile "${targets[@]}"
+	fi
+	if [[ ${#optional_targets[@]} -ne 0 ]]; then
+		ninja ${NINJAOPTS} "${optional_targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			tests+=( --suite boot )
+		fi
+		if use kernel-install; then
+			tests+=( --suite kernel-install )
+		fi
+		if use sysusers; then
+			tests+=( --suite sysusers )
+		fi
+		if use tmpfiles; then
+			tests+=( --suite tmpfiles )
+		fi
+		if use udev; then
+			tests+=( --suite udev )
+		fi
+	fi
+	if use udev; then
+		tests+=( --suite libudev )
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test --no-rebuild "${tests[@]}"
+	fi
+}
+
+src_install() {
+	meson-multilib_src_install
+}
+
+set_rpath() {
+	patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		exeinto "/usr/$(get_libdir)/systemd"
+		doexe src/shared/libsystemd-shared-${PV%%.*}.so
+		if use boot; then
+			set_rpath bootctl
+			dobin bootctl
+			doman man/bootctl.1
+			meson_install --no-rebuild --tags systemd-boot
+		fi
+		if use kernel-install; then
+			set_rpath kernel-install
+			dobin kernel-install
+			doman man/kernel-install.8
+			exeinto /usr/lib/kernel/install.d
+			doexe src/kernel-install/*.install
+		fi
+		if use sysusers; then
+			set_rpath systemd-sysusers
+			dobin systemd-sysusers
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			set_rpath systemd-tmpfiles
+			dobin systemd-tmpfiles
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+			insinto /usr/lib/tmpfiles.d
+			doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
+		fi
+		if use udev; then
+			set_rpath udevadm systemd-hwdb
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
+			if use split-usr; then
+				# elogind installs udev rules that hard-code /bin/udevadm
+				dosym ../usr/bin/udevadm /bin/udevadm
+			fi
+
+			exeinto /usr/lib/udev
+			set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+			doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+
+			if have_dmi; then
+				set_rpath dmi_memory_id
+				doexe dmi_memory_id
+			fi
+
+			rm -f rules.d/99-systemd.rules
+			insinto /usr/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto /usr/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+			doman man/libudev.3
+			doman man/udev_*.3
+		fi
+		if use ukify; then
+			dobin ukify
+			dosym ../../bin/ukify /usr/lib/systemd/ukify
+			doman man/ukify.1
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use kernel-install; then
+		exeinto /usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		exeinto /etc/cron.daily
+		doexe "${FILESDIR}"/systemd-tmpfiles-clean
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+		insinto /usr/lib/tmpfiles.d
+		doins tmpfiles.d/x11.conf
+		doins "${FILESDIR}"/{legacy,tmp}.conf
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto /usr/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto /usr/lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto /usr/lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_preinst() {
+	# Migrate /lib/{systemd,udev} to /usr/lib
+	if use split-usr; then
+		local d
+		for d in systemd udev; do
+			dosym ../usr/lib/${d} /lib/${d}
+			if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+				einfo "Copying files from '${EROOT}/lib/${d}' to '${EROOT}/usr/lib/${d}'"
+				cp -rpPT "${EROOT}/lib/${d}" "${EROOT}/usr/lib/${d}" || die
+				einfo "Removing '${EROOT}/lib/${d}'"
+				rm -r "${EROOT}/lib/${d}" || die
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index de7ce370cd5b..b7f5227f4a77 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -12,15 +12,19 @@ DIST systemd-256.6.tar.gz 15667835 BLAKE2B f7c51e3e8638ec415ba46428c13de9f0ff7ac
 DIST systemd-256.7.tar.gz 15672532 BLAKE2B d718b7bcbf9c3583953a9fa82319f04b32d17c5b7539a49b9999881bd8cea7fd9a06f252d763170613a6cd0fd2535762b233cba74eb87764f662c4bdf2d8c1da SHA512 2ff3805a7d97780a716b23ddeea3722a85aba6326ecee527e53e9d35510a0ffa5ec0bf0cdbf8f3409bb9c6832406916f63eb7e8305db5f67c284e5590c642422
 DIST systemd-stable-254.17.tar.gz 14566862 BLAKE2B fca04c8db285cf22551f7c980da52a8aa3ef3eb78d6005b38cdece4b53ac43a69aa401f8498ee00fcab037dbb22c996b8c626db32c6e4be481f41f752e7a848b SHA512 11ae971e5463fb511c32fbc1ce4012765c73cf87d68ca44c36b85a2ed12f73655b6d071975008c6dd56a27963d1dff5d3c22039fc813bff30be23e6f2dd425ae
 DIST systemd-stable-254.18.tar.gz 14567354 BLAKE2B 30605ae63bdb650d380bcf4697eeaaba96f5e7a32051aa103ad9f8d32bb9a0c3bd9859ca23fda6b4e6ffab98a814748bc30638a01d03473191013758a958c70b SHA512 437db125a15021a5f51f59f8cc66992c8d2d767fd3fa13331c41502d1d362a3fd0024058a708602bb2760689bd61ec656c6faffcb22932776d54e9815a43d4ed
+DIST systemd-stable-254.19.tar.gz 14571542 BLAKE2B d24cc18737d8155638320c8ae715df879925b3197bf47beba4af8856dd5935505cb1fd06f0188f05bd4ae11c9b034770daadc136d21f00aec550f45ac52375c3 SHA512 736475ea64b0293de79ec56c1448682e2e1698fcd5dfa51f1348d7f51887e9d92457c557f3371ed1d6b43e1e845cf2af5fad91da831e38d3e2dc26982acab5a0
 DIST systemd-stable-255.11.tar.gz 15107037 BLAKE2B 7839323367d47dc57914fb501c7be38206f3bc882e560c4df25c65d421e5756108711b0ce57df6ad444d5eabb256d6730366e21d283cb02e1ef014b670855669 SHA512 be06010b56f4ea0651ebe921cd2a68f1794a64367fedea6752f7ba71ac5e00c5f0167d52ba5b662fd9781f5aa3f372e174b65f99a9bac66d4bf6af92caa67ba7
 DIST systemd-stable-255.12.tar.gz 15107917 BLAKE2B d3e3922e326f9a06557769800cf21b61562e4d26776be50a87ce04503e16fbcb2ee73e2a78c3ba1ce1b343f0e31bec7c2346188331c5558dcbb4cd7d023906d6 SHA512 bb31854da5a2f2ac7c2c4a5a92457352ceabcb4fc7063a08e29f0d0e500a1a684d2d76bc75695425ebff53e150986bdd925455493928df46c6b4546e1c7fcf72
+DIST systemd-stable-255.13.tar.gz 15109381 BLAKE2B ae87a46493451ac036ce35de2ba6db7db68228df8f80f82d0fa126852d2becd66083579a8734fe7b04f8460dbcccba304347c21ef967a2e3b7b51426c0d99f10 SHA512 e32986301b3117844232255690a4e5dd1a23b27710f473c9cf12217e366e61d1ca72c3bf670fcf256659e58d934c8f7a36d0c5e0821f86e2ef69306ea8afe39e
 DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
-EBUILD systemd-254.17.ebuild 15485 BLAKE2B c0f85295054844b8dcc77267e852b92889c97fd4a1e8a9cd8eeddb3ccefe19ceb67c97c4c9065639d97c14f4c47dec55a34915adef9ffd444d00f2f8586695e5 SHA512 bd0242e8133b44d7cc7b58deccf6106795ff041680277d1dc92663540b156de861f2939b86dd871fa265321375080a8a1c10860de7852e98a5843db50b83528a
-EBUILD systemd-254.18.ebuild 15493 BLAKE2B e9a86bef5b3b95aedf8b34adbfbd5a7b19ba18dc1c384e06d1e71ef016cf83c906332e11f25d93fed22f84b61def0b704faa138c2f78a8d3eb8a0ad3d4bc139a SHA512 3bac97ab12de2c65c856ce6acc6ca0a124cd939997a10c93164a3f0c54822d714492b86db14852f9293828ec22b6f370b00a49b43b4a96ba893e222a9cd67c83
-EBUILD systemd-255.11.ebuild 15230 BLAKE2B 3f29ad915e4984bfa1928b68508053681030d7ca18f57aea525e959870e52d0711eb660985a3229dbdac1fc75e1072d26ea0106bdf9e5c838f4142bd73b7a41d SHA512 585b08fccfa2d0ff1caccfede77c56e34b12231a1bbc534a40e85dc807e9d3cc42e5ca9c43cabb5768cdac997c63f54c08aade4e138fd5d4a99792b0bf1c03c4
-EBUILD systemd-255.12.ebuild 15238 BLAKE2B 834f02a0001137b4435a7d90764279cc5fb4044f088258852f27b3c96b0b4986abccaffc75826944adc7a6fdee3c5e7c9599e354233a4eec5d7fb9b2cc4261d5 SHA512 170064f830a56925ac5fd70c3209131665d84195458494ef73a05f2e6c3bc438f08839bd0b5dea2eabc7b1a71ddce8ab7a5ba3e49d82ad41669be43f7e4bf110
-EBUILD systemd-255.7-r1.ebuild 15230 BLAKE2B 3f29ad915e4984bfa1928b68508053681030d7ca18f57aea525e959870e52d0711eb660985a3229dbdac1fc75e1072d26ea0106bdf9e5c838f4142bd73b7a41d SHA512 585b08fccfa2d0ff1caccfede77c56e34b12231a1bbc534a40e85dc807e9d3cc42e5ca9c43cabb5768cdac997c63f54c08aade4e138fd5d4a99792b0bf1c03c4
-EBUILD systemd-256.6.ebuild 16226 BLAKE2B 8b4c9d42c64fe0e0f3817da49dce9dcf4d1c329af71f3ebf123f09b9a8fbec71866fbf78622c337ea53f9f34b147c034c433a5bc6b58862df97a94b99f81cb18 SHA512 21150f9979ef78a8658956172c0bf27b8cbc5d6114819537cb1471a6d257744ecf0e94c271cee9a3f98ce1a050a2521f1eef902d76320be69312fc4c2d9289be
-EBUILD systemd-256.7.ebuild 16223 BLAKE2B 88d2e588f51ed28aae2fd3c08d56357e8e357c5db750cad14e7c975717b7fdd55b8e0e347cf227862d86e83d1166f1bee7824ceea763e669f7032e31d19584cc SHA512 c4a1c4d589587172fbf06d5f12e9cc0e8e98ab43137b31f88914922e707537cc797ecea090074cc5dbfa8e4519f761bab5a2ff3778e1fabea0742b6e3aed5f02
-EBUILD systemd-9999.ebuild 16204 BLAKE2B 60b1e6168ce2ed5bc0f25ee0cdd8de5fe07d492203ffb0f8fcb5db88065e0b001d5ea0141c08fddaf17b3d4afdf0c71457beb31300d493503d72589d36182f80 SHA512 c2ffec6cd8035f40c18dca4b49048cf5a14a876f3a8c06ca07f2ffa3dcbc541eec37a42f0cbe6ed38cadd6fd7ea61bb80415af458cae909c31666165c1cc3015
+EBUILD systemd-254.17.ebuild 15486 BLAKE2B c9f1de5ede2d4a980dc9eb25f1a07b3b10265b6f0d8fd1fff2b314a54ec0ba94f6c3af3b3a8b251ecdb77469126920892e81b0517a59c577fb45730a9957346b SHA512 c5b13dbb5d2de234c8a3f5629c84843143433a8f71c0e7db6cd05ef4a084d79320c791d4ce9d42e097845c1fbc1e83b5de635bb501c2d099d73a4dee9d992dac
+EBUILD systemd-254.18.ebuild 15494 BLAKE2B 5eb683dd09f395202e94eda2f9e6d71f7f543c447a165a409df158d7fdcdc146ef65097fb51d59ff737eaa7ef77f95779337e65d1f9ebc88cc18b0e5ae58cfba SHA512 6d9cadc8a94b26a58f998af79a6b6dae47b6ba8cf461fa9753d92f293c5203e563ac35901ea525e25ed3d0ded5eee5cef98d65bee00f8fcc5bf2137766d8b305
+EBUILD systemd-254.19.ebuild 15494 BLAKE2B 5eb683dd09f395202e94eda2f9e6d71f7f543c447a165a409df158d7fdcdc146ef65097fb51d59ff737eaa7ef77f95779337e65d1f9ebc88cc18b0e5ae58cfba SHA512 6d9cadc8a94b26a58f998af79a6b6dae47b6ba8cf461fa9753d92f293c5203e563ac35901ea525e25ed3d0ded5eee5cef98d65bee00f8fcc5bf2137766d8b305
+EBUILD systemd-255.11.ebuild 15231 BLAKE2B 477a45b83d9c43fcb30e129828324d1840faabc2d63db2f152979d9997c1e8f40e5bf94b93a15f0df8819c49ee7a83e08245dd9f8f5d7685bbb8ee5c2b59340b SHA512 88299e8a7514fb4ff4893e47ba39c4bc33683f4bfb588b306fcee17085a2b98ca9558d59c7b161c2114d0db93d2bae4503837ae61cd6aa62e55c6696754f0029
+EBUILD systemd-255.12.ebuild 15239 BLAKE2B 32c84a6e234cae90da58a2aecfedfd6c896004242f7b554201953a569013a74b9a14bd1ecd843f2e125a26fd90002015504dc92765b26e83e75ee3ad5a3ae1cf SHA512 a53492ae381f93bddb103de28e680b1cffbccb846ff22cb7c8fa65c65b35e701c03cce68f7495816da23269339cdcef49bd3a7b547442fb7df2805bbbd0ef28a
+EBUILD systemd-255.13.ebuild 15239 BLAKE2B 32c84a6e234cae90da58a2aecfedfd6c896004242f7b554201953a569013a74b9a14bd1ecd843f2e125a26fd90002015504dc92765b26e83e75ee3ad5a3ae1cf SHA512 a53492ae381f93bddb103de28e680b1cffbccb846ff22cb7c8fa65c65b35e701c03cce68f7495816da23269339cdcef49bd3a7b547442fb7df2805bbbd0ef28a
+EBUILD systemd-255.7-r1.ebuild 15231 BLAKE2B 477a45b83d9c43fcb30e129828324d1840faabc2d63db2f152979d9997c1e8f40e5bf94b93a15f0df8819c49ee7a83e08245dd9f8f5d7685bbb8ee5c2b59340b SHA512 88299e8a7514fb4ff4893e47ba39c4bc33683f4bfb588b306fcee17085a2b98ca9558d59c7b161c2114d0db93d2bae4503837ae61cd6aa62e55c6696754f0029
+EBUILD systemd-256.6.ebuild 16227 BLAKE2B 7c05254a0a890dbf461cafd41b3a4cb53e5a738233fe55f0db25daa3693042b478716e83dc921777e1d7ee4bebffc895e2c77dc38c85800c93a5e00227b2267f SHA512 8c629b584b7c3c2c4d591f499f93ee650202d898991ab8bbb728bb632f58c1b1cca4148d8df7c27dda398aedda246d04721219ce0c9ac350ce62577034207a53
+EBUILD systemd-256.7.ebuild 16224 BLAKE2B fd9753f00c148947c5748cec7323505315260eff34c6fbe51451c1a391334063aa296fa3568e653f9f2ca44bfc011e5240a2b903ba56549adeb5b266018bbd89 SHA512 b6991acca80b9890f5ef775b7791d587f7f7033710f5b755061525f2c3697debfb2c43390d385b50838b6b7d8db954b1ff7dfe3d906dd17c845a675519c6c595
+EBUILD systemd-9999.ebuild 16205 BLAKE2B 09abb695667cb744c307118fc4050352613330ad212947965576095730bafb32c176d39c6158d9620d328de69853c6eb101942cf98f863c334ef2f304cd1072a SHA512 43c1e39cc87fdc24bdc9b0245f302740ab5a329044d85e664599901da79918d2c2a78d3a58264ce96a58de18f0b48d72fc61ac9b30237b682e0d94f12b72faa6
 MISC metadata.xml 2686 BLAKE2B cd65634500cfb85ace929a24ce7d21603d50d6f532e0445bcca9b888050f347dd162696045267995b14f3d0985a2ab0d99441b323c9e596ba68dc04d6239bc0a SHA512 7dec9047b453b28d796a5e589aabd975838f48a51ba5e1267aa5c8f91a3cca97bef33419cd38c652a522ba347e63a0a5f5a427c4894ea656cffd94e2680f8f89
diff --git a/sys-apps/systemd/systemd-254.17.ebuild b/sys-apps/systemd/systemd-254.17.ebuild
index 4ba06e502577..27288f01db4d 100644
--- a/sys-apps/systemd/systemd-254.17.ebuild
+++ b/sys-apps/systemd/systemd-254.17.ebuild
@@ -170,7 +170,7 @@ BDEPEND="
 	dev-libs/libxslt:0
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
 		ukify? ( test? ( ${PEFILE_DEPEND} ) )
diff --git a/sys-apps/systemd/systemd-254.18.ebuild b/sys-apps/systemd/systemd-254.18.ebuild
index 370c8c9cc4c2..d32eb9cf9067 100644
--- a/sys-apps/systemd/systemd-254.18.ebuild
+++ b/sys-apps/systemd/systemd-254.18.ebuild
@@ -170,7 +170,7 @@ BDEPEND="
 	dev-libs/libxslt:0
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
 		ukify? ( test? ( ${PEFILE_DEPEND} ) )
diff --git a/sys-apps/systemd/systemd-254.19.ebuild b/sys-apps/systemd/systemd-254.19.ebuild
new file mode 100644
index 000000000000..d32eb9cf9067
--- /dev/null
+++ b/sys-apps/systemd/systemd-254.19.ebuild
@@ -0,0 +1,540 @@
+# 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
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://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
+	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.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl: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= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux: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/openrc-navi[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!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/jinja2[\${PYTHON_USEDEP}]
+		dev-python/lxml[\${PYTHON_USEDEP}]
+		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+		ukify? ( test? ( ${PEFILE_DEPEND} ) )
+	")
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	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"
+		"${FILESDIR}/systemd-253-initrd-generators.patch"
+		"${FILESDIR}/254-PrivateDevices-userdbd.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
+		)
+	fi
+
+	# Fails with split-usr.
+	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
+	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"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# 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_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	local -x COLUMNS=80
+	meson_src_test --timeout-multiplier=10
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+	local sbin=$(usex split-usr sbin bin)
+
+	# 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}${rootprefix}/${sbin}"/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}/${sbin}"/{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 "${rootprefix}"/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
+		if use selinux; then
+			newpamd "${FILESDIR}"/systemd-user-selinux.pam systemd-user
+		else
+			newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+		fi
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+
+	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 split-usr; then
+		local dir
+		for dir in bin sbin lib usr/sbin; do
+			if [[ ! -L ${EROOT}/${dir} ]]; then
+				eerror "'${EROOT}/${dir}' is not a symbolic link."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	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 [[ ${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-255.11.ebuild b/sys-apps/systemd/systemd-255.11.ebuild
index 210bbbf3c06e..c7be7d18dd46 100644
--- a/sys-apps/systemd/systemd-255.11.ebuild
+++ b/sys-apps/systemd/systemd-255.11.ebuild
@@ -173,7 +173,7 @@ BDEPEND="
 	dev-libs/libxslt:0
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? (
 			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
diff --git a/sys-apps/systemd/systemd-255.12.ebuild b/sys-apps/systemd/systemd-255.12.ebuild
index 63f1789fde19..9f2c1c44f05d 100644
--- a/sys-apps/systemd/systemd-255.12.ebuild
+++ b/sys-apps/systemd/systemd-255.12.ebuild
@@ -173,7 +173,7 @@ BDEPEND="
 	dev-libs/libxslt:0
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? (
 			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
diff --git a/sys-apps/systemd/systemd-255.13.ebuild b/sys-apps/systemd/systemd-255.13.ebuild
new file mode 100644
index 000000000000..9f2c1c44f05d
--- /dev/null
+++ b/sys-apps/systemd/systemd-255.13.ebuild
@@ -0,0 +1,540 @@
+# 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
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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="http://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
+	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/openrc-navi[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!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/jinja2[\${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-generator-path-r2.patch"
+			"${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=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# 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"
+		# 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
+		if use selinux; then
+			newpamd "${FILESDIR}"/systemd-user-selinux.pam systemd-user
+		else
+			newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+		fi
+	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-255.7-r1.ebuild b/sys-apps/systemd/systemd-255.7-r1.ebuild
index 210bbbf3c06e..c7be7d18dd46 100644
--- a/sys-apps/systemd/systemd-255.7-r1.ebuild
+++ b/sys-apps/systemd/systemd-255.7-r1.ebuild
@@ -173,7 +173,7 @@ BDEPEND="
 	dev-libs/libxslt:0
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? (
 			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
diff --git a/sys-apps/systemd/systemd-256.6.ebuild b/sys-apps/systemd/systemd-256.6.ebuild
index f957b4c395ee..323be45e828c 100644
--- a/sys-apps/systemd/systemd-256.6.ebuild
+++ b/sys-apps/systemd/systemd-256.6.ebuild
@@ -173,7 +173,7 @@ BDEPEND="
 	dev-libs/libxslt:0
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? (
 			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
diff --git a/sys-apps/systemd/systemd-256.7.ebuild b/sys-apps/systemd/systemd-256.7.ebuild
index 729d4180671c..7b0d42edef94 100644
--- a/sys-apps/systemd/systemd-256.7.ebuild
+++ b/sys-apps/systemd/systemd-256.7.ebuild
@@ -173,7 +173,7 @@ BDEPEND="
 	dev-libs/libxslt:0
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? (
 			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 013ea2fdc445..5958ad4f7343 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -173,7 +173,7 @@ BDEPEND="
 	dev-libs/libxslt:0
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep "
-		dev-python/jinja[\${PYTHON_USEDEP}]
+		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
 		boot? (
 			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index ebb215e19ff0..d8e425302683 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -23,6 +23,6 @@ EBUILD util-linux-2.39.3-r2.ebuild 10866 BLAKE2B 75df6fd95fd0efb1a157ff51011d15b
 EBUILD util-linux-2.39.3-r7.ebuild 11225 BLAKE2B a65ff6677233ab57f23688acd48a65c1940886aa7a2cb584de8cb898c924db5908f432714d4339a1b15abf64fd443839f8d61b02a6f0b02e53e275f5b6372691 SHA512 028d61d839e9562a773c973fc54318d7fd58fda10a3edf88219286700eeb8338ae4f66f3aa0b8c74a1ae1473512d32a50ede1711409f65a383ea32202bdbda3b
 EBUILD util-linux-2.39.4-r1.ebuild 11157 BLAKE2B 43e2d4020c60cd03eced137309fa964197fed3d54318f978c3cdfd5ff6168b68be36c9e103c93a85e591d005a117cc1ad973c4332f6e8b30aa0d6af0629629a9 SHA512 0b792936aec512e2ecb3e27609b8d35bd138cc9b43d6ed227472de39edac50656166007b96478d51ad10ef8b5c6bc48b9eddcf3838a6bf964e3e3c85e2df5ca5
 EBUILD util-linux-2.40.1-r3.ebuild 11197 BLAKE2B 1de613c4379450857b216dca06ce69fa06aec615b14b70f45e2427409995c449f59883ac17d7b44e7da00051a0dc40723207cd6c8796282d00aa2f1e2b7aec3e SHA512 6a4a11fe2ee3d7ce4b4f0073f1825e3ba81ab56398cd25b63871cc7a2d0f0bef64364d66fe84229efdb3663bb0504214e84d713fb97f25dfc066a9cd3c4d4588
-EBUILD util-linux-2.40.2.ebuild 11848 BLAKE2B 9582a14a5db640367d89a91b6b06c926262c0ed31c7477718ded47e85130e4a73cec878423c2e5c22c0b812c48f4692f9780454d27ae6846fc52443a5dee6bf1 SHA512 bc0e77aa83123a3673dab428218e55dd184d3da340acdbdc5f2e33642c9e3b1433442431b24798c976b16d70c7eaf54345dea1222562b3a10da4eefed0ea9935
+EBUILD util-linux-2.40.2.ebuild 11846 BLAKE2B 72aa2c94f642efc6e09b8e2ebceaf40c9cf264e95adaeab12e1185911cff838f913043adc9ca84b4afda294f8d5f754d125cbb4b1035f946300d0941d3f58542 SHA512 9fc77ce612d222b8bf6924176bb1f21c5611d73d03b06e632d7debec8eab93926a376a1d348ebd9320b59aa9b735a7295d973590c785475af5a5d716d303f5c6
 EBUILD util-linux-9999.ebuild 11848 BLAKE2B 9582a14a5db640367d89a91b6b06c926262c0ed31c7477718ded47e85130e4a73cec878423c2e5c22c0b812c48f4692f9780454d27ae6846fc52443a5dee6bf1 SHA512 bc0e77aa83123a3673dab428218e55dd184d3da340acdbdc5f2e33642c9e3b1433442431b24798c976b16d70c7eaf54345dea1222562b3a10da4eefed0ea9935
 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/util-linux-2.40.2.ebuild b/sys-apps/util-linux/util-linux-2.40.2.ebuild
index c7517aac4cf1..966071d7efff 100644
--- a/sys-apps/util-linux/util-linux-2.40.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.2.ebuild
@@ -23,7 +23,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
+		KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-apps/uutils-findutils/Manifest b/sys-apps/uutils-findutils/Manifest
index 13e5c9723354..5cf8678231f0 100644
--- a/sys-apps/uutils-findutils/Manifest
+++ b/sys-apps/uutils-findutils/Manifest
@@ -256,5 +256,5 @@ DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 EBUILD uutils-findutils-0.4.2-r1.ebuild 5243 BLAKE2B 6204881a30389dea543f2227486582236207c096263ed178f152201878369a003699bfbf6f2220028b14b6e8a94a5f38e9c0164c1e5c1f01811a700ec411a3c8 SHA512 99e2a45fc62775f37550b818d5563a233a8e29a156d42416623eb22411abb354c09682d49019292accc3a7985d6929a7b5d341e93951c14466fa0c5d0505122b
 EBUILD uutils-findutils-0.5.0-r1.ebuild 4148 BLAKE2B d8a4d0f0e60dd75c810766c83a625fceead8387ab1b21f5374ee625ba9232cb7f971e2a5a41278a51641a7200cd117ed91e1b3b246be32d05b24e938bfb2029d SHA512 50a773ca9de468cca91c5512d3dae975b23a53f2ae3d56a259cccae1e5330362d5c84f61195afb571df5a9b29c9b801856945157d299a802e50d0e99326accc4
-EBUILD uutils-findutils-9999.ebuild 4096 BLAKE2B 0e69be23f271e3d779ad68baec9f6cbbe9a9dab790dfe472342c0b3dab1742f88c0638e55aa2aece138ba780740c8982b5d0e879ff00259a22b80031f0df198f SHA512 2bd33150b1c4f9f184e8b3d110acabd84c8ac0aff9f6d8a6b39f2d692ecd12c3724a05fe02e41e83193462b27b2a55d5bf96cf04c3b5c4c1b61aa35674d33ef8
+EBUILD uutils-findutils-9999.ebuild 4096 BLAKE2B fcba082f4f11cda2e1ccb20ae7aef445ba7c824c81fa3ec8d295e9d906aaa56b4b71061ff26300da6003838a2d2fdbd9f626a76ea811ffa97a2f766ed5fd8710 SHA512 7767575ca40dc6c7c44299e5780c364833f6b685d98e7d6d38094cabb3555110df6bf3507ebe37b07cb8bfe50b5703133ca0c88f6fda54be17c56c2b57c73385
 MISC metadata.xml 428 BLAKE2B a130660afee028d057d6efdb89665b9aaee83236fdd0823341182d27e3838ddc8b64dd57e47f6c1e9baca06cedea895eff01649a0b9ddbb50552d8bae64afcc4 SHA512 f505385ff6f1a8baa50643719eaa2cc7464f3a9e2a225532e417c1942fa711ae9b85ebeb5d71982f359d2b2555e7fddc897bd502db085355d8dd5c7479eda136
diff --git a/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild b/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild
index f8a83a5773bb..e9bd9e6cd60b 100644
--- a/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild
+++ b/sys-apps/uutils-findutils/uutils-findutils-9999.ebuild
@@ -133,7 +133,7 @@ CRATES="
 "
 
 LLVM_COMPAT=( {17..18} )
-inherit llvm-r1 cargo
+inherit cargo llvm-r1
 
 DESCRIPTION="GNU findutils rewritten in Rust"
 HOMEPAGE="https://uutils.github.io/findutils/ https://github.com/uutils/findutils"