gentoo auto-resync : 10:04:2025 - 08:43:23

13 files changed, 1198 insertions, 15 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e48964f1ffb1..8441745f2270 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 2d5f5194289c..4795fe11e3f1 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -11,12 +11,12 @@ DIST coreutils-9.5.tar.xz.sig 833 BLAKE2B 37c29984bceee0ff3bffde76712f71dbb118c2
 DIST coreutils-9.6-patches.tar.xz 5904 BLAKE2B 1abe214914007804362b9d7c1a7c39f07d74c51857e84484179f11bb8fa512356ee97c811ef62469aaa52db5cc90f2f7587c2dc57ed130ebbfdacc59755dcb90 SHA512 5a609b21da7c78e41184e5d7bca87da4f868975635b6e8aa4bd8f4d18c98a2fabd5b7e8ad6bf7780ca77f6d532bfa5cb1ed618e4bc32617ba2977d4b8a885b9f
 DIST coreutils-9.6.tar.xz 6134764 BLAKE2B 4070d3d272851d3e9c326df9c05ce67797d86852e7f5c26e545f987f444295f2cfca24e8569514d7b5edf8fd50318d07cb20dea4a4ce8c65b34bea0c5a9177be SHA512 398391d7f9d77e6117b750abb8711eebdd9cd2549e7846cab26884fb2dd522b6bcfb8bf7fef35a12683e213ada7f89b817bf615628628d42aee3fa3102647b28
 DIST coreutils-9.6.tar.xz.sig 833 BLAKE2B a9ea9773746d21b526e69ca2ff7637f3dcef4a921da943f281c4d16fed2d8f9eff92353e1ceafbbc8cfe4b9b23bf123bf64dcd79ff598759373c50739a5046c6 SHA512 a8e578b5e1d053b49e3e2c5dc94431d17c6a14662f459b2174cea23865ccca32e5ae5c13fedb0a8345d25269a9b98cb7f463a897c9663f9f9bcaf61e5c781378
-DIST coreutils-9.6_p20250406.tar.xz 6153440 BLAKE2B 39a7008ce18f88a67188b7d687cb5a7e6ec973c6894c55b8968a1ba48660354f754ff0a8a1887cfc991ac1bd7bc74ad4a2ed457420ca427baabea6686599c66f SHA512 833ed305150c80469d9e8d8c21841d6ff08571b42b067a6f3e3f2c23395051389a62632dd16f752508fb8ca9c095f0c783cf87d6e12c1fc63093d4f5aade5984
-DIST coreutils-9.6_p20250406.tar.xz.sig 833 BLAKE2B 87a3626126ec4e34d874630fccf5785cb38a60457100f0ebade9a5a07163d77788425814c683a61d6661e67f7ce0e3f1e5309342c7d5280fdcc66cdb82c5f224 SHA512 fa39eeb7bf0cbe140346ef9280ee43aea7ac6c2f9e440c27d9f27f04e35dbcea8648ce03d9a29589aa10af08ea55e6821b8b1870cd9260dc20a73a8b3af4dddf
+DIST coreutils-9.7.tar.xz 6158960 BLAKE2B e5e5f7ec26c3952eb6a25988f78d3a1f8a70cf97a2fbc7b433dfcd1721cd38e6e0a8b9cb83f854a22df325bcb5ea8c4534c5a217273762cd5d575b381db69ee8 SHA512 fe81e6ba4fb492095153d5baac1eca8f07ece0957849de746a2a858cf007893cc2ded595a31a5e5d43d13216cc44b9d74a3245d9f23221ecc8cd00f428f27414
+DIST coreutils-9.7.tar.xz.sig 833 BLAKE2B 18dee5a1b5dc1811b277748fe6ee079dc6320bc6d67e01f108415c6afe21ad0367ece46f8c6dfb0976b1e5f62ae15c2d61fba916ea232c71a1b2f66c81b983bf SHA512 48d86a19cee3c153f01f7478847f4621685c02e59942540bb20b30e314df05230817b87d0e73acd953e79fab35718e5bea57f25fe511a2c275a85ced4b317bae
 EBUILD coreutils-9.4-r1.ebuild 8488 BLAKE2B 39c45419769c3eb3b27f6e11cac3196874e323562e3ea0520d277a3739beae6bda3b967ecbdad92ce9e069f17b2798e8baaf23b39b497ad83204308e0c7dab9a SHA512 e510b0a4f080bbdc2411617eb95523c4504d300a4142f1e02a662683e0d8d864dd55fcf533563053990a247d803b566f94df71879030233335ee432d877be67f
 EBUILD coreutils-9.4.ebuild 8390 BLAKE2B a3ad5d870e7e03e49acc837bfec6d51bde3604aeaf57db373b4f0780e43ee9cabe94f28b620a11566a5ebf8e1756c6e137dc744deb12a5603c5eddb7c42b8f5a SHA512 8f491086f1bb1c7f9a1b2c206377cef994d206215427b723df211af55bb00e0b9e7121b05c49b1e809b232ca27d27592199cb87ffeab973fe72d089c5c7279e9
 EBUILD coreutils-9.5.ebuild 8575 BLAKE2B 380dc8f4d3e2746436d77bf9b6f315003b2e91099abcb5a3c074b7c1d96293a38e263761314c90b185489e39afbc870d8cd515a4a80b07f5f50133df3297a2c1 SHA512 20cba518baeb5ad28f48b4965e9d55c30a00987714137ef9931f4c5120dd73394c5ab8c1d1908f424f11c4bb053dfd83a81dc59264cfb31f3b8a99a831b1fb60
 EBUILD coreutils-9.6.ebuild 8550 BLAKE2B 84960e0bb79512986588148b00a8cb7f45a51aeae70fc1a303c1e9b5971de5c1680433f2c94066e5cf13f2d675d247e5881c8c9095456823539187b7b3c2de4e SHA512 870759a22b8904a961f970a9d7e23772c7ac7f0426a2644ab91e602a2c7fa2af21248029cb0e8d46b3376fbf848252a344c20429f846b135cd3620b2aab4f992
