gentoo auto-resync : 24:03:2024 - 01:01:06

10 files changed, 527 insertions, 128 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index daa398951ab3..0b691760dac7 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 7135a397cb2b..4f94c0e81a34 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -7,8 +7,12 @@ DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f015
 DIST coreutils-9.4-patches.tar.xz 6756 BLAKE2B 677454409ccb629fd0efde1e15d8f9c13f208391e63a17816011e84d4ca3fb2a42c2a60853f213ade2a53c821d76fd8924c59388d160c6e7c7fa5755e1db4c68 SHA512 2025c80b5ada92bafb479c678917862be208534becd8b347d335032c6b4cc23c7b7630f15ca7dd3b5d691567cb70f3491753e29441cc54d8700cc3d966a5e743
 DIST coreutils-9.4.tar.xz 5979200 BLAKE2B 83d41c48804c1d470c0e5eed38e692bb6875436dda3f6e2c29784ad6ef563d86e8e066a050e222621b400f78ea4630b1e127d20fc9b76f12096528c42677e35d SHA512 7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5
 DIST coreutils-9.4.tar.xz.sig 833 BLAKE2B 870f7eb28e8851f41954820c7f4f4b43a965e6650b303b79541dfdf98ca0cd52fe964d7eec72bea68066452d7ad21a01df5e4db9e5bc4c20bf26d8b416856446 SHA512 9674f783f592c4f3e5c708ff31426ac009bf132fd0005019571bf39c8a1627efb5351c6cecc7faecb1eff8fa2970318666593bffc0eda9c750159e174ef42524
+DIST coreutils-9.4_p20240323.tar.xz 5975332 BLAKE2B c319b3f639f49f2074082722096464304ba48e01f5d118a8b955a77086ec7f508c3dd80cd5732c2983f776af4cd3936e79da4f748682a3d5a67aceb0a862709a SHA512 915eb9428a98412542eab937a168ef5ccbd65246ac9e9e3dfba90210ecba53eb512a6b7c9c11de4bedd28c99a22a5ce445a94ff1cde79452f9eeb407725ce6f7
+DIST coreutils-9.4_p20240323.tar.xz.sig 833 BLAKE2B 24575deb0e58e3dceb7e719f03923539de8d0d1b2a4543bb54c886c1086d5d80bbc7a7164e58b4cc504a9749a8642f33bc4a11de5ce29503fa1ac20dec4b33f5 SHA512 16948e6f0698f17e65463a62a36bf5deea350547d1452d8e790ab051ea04b8e7467cda4d2c69e210d46b7b2fc6252e0a87fffb474636156677a2eb1aece6d67f
+DIST coreutils-9.5-patches.tar.xz 5912 BLAKE2B 873fbe1a60f8f8034b3d35796146765ce388952d649c32dc81ca0e4c2823c9f2f00b69bc5cb3af686434867459b6dc378fb9a6d59563d28b87c3ee1eceeedbb3 SHA512 4b4ad356615d046b8d67ea35b789f887a787ab01ece3234f6344518aef33cd30ca364fef5d85e11acfdb24003114c16ffdab82922fb135d5425fbcd541064a76
 EBUILD coreutils-8.32-r1.ebuild 5947 BLAKE2B 19f30ddaa57e16326db783e2396ce653c17c8def86422ac517b45ee3869266a6e8c600d926814720b1b79485f1db34e3d8dbad32dcc5ad285987c53ab2dbab27 SHA512 a552a58864edf6a768933f85b6624f82b3bd1bf94c169acf3577394523c2768d6768d5a141283abac760bdab950a1ea394c8f36cf2c0793b8b9a2a1c6dda9622