-EBUILD coreutils-9.6_p20250406.ebuild 8309 BLAKE2B 1c84495885464614718ea9ca49dfd7918f0da1b408fa846782e6de5daa5a233fc912b32f5c7b46def5ece8e6e2712f105804f040c7999aba104486e5c50c41b0 SHA512 2db856fdb1c5430d791120f00070559bac3edb437ad2d78e1135f9b6d21016c1452390ddbf5e7218f1c09c6a44b89060fca7cbad5464bd253ff49c9eceb0883a
+EBUILD coreutils-9.7.ebuild 8309 BLAKE2B 1c84495885464614718ea9ca49dfd7918f0da1b408fa846782e6de5daa5a233fc912b32f5c7b46def5ece8e6e2712f105804f040c7999aba104486e5c50c41b0 SHA512 2db856fdb1c5430d791120f00070559bac3edb437ad2d78e1135f9b6d21016c1452390ddbf5e7218f1c09c6a44b89060fca7cbad5464bd253ff49c9eceb0883a
 EBUILD coreutils-9999.ebuild 8309 BLAKE2B 1c84495885464614718ea9ca49dfd7918f0da1b408fa846782e6de5daa5a233fc912b32f5c7b46def5ece8e6e2712f105804f040c7999aba104486e5c50c41b0 SHA512 2db856fdb1c5430d791120f00070559bac3edb437ad2d78e1135f9b6d21016c1452390ddbf5e7218f1c09c6a44b89060fca7cbad5464bd253ff49c9eceb0883a
 MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1
diff --git a/sys-apps/coreutils/coreutils-9.6_p20250406.ebuild b/sys-apps/coreutils/coreutils-9.7.ebuild
index e5e3c773c375..e5e3c773c375 100644
--- a/sys-apps/coreutils/coreutils-9.6_p20250406.ebuild
+++ b/sys-apps/coreutils/coreutils-9.7.ebuild
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index ff95740583bb..f1f0c6ab71e9 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -6,6 +6,6 @@ DIST pv-1.9.31.tar.gz 417551 BLAKE2B 6018abe674834f45312faa5ce07b49e11258e29fffc
 DIST pv-1.9.31.tar.gz.asc 691 BLAKE2B 7b5b998341db887b14c56fc080d87cb4abb186b4df2c8def638822889a734436fe0c4c132396415bbc0dcb0754f76d0456bb667533ef7ed92ed0c09a62522e8b SHA512 549a3bb3f4f404b3a6e407663ba335e3d4e14303185654771c974335ed5e7ac46dbba71bbf4f26e640217829e58a0da8d6fa139b02f426b60ab074ec97084374
 EBUILD pv-1.9.0.ebuild 1436 BLAKE2B 9140edf0e52ee056673c1e656e238aefbc84a8369725f71eb580474c1ef4dd45d961838267b72e07cdb0dcc1c403165d387d43e7c31104d83dab77cedd15ac20 SHA512 ffc945675effac07424e01cd388160e39b97762015314df0e61de12ae7df5c854e451415e55c91bdd6e12001df24c6f4a13a76b126b901b3965dc87c95d57eba
 EBUILD pv-1.9.15.ebuild 1358 BLAKE2B 432270d1e32b00f3b16f89251e9c90b0a1999fe9e9ae43188e0b2e98205ef559a440d052a1183d8fbccf10b90d0613eb160ede42b460eaf7a9835432aef19ebe SHA512 4084ef2315841228e35776a4fafb93a9fe16718fdf72b6bdbf6d595479a44aacf54b6ab6922293ebfa56f15815a580fbe21075e882992e52aa4f9f2329bac66b
-EBUILD pv-1.9.31.ebuild 1453 BLAKE2B 4261f1909b145351d59b02f28177201853f1ac23d94238911c3fd631d60eeae33c23d2d7d5461c88b969e4a882c546d336a12535b23cdb1a0ce44ec9b459f006 SHA512 7df69bba9107f56a6ef0fac3c1225ad480050c2e54504358526cbc7402256608dc89b681179dbff4678174bd4f6b2aed56baa66716dbec5a562463a69684eb1e
+EBUILD pv-1.9.31.ebuild 1452 BLAKE2B f6f002ea761034f909f61428bef4f4b43f8686b68b750a1e9e03fe4f6fdb341f1d17ddb0c01c511f92a0b535ad9b71ac9334e6c499e8d0fad6e585127c8806cd SHA512 a70e17487c781194b56ba4059556a229ef1ae50001f2e2a38cd6a0fc8bf86f31c1c2a17ad91b25764cda9c9a6750d836cd1d2dfbd67f7e0160415589cc338838
 EBUILD pv-9999.ebuild 1460 BLAKE2B a2fcfc3a2afc892cae848e6a0adc570f0f93b59c4785a0eefeb6987600cf94307b714957cfffaff72d61628c580e92a70133a90d6fda1fed5d74dbff73e6f16b SHA512 653e773ace3eef172fcde1e9b09c2c5dc7e932c5318b592dd48959c45dcba86a045bcf4e849e0e41bafa94463a2e74bde264e5b66c8c8a78665fde62faf2f8d2
 MISC metadata.xml 318 BLAKE2B 784fb52623d9590f78551ca793501497ee0838584119a606a34c6ecd92b872b583e05a9da7ca979e30bba983dd4d5c8b499c1b764f23bf6fb22062b2a0b96200 SHA512 a8e06d0f2f20359e4a45c42a6db544c7efd08adc69843eaf2b1004003c4c03d1bf484214283016db560f1f6952104574287747f14bc42cfe4a184218d3783187
diff --git a/sys-apps/pv/pv-1.9.31.ebuild b/sys-apps/pv/pv-1.9.31.ebuild
index 9bc35e6c9a0a..b0670b0fc0f7 100644
--- a/sys-apps/pv/pv-1.9.31.ebuild
+++ b/sys-apps/pv/pv-1.9.31.ebuild
@@ -18,7 +18,7 @@ else
 		verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc )
 	"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="GPL-3+"
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 041e1cc0e4f7..abe4f0b2ca4e 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -8,6 +8,7 @@ AUX systemd-utils-254.3-add-link-kernel-install-shared-option.patch 2350 BLAKE2B
 AUX systemd-utils-255-musl-fgetxxent.patch 2001 BLAKE2B e667f10c829b40b51111090cbc203218f05c5dd68eba559748540ffc5eb9c9b2996370321f69e0f4b70a97c5826a25df24b5f7a744669e1cb65cdbc3635bbac2 SHA512 f0028ebec6481e90bff11e87cf166a7ef3c12c7bb40591c326275e652225776ea894d00bb248f1f2a2c36ba13b5f3a41f0161afa85a359a54de84e72ff7c8533
 AUX tmp.conf 48 BLAKE2B 04e0b6bd652b67e18eb96d47cc049ba89fdc28512edca4f5719f21938efbce2f59214e329f2fc3c862afa2b15156ec3fafbc696a1cc8795a8ec3c9dcd7a6b563 SHA512 45743d48ce7c3932310522fbeb7344f6d53c3cc38ca42b1b6aff7619fa91f7722dd328204432aa0fdd19c9107a44f3d0814c12f24bdbeca99b94b217e6927a72
 DIST systemd-256.12.tar.gz 15865500 BLAKE2B e15fd622357c1af09b6b25230040721d73b11b62b466e95d4c8f905c648461b9341ef641caafeb9bfe63e3635f3f5f425fbff2f4208e07acffc87dbe6676293d SHA512 7c0f22e4eb562f028cbec8ddfcc7bbb7272c41b91b9578a61b95d895b746653d36a17b52b78e9297b9dd09049c72bfe6be073319a00629f263f2a9f9b1e5cba4