-EBUILD coreutils-9.4-r1.ebuild 7881 BLAKE2B ddd7d65f689c91d75e3406722db0c9ac5a3baab481ee82f40013848e5456e35b5b9707c5d2326cfd57fa476d7e5bafb24976a916107808384b6939c7b1682ed5 SHA512 8f0076e664fbcd08adad880fad7a7ab7a8baf2faf4bac50e18cb3b0fdb1fc9683507599ccd54e70839b736a7b56ffc011871db49f80922b11cf2d7ad6bfadfa9
-EBUILD coreutils-9.4.ebuild 7838 BLAKE2B 2745958376d99d53379e7e203451c7f295906dcc05489235b8991863741dfaf79296f04a8dcfa9d99ce7729cdee39037acfdaae2d2ed8fefb38f0c16cbbe228f SHA512 f798b7be323d8be4170c559e0d1bba7f75cb6f5da8573301c4805958d2b5b82217794bb7feef1dbaf6a1cef1fc81f98eca29786b14d6160c6324f767eb055bfc
-EBUILD coreutils-9999.ebuild 7800 BLAKE2B a0b4403e1a58f18a8dc7456eb062fae2e9bd1ee86e9eef64a919b1e581d578f83d910c57ce4fc7a4da78a49ae20eb9544b1d3c5fa8a7496ff2d9a15cddef033f SHA512 97e1d4ed72554c5e2421e58087657a324ad662296efecc8725523a71c22b9c1858af74cc35a869afc43ef01d39fae323fe4db582446049a9f9c3d24dbce8efa3
+EBUILD coreutils-9.4-r1.ebuild 8367 BLAKE2B 0f512376c2886aa83903720327f12fefc38105ff7e942072150f1e5c147387fef3ad6941ecab7d556a1e80d56c4a975b8aeef25ffe16dd8ad357dcd21958045e SHA512 aad47a53134f0ca1617b9cbffe12dfe094f3ae8277e9d9c49ce67c6f0ece7adc8227d50e6408a0b761fcb293d928db27161dff2fbad133b653f39e0284f2ea1d
+EBUILD coreutils-9.4.ebuild 8324 BLAKE2B 107c9e9c7a24ce6a5ff898a7ff8b5fca574a28d5b0aeb72a503640ebe1825c4507dbea4d05e4c197c9fadddaa5091b010a7396c1dbcf52d0e8fb85bbe74e86e8 SHA512 6b3fe684c3e4e072be3daba88ac5af4e27cf09d65912bb7521aa5f26e82cce8ef1aeaa0f36fcdc346e78b9481413273f15219384112e09a914bb71a2dee9db54
+EBUILD coreutils-9.4_p20240323.ebuild 8286 BLAKE2B 585c586076560f6c6a0213d13cf249027ad20324548ae26a69a29243bb89bec0fd32ff2fc35b1c9ecae5d65b416c18be74bf55348d2043f8c67839abd871df4e SHA512 759140693194903e261c9fa7f91b9b1d5dc2ffef43ed6a8191ba32d7d5e38e179114d8ad793bd7e5ce3a2a09f9e9277f9c26f762658eb47c0aa499b3d0abda07
+EBUILD coreutils-9999.ebuild 8286 BLAKE2B 585c586076560f6c6a0213d13cf249027ad20324548ae26a69a29243bb89bec0fd32ff2fc35b1c9ecae5d65b416c18be74bf55348d2043f8c67839abd871df4e SHA512 759140693194903e261c9fa7f91b9b1d5dc2ffef43ed6a8191ba32d7d5e38e179114d8ad793bd7e5ce3a2a09f9e9277f9c26f762658eb47c0aa499b3d0abda07
 MISC metadata.xml 1093 BLAKE2B 68a653fe54fc668c7f2c7c01904cfca5a071192de4370dcbba427e673f8e9ec33b5104a868a5493117ef24e277446181383140c621b105689797aec4e077b86e SHA512 bf8f2653a1a81edb6e4090b127c5660e0c5ab41a33c985dea1b5cb05c6656b04f42084ce4e561f4550c3e54630893314d3084011c673e7d5aded022be1c065d1
diff --git a/sys-apps/coreutils/coreutils-9.4-r1.ebuild b/sys-apps/coreutils/coreutils-9.4-r1.ebuild
index 405c65ddf912..9ed86c076690 100644
--- a/sys-apps/coreutils/coreutils-9.4-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.4-r1.ebuild
@@ -82,7 +82,13 @@ RDEPEND+="
 	!net-mail/base64
 	!sys-apps/mktemp
 	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