+DIST systemd-256.13.tar.gz 15867550 BLAKE2B 6cdd884d430c7f2c9c9250dd63885b233d64b87a3297f604881567042f45d51aea1ae341e4fd356997464e53b230b6fb6ec502b0e88f28d9d4296f4dfeef2a14 SHA512 e25b3e5bce42211918058320789ab154282ecb264803ddcb9e0fb3afbb53417eeea29dcd183b68dd758e39f28cab2e1ba3267766e589f5129e213e12f109017e
 DIST systemd-musl-patches-254.3-r1.tar.gz 29971 BLAKE2B 2568c0ce93c410177d775fedb7a67b9498d66f39bfaca220237b3b55cd42c94569d7e3bfde11a9b1faa5eac1804eb75bfdee0ee465c2faac3b8213026b97daec SHA512 817c94765a70eaaa5d23454e03887e149db4612f01c29690baa0c75d61b4b328b742e5d02e8cc63c531eadcd72ae37c0a407aad37c22f1d399dbba81a6bed79d
 DIST systemd-musl-patches-255.14.tar.gz 31519 BLAKE2B 1ada38b3536370f3f20f94abb122b6dc72e2dac6d34baad49ae0c154810197dab6d225457f81c2b78c58cf7fe14070da9ca1902bec6d8f892d55394af67155b5 SHA512 ff9cb11f687e7895b93b55933c330f69067546d48cc0f23a029990e095245c78e046023636f82d11fec1b03a5349d4d747c9625fd34ef7f9445a54a44b25cccb
 DIST systemd-musl-patches-256.12.tar.gz 27374 BLAKE2B b9ec7b0a78566b076067547b522560b0a3f307bd0edf5ed846d09068372c3b5e6ac23e153fce00c32a353cfd7c7ada29c2aa971da4c01b35e368bcfe95671478 SHA512 aa552bf1872f39aad9eb4d0139e5029ec91665711464824d1a2a06845557e3838fdd679062a4bc5a83d8cfb11e420807819e496dd093aeebe4f18796e8ad54e9
@@ -20,4 +21,5 @@ EBUILD systemd-utils-254.24.ebuild 13412 BLAKE2B fe1ca88d934d106bb04256ece1335fa
 EBUILD systemd-utils-255.15-r1.ebuild 14281 BLAKE2B d5facc335ffbf313a64155fdd4f78b878e9a753641f8ecc6cd4ab087d5601625671c9a13eee1d56be8e312e2d6b8d37a45e1ea265a349c4de23f3258651ea19e SHA512 6319982ea41cc9ff2e9b6c390798531ca206c9ddb7928c0d72ec7f6608f228db5a8d2f01f30d6bfbdcbf8d52b1a99441bb1d8c3ae555723bcfd308c67e3a6f05
 EBUILD systemd-utils-255.18.ebuild 14403 BLAKE2B d55d3c0cbb0196c0bb9085a505deaf984d49aea3382557207c5a72801680ea317c4a1cdeb74a3c6c130f680cd5478416890e40c90800b5bd8003e5b271df263a SHA512 53bbb84776260813b460c97dca537325eb3f0327d51775b77e8ace7b1c5f57c4ab4d57e99f80db5844029155e9c0aa6b7613ebed55d0f949323060314fc6b484
 EBUILD systemd-utils-256.12.ebuild 14139 BLAKE2B 5f1770255c8da36eb6541fabc662d4975546f8414e054eedf28e214fd3dc1f629547c97557a558229487b320e425720cb39404968535ebf331ee7cf7a113c7d7 SHA512 54e208b5fb259d2145a08db350d808cd1be3813d1d15fbc2ebf49a4931e6628ed52ae2b8716b29235a15b5279bc0664ac6cc9e1d1ccf6224adb999eab2739d49
+EBUILD systemd-utils-256.13.ebuild 14139 BLAKE2B 5f1770255c8da36eb6541fabc662d4975546f8414e054eedf28e214fd3dc1f629547c97557a558229487b320e425720cb39404968535ebf331ee7cf7a113c7d7 SHA512 54e208b5fb259d2145a08db350d808cd1be3813d1d15fbc2ebf49a4931e6628ed52ae2b8716b29235a15b5279bc0664ac6cc9e1d1ccf6224adb999eab2739d49
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-256.13.ebuild b/sys-apps/systemd-utils/systemd-utils-256.13.ebuild
new file mode 100644
index 000000000000..c8195708e031
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-256.13.ebuild
@@ -0,0 +1,614 @@
+# Copyright 2022-2025 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/"
+
+MY_P="systemd-${PV}"
+MUSL_PATCHSET="systemd-musl-patches-256.12"
+SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
+	elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+S="${WORKDIR}/${MY_P}"
+
+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=()
+
+	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=(
+		# default is developer, bug 918671
+		-Dmode=release
+		-Dsysvinit-path=
+		$(meson_native_use_feature boot bootloader)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_feature selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+		$(meson_native_use_feature ukify)
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=disabled
+		-Daudit=disabled
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbpf-framework=disabled
+		-Dbzip2=disabled
+		-Dcoredump=false
+		-Ddbus=disabled
+		-Delfutils=disabled
+		-Denvironment-d=false
+		-Dfdisk=disabled
+		-Dgcrypt=disabled
+		-Dglib=disabled
+		-Dgshadow=false
+		-Dgnutls=disabled
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=disabled
+		-Dlibcurl=disabled
+		-Dlibfido2=disabled
+		-Dlibidn=disabled
+		-Dlibidn2=disabled
+		-Dlibiptc=disabled
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=disabled
+		-Dmachined=false
+		-Dmicrohttpd=disabled
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=disabled
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=disabled
+		-Dp11kit=disabled
+		-Dpam=disabled
+		-Dpcre2=disabled
+		-Dpolkit=disabled
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=disabled
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=disabled
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=disabled
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=disabled
+		-Dxz=disabled
+		-Dzlib=disabled
+		-Dzstd=disabled
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_feature acl) )
+	else
+		emesonargs+=( -Dacl=disabled )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_feature kmod) )
+	else
+		emesonargs+=( -Dkmod=disabled )
+	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 9024a97e791d..35eba569dcf9 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -10,6 +10,7 @@ AUX systemd-user-selinux.pam 204 BLAKE2B cb67dbe29fba5e3f4282b3b55e2347b642ce405
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-256.10.tar.gz 15776970 BLAKE2B 84bdf681e3255c0f8071d8309abe1d12458fddd366b7aad0edea1bcf8074b48e3b594614f087407ab30c1dcd1cd69952f1c41b602927787fab5e5333bfe9f44b SHA512 4ae25a40a473984c4caefd63e69af12c8965184c1c55539086b04050a457bb0175f15adf87b3a86b476357ccb402abc72844033e40e2dc4f9abb6cc3bb65e22c
 DIST systemd-256.12.tar.gz 15865500 BLAKE2B e15fd622357c1af09b6b25230040721d73b11b62b466e95d4c8f905c648461b9341ef641caafeb9bfe63e3635f3f5f425fbff2f4208e07acffc87dbe6676293d SHA512 7c0f22e4eb562f028cbec8ddfcc7bbb7272c41b91b9578a61b95d895b746653d36a17b52b78e9297b9dd09049c72bfe6be073319a00629f263f2a9f9b1e5cba4
+DIST systemd-256.13.tar.gz 15867550 BLAKE2B 6cdd884d430c7f2c9c9250dd63885b233d64b87a3297f604881567042f45d51aea1ae341e4fd356997464e53b230b6fb6ec502b0e88f28d9d4296f4dfeef2a14 SHA512 e25b3e5bce42211918058320789ab154282ecb264803ddcb9e0fb3afbb53417eeea29dcd183b68dd758e39f28cab2e1ba3267766e589f5129e213e12f109017e
 DIST systemd-257.3.tar.gz 16227011 BLAKE2B 06faa84890106c370c066bfcdf1075d8f1c77d4aa2d24997e5d1ee51b7169199413a08fc52f0935c9340d9adf6933d9c952ee51d6a71f73dcbafdbf972d15d59 SHA512 ef395998df4b24537147fa3b2e3ae2d100d3345f386fc39018bca0fe8092b7874bf9a6e6058a142342b3a0caebe1312ea9519bcbb4327a9d3649f593c49b3dab
 DIST systemd-257.5.tar.gz 16232112 BLAKE2B 142baef9b09217ea117ac09923604f7520a36d4c63cf04a78d1c4fbf7b057b977f5c77418168c0308a8dc6b48ccc6324438f30c87de8642e8e9cf12b47f90475 SHA512 9e5352c20c9edac53f302a534532035185139998628ed0a85411f440df47f1dd7cce6651aec787484809bb1aa2825008d062714c37936cbfd08451fbe29a998f
 DIST systemd-stable-254.22.tar.gz 14667273 BLAKE2B d3bfbd34ef47b73e139c37dd3e961fdc17c969e38674d84976183ecad44030fce1db073da6faf522e9ab232ae65c8e70a8d9a1f15053c57269090d3a9f1756f7 SHA512 5cef3912e68060366d7a8030c13825ae872783dd55a8a3ab15aa5ff2c397b50df8fc6e08b9bd1fdc0d54f08f3f7765484a41af0646ded238512921e3d02b553d