+	!<net-fs/netatalk-2.0.3-r4
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs (bug #898370)
+	unreachable MIN alignof static_assert
+)
 
 pkg_setup() {
 	if use test ; then
@@ -187,15 +193,6 @@ src_configure() {
 }
 
 src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
 	# Non-root tests will fail if the full path isn't
 	# accessible to non-root users
 	chmod -R go-w "${WORKDIR}" || die
@@ -220,10 +217,44 @@ src_test() {
 	mkwrap mount umount
 
 	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export COREUTILS_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
-		emake -k check VERBOSE=yes
+
+	#local -x RUN_EXPENSIVE_TESTS="yes"
+	#local -x COREUTILS_GROUPS="portage wheel"
+	local -x PATH="${T}/mount-wrappers:${PATH}"
+	local -x gl_public_submodule_commit=
+
+	local xfail_tests=(
+		# bug #629660
+		#tests/dd/no-allocate.sh
+
+		# bug #675802
+		tests/env/env-S
+		tests/env/env-S.pl
+
+		# bug #413621 and bug #548250
+		tests/du/long-from-unreadable.sh
+		tests/ls/removed-directory
+		tests/ls/removed-directory.sh
+		tests/ls/stat-free-symlinks
+		tests/ls/stat-free-symlinks.sh
+		tests/rm/deep-2
+		tests/rm/deep-2.sh
+
+		# We have a patch which fixes this (bug #259876)
+		#tests/touch/not-owner
+		#tests/touch/not-owner.sh
+
+		# bug #910640
+		tests/tty/tty-eof.pl
+	)
+
+	# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
+	# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
+	# to downgrade them to FAIL.
+	emake -k check \
+		VERBOSE=yes \
+		DISABLE_HARD_ERRORS=yes \
+		XFAIL_TESTS="${xfail_tests[*]}"
 }
 
 src_install() {
diff --git a/sys-apps/coreutils/coreutils-9.4.ebuild b/sys-apps/coreutils/coreutils-9.4.ebuild
index 40a2c20ada63..4c826357e157 100644
--- a/sys-apps/coreutils/coreutils-9.4.ebuild
+++ b/sys-apps/coreutils/coreutils-9.4.ebuild
@@ -82,7 +82,13 @@ RDEPEND+="
 	!net-mail/base64
 	!sys-apps/mktemp
 	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
+	!<net-fs/netatalk-2.0.3-r4
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs (bug #898370)
+	unreachable MIN alignof static_assert
+)
 
 pkg_setup() {
 	if use test ; then
@@ -186,15 +192,6 @@ src_configure() {
 }
 
 src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
 	# Non-root tests will fail if the full path isn't
 	# accessible to non-root users
 	chmod -R go-w "${WORKDIR}" || die
@@ -219,10 +216,44 @@ src_test() {
 	mkwrap mount umount
 
 	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export COREUTILS_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
-		emake -k check VERBOSE=yes
+
+	#local -x RUN_EXPENSIVE_TESTS="yes"
+	#local -x COREUTILS_GROUPS="portage wheel"
+	local -x PATH="${T}/mount-wrappers:${PATH}"
+	local -x gl_public_submodule_commit=
+
+	local xfail_tests=(
+		# bug #629660
+		#tests/dd/no-allocate.sh
+
+		# bug #675802
+		tests/env/env-S
+		tests/env/env-S.pl
+
+		# bug #413621 and bug #548250
+		tests/du/long-from-unreadable.sh
+		tests/ls/removed-directory
+		tests/ls/removed-directory.sh
+		tests/ls/stat-free-symlinks
+		tests/ls/stat-free-symlinks.sh
+		tests/rm/deep-2
+		tests/rm/deep-2.sh
+
+		# We have a patch which fixes this (bug #259876)
+		#tests/touch/not-owner
+		#tests/touch/not-owner.sh
+
+		# bug #910640
+		tests/tty/tty-eof.pl
+	)
+
+	# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
+	# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
+	# to downgrade them to FAIL.
+	emake -k check \
+		VERBOSE=yes \
+		DISABLE_HARD_ERRORS=yes \
+		XFAIL_TESTS="${xfail_tests[*]}"
 }
 
 src_install() {
diff --git a/sys-apps/coreutils/coreutils-9.4_p20240323.ebuild b/sys-apps/coreutils/coreutils-9.4_p20240323.ebuild
new file mode 100644
index 000000000000..95bb5424c9b2
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-9.4_p20240323.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
+# The upstream coreutils maintainers also maintain the package in Fedora and may
+# backport fixes which we want to pick up.
+#
+# Also recommend subscribing to the coreutils and bug-coreutils MLs.
+
+PYTHON_COMPAT=( python3_{10..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
+inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
+
+MY_PATCH="${PN}-9.5-patches"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/coreutils.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Note: could put this in devspace, but if it's gone, we don't want
+	# it in tree anyway. It's just for testing.
+	MY_SNAPSHOT="$(ver_cut 1-2).170-7b206"
+	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
+	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
+else
+	SRC_URI="
+		mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+	"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="
+	acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	openssl? ( dev-libs/openssl:=[static-libs] )
+	xattr? ( sys-apps/attr[static-libs] )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	test? (
+		dev-debug/strace
+		dev-lang/perl
+		dev-perl/Expect
+		${PYTHON_DEPS}
+	)
+	verify-sig? ( sec-keys/openpgp-keys-coreutils )
+"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs (bug #898370)
+	unreachable MIN alignof static_assert
+)
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+
+		cd "${S}" || die
+		./bootstrap || die
+
+		sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
+	elif use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
+	fi
+
+	default
+}
+
+src_prepare() {
+	# TODO: past 2025, we may need to add our own hack for bug #907474.
+	local PATCHES=(
+		# Upstream patches
+	)
+
+	if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
+		PATCHES+=( "${WORKDIR}"/${MY_PATCH} )
+	fi
+
+	default
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	#
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1} || die
+
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
+	fi
+}
+
+src_configure() {
+	# TODO: in future (>9.4?), we may want to wire up USE=systemd:
+	# still experimental at the moment, but:
+	# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		# kill/uptime - procps
+		# groups/su   - shadow
+		# hostname    - net-tools
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		$(usev !caps --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp libgmp)
+		$(use_with openssl)
+	)
+
+	if use gmp ; then
+		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
+	fi
+
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		# bug #311569
+		export fu_cv_sys_stat_statfs2_bsize=yes
+		# bug #416629
+		export gl_cv_func_realpath_works=yes
+	fi
+
+	# bug #409919
+	export gl_cv_func_mknod_works=yes
+
+	if use static ; then
+		append-ldflags -static
+		# bug #321821
+		sed -i '/elf_sys=yes/s:yes:no:' configure || die
+	fi
+
+	if ! use selinux ; then
+		# bug #301782
+		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}" || die
+	chmod a+rx "${WORKDIR}" || die
+
+	# coreutils tests like to do `mount` and such with temp dirs,
+	# so make sure:
+	# - /etc/mtab is writable (bug #265725)
+	# - /dev/loop* can be mounted (bug #269758)
+	mkdir -p "${T}"/mount-wrappers || die
+	mkwrap() {
+		local w ww
+		for w in "${@}" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
+			EOF
+			chmod a+rx "${ww}" || die
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+
+	#local -x RUN_EXPENSIVE_TESTS="yes"
+	#local -x COREUTILS_GROUPS="portage wheel"
+	local -x PATH="${T}/mount-wrappers:${PATH}"
+	local -x gl_public_submodule_commit=
+
+	local xfail_tests=(
+		# bug #629660
+		#tests/dd/no-allocate.sh
+
+		# bug #675802
+		tests/env/env-S
+		tests/env/env-S.pl
+
+		# bug #413621 and bug #548250
+		tests/du/long-from-unreadable.sh
+		tests/ls/removed-directory
+		tests/ls/removed-directory.sh
+		tests/ls/stat-free-symlinks
+		tests/ls/stat-free-symlinks.sh
+		tests/rm/deep-2
+		tests/rm/deep-2.sh
+
+		# We have a patch which fixes this (bug #259876)
+		#tests/touch/not-owner
+		#tests/touch/not-owner.sh
+
+		# bug #910640
+		tests/tty/tty-eof.pl
+	)
+
+	# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
+	# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
+	# to downgrade them to FAIL.
+	emake -k check \
+		VERBOSE=yes \
+		DISABLE_HARD_ERRORS=yes \
+		XFAIL_TESTS="${xfail_tests[*]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if use split-usr ; then
+		cd "${ED}"/usr/bin || die
+		dodir /bin
+
+		# Move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
+			mv hostname ../../bin/ || die
+		fi
+
+		if use kill ; then
+			mv kill ../../bin/ || die
+		fi
+
+		# Move critical binaries into /bin (common scripts)
+		# (Why are these required for booting?)
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "Could not move common bins!"
+
+		# Create a symlink for uname in /usr/bin/ since autotools require it.
+		# (Other than uname, we need to figure out why we are
+		# creating symlinks for these in /usr/bin instead of leaving
+		# the files there in the first place...)
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+}
diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild
index 14e289049915..95bb5424c9b2 100644
--- a/sys-apps/coreutils/coreutils-9999.ebuild
+++ b/sys-apps/coreutils/coreutils-9999.ebuild
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python3_{10..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
 inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
 
-MY_PATCH="${PN}-9.4-patches"
+MY_PATCH="${PN}-9.5-patches"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
 HOMEPAGE="https://www.gnu.org/software/coreutils/"
 
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 elif [[ ${PV} == *_p* ]] ; then
 	# Note: could put this in devspace, but if it's gone, we don't want
 	# it in tree anyway. It's just for testing.
-	MY_SNAPSHOT="$(ver_cut 1-2).156-b3afb"
+	MY_SNAPSHOT="$(ver_cut 1-2).170-7b206"
 	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
 	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
@@ -82,7 +82,13 @@ RDEPEND+="
 	!net-mail/base64
 	!sys-apps/mktemp
 	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
+	!<net-fs/netatalk-2.0.3-r4
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# gnulib FPs (bug #898370)
+	unreachable MIN alignof static_assert
+)
 
 pkg_setup() {
 	if use test ; then
@@ -185,15 +191,6 @@ src_configure() {
 }
 
 src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
 	# Non-root tests will fail if the full path isn't
 	# accessible to non-root users
 	chmod -R go-w "${WORKDIR}" || die
@@ -218,10 +215,44 @@ src_test() {
 	mkwrap mount umount
 
 	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export COREUTILS_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
-		emake -k check VERBOSE=yes
+
+	#local -x RUN_EXPENSIVE_TESTS="yes"
+	#local -x COREUTILS_GROUPS="portage wheel"
+	local -x PATH="${T}/mount-wrappers:${PATH}"
+	local -x gl_public_submodule_commit=
+
+	local xfail_tests=(
+		# bug #629660
+		#tests/dd/no-allocate.sh
+
+		# bug #675802
+		tests/env/env-S
+		tests/env/env-S.pl
+
+		# bug #413621 and bug #548250
+		tests/du/long-from-unreadable.sh
+		tests/ls/removed-directory
+		tests/ls/removed-directory.sh
+		tests/ls/stat-free-symlinks
+		tests/ls/stat-free-symlinks.sh
+		tests/rm/deep-2
+		tests/rm/deep-2.sh
+
+		# We have a patch which fixes this (bug #259876)
+		#tests/touch/not-owner
+		#tests/touch/not-owner.sh
+
+		# bug #910640
+		tests/tty/tty-eof.pl
+	)
+
+	# We set DISABLE_HARD_ERRORS because some of the tests hard error-out
+	# because of sandbox. They're skipped above but DISABLE_HARD_ERRORS is needed
+	# to downgrade them to FAIL.
+	emake -k check \
+		VERBOSE=yes \
+		DISABLE_HARD_ERRORS=yes \
+		XFAIL_TESTS="${xfail_tests[*]}"
 }
 
 src_install() {
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index a7414ca9f748..c433ff33febf 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -5,10 +5,11 @@ AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
 AUX systemd-utils-254.3-add-link-kernel-install-shared-option.patch 2350 BLAKE2B b9ad80ddadea96516198b8bee351443ec155e5bdf916b6ee86ec5b6712565ddafc04fa632dd0c56bd9e18345d444a7e17d63446121e84402a85c9a828c20e670 SHA512 390fc403630a6abd5724d8939162de4f869e9b7681824a1280a769742bbcccac4126e1cbcc076b48aaf1aa07097b5eae1f5375da1702a8cc452f92996fd0d4f8
 DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
+DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c814600af93a690c7cfefc551cd23e6b8bdc2a48267910f4e5ef119b1b5d8e4e0cb2e6843e1b7147464809febad3085d2c82a728c3 SHA512 86bbb735012ce20bbc0af34ea062e83d6d3adf7883f5710ab00db7188fa6779e8dc361cdac427540042c4cf2f157242e6409ed5fc213c01d06cc13380e0cc95f
 DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
 DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
-DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ecb912ff23d9cd6f8d30fd0545e895936baa635b1ff63c02a83761682b72f44244aac8338bf6506885c9b07cd0c5247b6693 SHA512 a0300693a044cfe4c76deb0e3e48a927125eb97c3952c07ba68936f1e093c93506d8044b249b534b8e778ade6143b43194f8d6b721a8cd520bc7bb4cb3d3e5c1
-EBUILD systemd-utils-254.10.ebuild 13406 BLAKE2B 449e1933a2ab091466acbea019572d098881f55333200cbfcde87e58a7fed83fd4775f10eb2a60033f3fa1c654f6b7ffde11ab9545877a556aef7165a4a2e5f0 SHA512 ecb864a2f00ba37d696a53be92e04a7d57862ec519f9bb0b756e5493e3cc2da92265889cef95f215eb8945942214a937758e62979e3181954db1f1a8feb310cb
-EBUILD systemd-utils-254.8.ebuild 13438 BLAKE2B 62053032c87e27db1ce64ab57c21d59305a681dd79fbeac3c88aef4b29c5dab0f98370a94d2e000ae3a742c9211291e6b6e469b95e3f3fc052942099ecf38921 SHA512 81b918ca31103c1953d92b3c6b9d8bac19c56ad4be59173a4a447e78e2ac7eb1c8789198fc6c33156d024370e94f5c39c8a91d01f17fcf4d28162bdaa7d1270e
-EBUILD systemd-utils-254.9-r1.ebuild 13406 BLAKE2B 449e1933a2ab091466acbea019572d098881f55333200cbfcde87e58a7fed83fd4775f10eb2a60033f3fa1c654f6b7ffde11ab9545877a556aef7165a4a2e5f0 SHA512 ecb864a2f00ba37d696a53be92e04a7d57862ec519f9bb0b756e5493e3cc2da92265889cef95f215eb8945942214a937758e62979e3181954db1f1a8feb310cb
+DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
+EBUILD systemd-utils-254.10.ebuild 13334 BLAKE2B f3c6e304f8d6f50f0a16ab7538fe344a29fcb5de67566d8089dc94a781cd5616b645998fd521cde4f7396d473a8a73483b973406256361bb20e0405d2598e11b SHA512 f4e50d735d3eebe3ef378f6bb9c92c39c3cb71ec6b7602d0d7703aa728d5aa8995540bc6c4d8714560f9b0956c4e34b915e2cfd88f3058e88b60ae0395eed6db
+EBUILD systemd-utils-254.8.ebuild 13366 BLAKE2B 6548bb5722bf0fffbf4381da4c6b0b127ce9f958f3907a9a71f6e25cbb5a19e73d94da9a24fd0d143eed62146ff5d32e266800c4433c0e8420e84d0242adb746 SHA512 436aa75a70d3c2bd182e5cfedfc08e79c3025aa2877943bd8ccaf81f9d9c4f4b261e68de552c7c847dacfde1871c0100a3a9ed5945a1c9c33221db20286d4994
+EBUILD systemd-utils-255.4.ebuild 12780 BLAKE2B 5acd472775a70d29d7831ae2ce4c96f1b838bf18a22c99d6519a55bf06b3e470a2b7bb1005c483982f4e7058a0331261bcb6ad090563c0d9c7d04d2e20bbe0c9 SHA512 1e9208cbb6189b5f77dc83dbbd85d56d7fe2abaa4b50ac539b1fdb9fbe6d8426413f317a9e2cff810b02895a602d75eecd92b7811345a5a9e786cd61d9dbfa21
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
index e0ac974de10f..93436b880f05 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
@@ -446,8 +446,6 @@ multilib_src_install() {
 		if use kernel-install; then
 			dobin kernel-install
 			doman man/kernel-install.8
-			# copy the default set of plugins
-			cp "${S}/src/kernel-install/"*.install src/kernel-install || die
 			exeinto usr/lib/kernel/install.d
 			doexe src/kernel-install/*.install
 		fi
@@ -503,12 +501,14 @@ multilib_src_install_all() {
 	einstalldocs
 	if use boot; then
 		into /usr
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
 		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
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index af0e5dfe3c6a..b73e1d640a89 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -446,8 +446,6 @@ multilib_src_install() {
 		if use kernel-install; then
 			dobin kernel-install
 			doman man/kernel-install.8
-			# copy the default set of plugins
-			cp "${S}/src/kernel-install/"*.install src/kernel-install || die
 			exeinto usr/lib/kernel/install.d
 			doexe src/kernel-install/*.install
 		fi
@@ -504,12 +502,14 @@ multilib_src_install_all() {
 	einstalldocs
 	if use boot; then
 		into /usr
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
 		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
diff --git a/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index e0ac974de10f..a92779a24a0c 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -6,8 +6,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
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev
 
 DESCRIPTION="Utilities split out from systemd for OpenRC users"
 HOMEPAGE="https://systemd.io/"
@@ -22,12 +22,12 @@ else
 	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"
+MUSL_PATCHSET="systemd-musl-patches-255.4"
 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )
@@ -101,6 +101,7 @@ BDEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	dev-util/gperf
+	dev-util/patchelf
 	>=sys-apps/coreutils-8.16
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -130,7 +131,6 @@ pkg_setup() {
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
 	)
 
 	if use elibc_musl; then
@@ -139,11 +139,6 @@ src_prepare() {
 		)
 	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() {
@@ -153,10 +148,6 @@ 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)
@@ -167,14 +158,6 @@ multilib_src_configure() {
 		$(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
@@ -298,7 +281,7 @@ multilib_src_compile() {
 		fi
 		if use sysusers; then
 			targets+=(
-				systemd-sysusers.standalone
+				systemd-sysusers
 				man/sysusers.d.5
 				man/systemd-sysusers.8
 			)
@@ -310,7 +293,7 @@ multilib_src_compile() {
 		fi
 		if use tmpfiles; then
 			targets+=(
-				systemd-tmpfiles.standalone
+				systemd-tmpfiles
 				man/tmpfiles.d.5
 				man/systemd-tmpfiles.8
 				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
@@ -323,13 +306,13 @@ multilib_src_compile() {
 			targets+=(
 				udevadm
 				systemd-hwdb
-				src/udev/ata_id
-				src/udev/cdrom_id
-				src/udev/fido_id
-				src/udev/mtd_probe
-				src/udev/scsi_id
+				ata_id
+				cdrom_id
+				fido_id
+				mtd_probe
+				scsi_id
+				v4l_id
 				src/udev/udev.pc
-				src/udev/v4l_id
 				man/udev.conf.5
 				man/systemd.link.5
 				man/hwdb.7
@@ -396,12 +379,12 @@ multilib_src_test() {
 	if multilib_is_native_abi; then
 		if use sysusers; then
 			tests+=(
-				test-sysusers.standalone
+				test-sysusers
 			)
 		fi
 		if use tmpfiles; then
 			tests+=(
-				test-systemd-tmpfiles.standalone
+				test-systemd-tmpfiles
 				test-tmpfile-util
 			)
 		fi
@@ -430,52 +413,62 @@ multilib_src_test() {
 }
 
 src_install() {
-	local rootprefix="$(usex split-usr '' /usr)"
 	meson-multilib_src_install
 }
 
+set_rpath() {
+	patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
 multilib_src_install() {
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
 	if multilib_is_native_abi; then
+		exeinto "/usr/$(get_libdir)/systemd"
+		doexe src/shared/libsystemd-shared-${PV%%.*}.so
 		if use boot; then
-			into /usr
+			set_rpath bootctl
 			dobin bootctl
 			doman man/bootctl.1
-			insinto usr/lib/systemd/boot/efi
+			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
+			set_rpath kernel-install
 			dobin kernel-install
 			doman man/kernel-install.8
-			# copy the default set of plugins
-			cp "${S}/src/kernel-install/"*.install src/kernel-install || die
-			exeinto usr/lib/kernel/install.d
+			exeinto /usr/lib/kernel/install.d
 			doexe src/kernel-install/*.install
 		fi
 		if use sysusers; then
-			into "${rootprefix:-/}"
-			newbin systemd-sysusers{.standalone,}
+			set_rpath systemd-sysusers
+			dobin systemd-sysusers
 			doman man/{systemd-sysusers.8,sysusers.d.5}
 		fi
 		if use tmpfiles; then
-			into "${rootprefix:-/}"
-			newbin systemd-tmpfiles{.standalone,}
+			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
-			into "${rootprefix:-/}"
+			set_rpath udevadm systemd-hwdb
 			dobin udevadm systemd-hwdb
-			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+			dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
 
-			exeinto "${rootprefix}"/lib/udev
-			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+			exeinto /usr/lib/udev
+			set_rpath {ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+			doexe {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
+			insinto /usr/lib/udev/rules.d
 			doins rules.d/*.rules
 
-			insinto "${rootprefix}"/lib/udev/hwdb.d
+			insinto /usr/lib/udev/hwdb.d
 			doins hwdb.d/*.hwdb
 
 			insinto /usr/share/pkgconfig
@@ -487,28 +480,24 @@ multilib_src_install() {
 			doman man/udev_*.3
 		fi
 		if use ukify; then
-			exeinto "${rootprefix}"/lib/systemd/
+			exeinto /usr/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
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
 		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
@@ -527,17 +516,17 @@ multilib_src_install_all() {
 		doins src/udev/udev.conf
 		keepdir /etc/udev/{hwdb.d,rules.d}
 
-		insinto "${rootprefix}"/lib/systemd/network
+		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 "${rootprefix}"/lib/udev/rules.d
+		insinto /usr/lib/udev/rules.d
 		doins rules.d/*.rules
 		doins "${FILESDIR}"/40-gentoo.rules
 
-		insinto "${rootprefix}"/lib/udev/hwdb.d
+		insinto /usr/lib/udev/hwdb.d
 		doins hwdb.d/*.hwdb
 
 		dobashcomp shell-completion/bash/udevadm
@@ -548,6 +537,11 @@ multilib_src_install_all() {
 
 	use ukify && python_fix_shebang "${ED}"
 	use boot && secureboot_auto_sign
+
+	if use split-usr; then
+		dosym ../usr/lib/systemd /lib/systemd
+		dosym ../usr/lib/udev /lib/udev
+	fi
 }
 
 add_service() {
@@ -560,6 +554,20 @@ add_service() {
 	eend $?
 }
 
+pkg_preinst() {
+	# Migrate /lib/{systemd,udev} to /usr/lib
+	# Symlinks will be installed in the merge phase
+	if use split-usr; then
+		local d
+		for d in systemd udev; do
+			if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+				cp -rpPT "${EROOT}"/{,usr/}lib/${d} || die
+				rm -r "${EROOT}"/lib/${d} || die
+			fi
+		done
+	fi
+}
+
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		add_service systemd-tmpfiles-setup-dev sysinit
@@ -571,13 +579,4 @@ pkg_postinst() {
 		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
 }