@@ -18,6 +19,7 @@ EBUILD systemd-254.22.ebuild 15486 BLAKE2B e6c9fa0c333e49587007bea57fcc7bbf08c75
 EBUILD systemd-254.24.ebuild 15494 BLAKE2B c7610706e9ea8c1e5cf6a23dd5a9467442deb128ce3a7e3ff6b412364f8db59e802b0ad96b18a935ce4016e93664d0bd9882d66b7fdb28bc45280fa504c19b4f SHA512 a983831883f1f28f18b902890ec6e58a0331f0c2f280945d2fa83ad8d657b0fa4e35ee450a834b29c64b5905740345e89ea90bd68865a82c0fd9a8c834819939
 EBUILD systemd-256.10.ebuild 16242 BLAKE2B 447e8f928ae94743aa298365b62c738713645aba3d31b9358a67ac78955318194f9f4fc61990e355f7ff771075869836cdcf903f1ca8e2bd0357caffdf9807a5 SHA512 b938e22e4e2d41c78bfcff31ed029e8eeb4e821a53f4c64a9eee09dc237dbba24747c8da06a1ae3e62e733eb17c5e77f87206df08d5e07139a91d8612b26390f
 EBUILD systemd-256.12.ebuild 16337 BLAKE2B d786d8625eefc62b058fb5d2286a846efe088b5e9550ede5894618a45bf6c1ea13be5d8145bf102b80a7a458961132f08af7438c79ecf320419d6f60d56f9ead SHA512 811f857ace14a534f942ebae4e0480a53558d79953da9b027def23f1f3e64a248fb4f40e9e64d2ac0b4854a79be80b370996a4d0c1d5bb370ccc8163e6119c6e
+EBUILD systemd-256.13.ebuild 16337 BLAKE2B d786d8625eefc62b058fb5d2286a846efe088b5e9550ede5894618a45bf6c1ea13be5d8145bf102b80a7a458961132f08af7438c79ecf320419d6f60d56f9ead SHA512 811f857ace14a534f942ebae4e0480a53558d79953da9b027def23f1f3e64a248fb4f40e9e64d2ac0b4854a79be80b370996a4d0c1d5bb370ccc8163e6119c6e
 EBUILD systemd-257.3.ebuild 16267 BLAKE2B 823a0b3fb20df6f4b8d9fdec37a504f2e3458bb5c18500bfa36f98391da58e50b989495125692a38fd4ea933c05c04337ba085ba74f53f73c2767cf54daad20a SHA512 a422e337f80fbb701cb5c3b06353c536fb243473debd0117ce4e210c4a73db39f80c8135a863248d86655cfd5e6b5107d7a0e9b7c015f7e9988cab909cfcbc62
 EBUILD systemd-257.5.ebuild 16267 BLAKE2B 823a0b3fb20df6f4b8d9fdec37a504f2e3458bb5c18500bfa36f98391da58e50b989495125692a38fd4ea933c05c04337ba085ba74f53f73c2767cf54daad20a SHA512 a422e337f80fbb701cb5c3b06353c536fb243473debd0117ce4e210c4a73db39f80c8135a863248d86655cfd5e6b5107d7a0e9b7c015f7e9988cab909cfcbc62
 EBUILD systemd-9999.ebuild 16290 BLAKE2B 921cf1333cd3abb04fababf383dbe671f0d8334526015cda787aaed6dc1ea9adfe128e1485459612b43ea5edd684954ab383acddec6f81a2079a55dde543f752 SHA512 87be596628914cddb5884e6f96bb09a66b61c6b0e284813e054d7560de0cf22800a8906562aecbe1f8b70234b3220342360bb074e4c314ee9aaed1305511a5b6
diff --git a/sys-apps/systemd/systemd-256.13.ebuild b/sys-apps/systemd/systemd-256.13.ebuild
new file mode 100644
index 000000000000..3871b1e9eeb3
--- /dev/null
+++ b/sys-apps/systemd/systemd-256.13.ebuild
@@ -0,0 +1,573 @@
+# Copyright 2011-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib optfeature pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit boot bpf 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= )
+	bpf? ( >=dev-libs/libbpf-1.4.0: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
+	bpf? (
+		dev-util/bpftool
+		sys-devel/bpf-toolchain
+	)
+	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/*"
+
+check_cgroup_layout() {
+	# https://bugs.gentoo.org/935261
+	[[ ${MERGE_TYPE} != buildonly ]] || return
+	[[ -z ${ROOT} ]] || return
+	[[ -e /sys/fs/cgroup/unified ]] || return
+	grep -q 'SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1' /proc/cmdline && return
+
+	eerror "This system appears to be booted with the 'hybrid' cgroup layout."
+	eerror "This layout obsolete and is disabled in systemd."
+
+	if grep -qF 'systemd.unified_cgroup_hierarchy'; then
+		eerror "Remove the systemd.unified_cgroup_hierarchy option"
+		eerror "from the kernel command line and reboot."
+		die "hybrid cgroup layout detected"
+	fi
+}
+
+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
+
+	check_cgroup_layout
+
+	if use cgroup-hybrid; then
+		eerror "Disable the 'cgroup-hybrid' USE flag."
+		eerror "Rebuild any initramfs images after rebuilding systemd."
+		die "cgroup-hybrid is no longer supported"
+	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 bpf && CONFIG_CHECK+=" ~BPF ~BPF_SYSCALL ~BPF_LSM ~DEBUG_INFO_BTF"
+		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}/256-bpf-gcc.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-journald-audit-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		# default is developer, bug 918671
+		-Dmode=release
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		-Dsplit-bin=false
+		# Disable compatibility with sysvinit
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# no deps
+		-Dima=true
+		# Match /etc/shells, bug 919749
+		-Ddebug-shell="${EPREFIX}/bin/sh"
+		-Ddefault-user-shell="${EPREFIX}/bin/bash"
+		# Optional components/dependencies
+		$(meson_native_use_feature acl)
+		$(meson_native_use_feature apparmor)
+		$(meson_native_use_feature audit)
+		$(meson_native_use_feature boot bootloader)
+		$(meson_native_use_feature bpf bpf-framework)
+		-Dbpf-compiler=gcc
+		$(meson_native_use_feature cryptsetup libcryptsetup)
+		$(meson_native_use_feature curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_feature elfutils)
+		$(meson_native_use_feature fido2 libfido2)
+		$(meson_feature gcrypt)
+		$(meson_native_use_feature gnutls)
+		$(meson_native_use_feature homed)
+		$(meson_native_use_feature http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_feature importd)
+		$(meson_native_use_feature importd bzip2)
+		$(meson_native_use_feature importd zlib)
+		$(meson_native_use_bool kernel-install)
+		$(meson_native_use_feature kmod)
+		$(meson_feature lz4)
+		$(meson_feature lzma xz)
+		$(meson_use test tests)
+		$(meson_feature zstd)
+		$(meson_native_use_feature iptables libiptc)
+		$(meson_native_use_feature openssl)
+		$(meson_feature pam)
+		$(meson_native_use_feature pkcs11 p11kit)
+		$(meson_native_use_feature pcre pcre2)
+		$(meson_native_use_feature policykit polkit)
+		$(meson_native_use_feature pwquality)
+		$(meson_native_use_feature qrcode qrencode)
+		$(meson_native_use_feature seccomp)
+		$(meson_native_use_feature selinux)
+		$(meson_native_use_feature tpm tpm2)
+		$(meson_native_use_feature test dbus)
+		$(meson_native_use_feature ukify)
+		$(meson_native_use_feature 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_enabled 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)
+	)
+
+	case $(tc-arch) in
+		amd64|arm|arm64|ppc|ppc64|s390|x86)
+			# src/vmspawn/vmspawn-util.h: QEMU_MACHINE_TYPE
+			myconf+=( $(meson_native_enabled vmspawn) ) ;;
+		*)
+			myconf+=( -Dvmspawn=disabled ) ;;
+	esac
+
+	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/uutils-coreutils/Manifest b/sys-apps/uutils-coreutils/Manifest
index 4f3cd4e03193..35e0b1e4cbc0 100644
--- a/sys-apps/uutils-coreutils/Manifest
+++ b/sys-apps/uutils-coreutils/Manifest
@@ -307,4 +307,4 @@ DIST zip-2.2.2.crate 108809 BLAKE2B e6d7792b70ab397ef340d37167266b87538d2e0ad422
 DIST zopfli-0.8.1.crate 50972 BLAKE2B 27cde48858dc65ec8082d4e0d81e2758f92d3dcc7a1c1f08aa6448e99f2995a865ac3259353b26e787f108c2f88ce3c7610413ea9d3daae6f864900d74565de6 SHA512 799e25c0cc9f0bf2119a7c03225b11ed94e7c3ac83f872a27da8ae15c90206245121c38f5e2b78fece131f5bb428f01fabbfd1b1e18ea456957940042d38f38d
 EBUILD uutils-coreutils-0.0.29.ebuild 8205 BLAKE2B 4b491c760606a0d946bb91a923cfe9a4009fce1ee63a9609b849418958815a1d2fbf1797c51ef7cbd6de01838afcdd423547ef12416981452b1233d9b78db033 SHA512 e8b530accd6e12e0465ca51c04aee716aa9d6d33db58e4a40600647646a2f47ce472e7daf4ac690c3e13208a6ffad7bbfe2cf1bbe53460a3477c506ebaf069f1
 EBUILD uutils-coreutils-9999.ebuild 8205 BLAKE2B 4b491c760606a0d946bb91a923cfe9a4009fce1ee63a9609b849418958815a1d2fbf1797c51ef7cbd6de01838afcdd423547ef12416981452b1233d9b78db033 SHA512 e8b530accd6e12e0465ca51c04aee716aa9d6d33db58e4a40600647646a2f47ce472e7daf4ac690c3e13208a6ffad7bbfe2cf1bbe53460a3477c506ebaf069f1
-MISC metadata.xml 626 BLAKE2B 4a7a3c7683c6c0260951085755d6b6942213612b1bd4d58228d88e18f260b18d53eb2c3e0169b991ed60b3ef8213f59a7d2bc484c5c9940cb7f68a9862b75f96 SHA512 5d358e0e1248090fe494c26aba98a7e4d881c4cf9361bd5ae97cf88f79e89a98faa01b32c4199e39cd0104a2862dda9130323c24cf7d022b8ada774b93b86a50
+MISC metadata.xml 526 BLAKE2B 2f563a86d20df6e62fb3c7dc46cb5089f983c5c69912dc29c0f4e49e7bc731266ac8390d0672c813b7aa6986f2f62719487e5cc95a33dad4d1087cdfc726252b SHA512 200bab979d664f3c409f2a475219ec6bdbb0eb6e087f829900ee72e769730f74d5ab63366c0a7737ca3bf3f93a683cf8818843df60be209310a03cfba588ccc9
diff --git a/sys-apps/uutils-coreutils/metadata.xml b/sys-apps/uutils-coreutils/metadata.xml
index e46cfa1f20f5..854bfdb0b625 100644
--- a/sys-apps/uutils-coreutils/metadata.xml
+++ b/sys-apps/uutils-coreutils/metadata.xml
@@ -5,10 +5,6 @@
 		<email>lu_zero@gentoo.org</email>
 		<name>Luca Barbato</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
-	</maintainer>
 	<longdescription>
 		Standard GNU file utilities (chmod, cp, dd, dir, ls, ...), text utilities (sort, tr, head, wc, ...), and shell utilities (whoami, who, ...), written in Rust
 	</longdescription>
diff --git a/sys-apps/uutils-findutils/Manifest b/sys-apps/uutils-findutils/Manifest
index 2c772164899b..54e029a391bf 100644
--- a/sys-apps/uutils-findutils/Manifest
+++ b/sys-apps/uutils-findutils/Manifest
@@ -130,4 +130,4 @@ DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cac
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 EBUILD uutils-findutils-0.7.0.ebuild 4240 BLAKE2B 905ec1cce126b9fb6164986c931fedfd8f60863e960e9b5fcb4843837a94d8f2c7576767fa625cc762f6b0df0c6449ad426134f5ac8fd8e38bab0f3fa6127352 SHA512 8771e971325164df508d7007f827e76c539b31883f6834df29f31447bf7c344fc3c1c8ea0729110453b71d07af3d37fc583c71910e08a7d04e8b2e59eedce0dc
 EBUILD uutils-findutils-9999.ebuild 4240 BLAKE2B 905ec1cce126b9fb6164986c931fedfd8f60863e960e9b5fcb4843837a94d8f2c7576767fa625cc762f6b0df0c6449ad426134f5ac8fd8e38bab0f3fa6127352 SHA512 8771e971325164df508d7007f827e76c539b31883f6834df29f31447bf7c344fc3c1c8ea0729110453b71d07af3d37fc583c71910e08a7d04e8b2e59eedce0dc
-MISC metadata.xml 428 BLAKE2B a130660afee028d057d6efdb89665b9aaee83236fdd0823341182d27e3838ddc8b64dd57e47f6c1e9baca06cedea895eff01649a0b9ddbb50552d8bae64afcc4 SHA512 f505385ff6f1a8baa50643719eaa2cc7464f3a9e2a225532e417c1942fa711ae9b85ebeb5d71982f359d2b2555e7fddc897bd502db085355d8dd5c7479eda136
+MISC metadata.xml 328 BLAKE2B b4461a2f90a82b4f7f83d732844368de9dec13531eac98372e393bcfc1245c0ebf38a36c6408146acb325e907be6b753cef498a35f36bbca348bbdb75c3a0fad SHA512 ea1b49e1c9a432b432a8cf13aa01e066a712b70739a38b6d180bf036dcc01dc29824fd391b74a464351f838bb9048d4e118d2e8a12954a5bd379614e746ddffb
diff --git a/sys-apps/uutils-findutils/metadata.xml b/sys-apps/uutils-findutils/metadata.xml
index a43d82b40516..ac5ef847271e 100644
--- a/sys-apps/uutils-findutils/metadata.xml
+++ b/sys-apps/uutils-findutils/metadata.xml
@@ -5,10 +5,6 @@
 		<email>lu_zero@gentoo.org</email>
 		<name>Luca Barbato</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">uutils/findutils</remote-id>
 	</upstream>