gentoo auto-resync : 16:10:2022 - 01:51:50

16 files changed, 301 insertions, 91 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4eeaeed52e06..d600b7d9648f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 93e5554bf32b..86f56998696e 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,7 +1,6 @@
 AUX 80-dbus 341 BLAKE2B 20849eb7c526475d3ff96766ac7183608aa51e5c069f07cf282a2b4d884b2a8580aa88cff182d54ef75aaa747848f3dbcc0bd0bd5da124e4a259851878c73b00 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89
 AUX 80-dbus-r1 346 BLAKE2B 96688534aa424e7683603f2ea9afb7a762fadcc62f7af13a6be315e3467c0ea29e628547242c8e1c76c4afbf14134eeaae021ce22e7d287c4add7b7acb2306dc SHA512 a7b1ede42fc1a544568b9d663ca4068fbf9a021c728d03f81b28c7ab66df958dc5f679996d37c1cc24225dd81df445b969d83ad34c4eb6cfadfac6e6a5735084
 AUX dbus-1.12.22-check-fd.patch 1055 BLAKE2B a4889677a778fe0698128b2399273adb5373a11927a5610e6a9757237226fa866ce33bb603a89c44b8c2d3e2fccd4131637821ba1bb14782276223d5fa5db337 SHA512 667e76237868c177b9299eb0259dee2a5f820fde15fed0a21823b435e34ad734ec9e850f1a1b5408a6b099a78f77564b2396c38b82d931f3b0b5b93c0e5b8c4e
-AUX dbus-1.14.0-clang-15-configure.patch 1012 BLAKE2B ce1b640fbd2ba73ab67e776b301cfd32b5a0894401f4a13271a1bd769a309bc13c377efac33d3e63f7d737dc2870bed476954728d8332b0e80cc42e12bc2624f SHA512 e640f4f34e8791ac5c017e9787dae99c10b6d2d1414e92dd1f56ce9a17898bc6b28db7a1b66d45365d9ed3774307359c1f2b542e24938c9c0cc75bf8788faafd
 AUX dbus-1.14.0-oom_score_adj.patch 3882 BLAKE2B 9b5c55d8660c7de77976026b39b76dddbc88ddc3c4810bc6114faf038401faaf162f50f8014d26182a5d5a8b6a6ba44e517a864919152ae96e7b352ab8255df4 SHA512 353beed17bf788396828c1817703bed09f8e1fe48772dce6eb1f3c601859c593c23044e4e61ec503596790a56c64e0b4bdcd2be10e337ef9ad1ec9de0dbe027c
 AUX dbus-1.14.0-x-autoconf-fixes.patch 5171 BLAKE2B 6b7453397e467da695b3efd70e53f6a50dad44c44130f973037a4cb4139d62c7adab758a495ddebb97a35d068333417051adb5eb17bae86df31c998137eb6052 SHA512 e74b09c7da445c02fe84148b43ca61b21a95b67edbde4dc9f1916a9a628182097630336010f15f366063dc1432da7b1ae52e73b04185493b48ce28bf79873e54
 AUX dbus-1.15.0-daemon-optional.patch 2442 BLAKE2B 9fb08fc24f8a6ee1feba274b60c339fbb564a09bd16d084d36d6eb2d1518e808df9061f05c6f6db283cf4355761e74ba535ef899f56cd0ea5ddc283b86dbd657 SHA512 95449d8686586f22de4f317bc4057ee75afc047b1e4ec9fc4c930dbfc78b234efa665861977ea8ac82ddd1b69374a3a05015fb351d050cc286f4bac1d47129b7
diff --git a/sys-apps/dbus/files/dbus-1.14.0-clang-15-configure.patch b/sys-apps/dbus/files/dbus-1.14.0-clang-15-configure.patch
deleted file mode 100644
index 821279c50ee9..000000000000
--- a/sys-apps/dbus/files/dbus-1.14.0-clang-15-configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/339
-
-From 88c96ff6a351758cb7c69a25e3a8464b5164a19c Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 12 Sep 2022 18:37:35 +0100
-Subject: [PATCH] configure.ac: fix configure tests broken with Clang 15 
- (implicit function declarations)
-
-Clang 15 makes implicit function declarations fatal by default which
-leads to some configure tests silently failing/returning
-the wrong result.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -613,7 +613,8 @@ AS_IF([test -n "$dbus_va_copy_func"],
- AC_CACHE_CHECK([whether $CC knows __sync_sub_and_fetch()],
-   dbus_cv_sync_sub_and_fetch,
-   [AC_LINK_IFELSE([
--     AC_LANG_PROGRAM([[]], [[int a = 4; int b = __sync_sub_and_fetch(&a, 4); exit(b); ]])],
-+     AC_LANG_PROGRAM([[]], [[#include <stdlib.h>
-+     int a = 4; int b = __sync_sub_and_fetch(&a, 4); exit(b); ]])],
-      [dbus_cv_sync_sub_and_fetch=yes],
-      [dbus_cv_sync_sub_and_fetch=no])
-   ])
-GitLab
diff --git a/sys-apps/dchroot/Manifest b/sys-apps/dchroot/Manifest
index f85f75ee82fd..1e83344d6eb5 100644
--- a/sys-apps/dchroot/Manifest
+++ b/sys-apps/dchroot/Manifest
@@ -1,4 +1,4 @@
-AUX dchroot-0.12.1-no-werror.patch 399 BLAKE2B eca3d10bbb230632a7c52a479e2a83e54c1181106ef62828b56028098d17e70b593046232448aa37725e43d74360e3b8eba48193d9c37d0ffcfc337c91f1621a SHA512 9cac8e139674f90cf676b46c9d51e3d2e0b291fc54a0b75931f356dce7f9501adf4314d9606ce9693773fb98407632e096b26c3c9ed94011fc22fc43d5e2514e
+AUX dchroot-0.12.1-make.patch 348 BLAKE2B 5fac3dea1a882b6e8764b409a808523f8eaccb34736fc89dc7750762f9f54b2c4d1883891d688b8800e5150d86ac12a2018484130b402cafad93752648142dc9 SHA512 5479d9c5b8250121129cb168b7d6682f0d025bfe1c1ce80dbd88553038d3761ca31254ec711c84358065d5c269b0b6cdd0afd6fe4b8dac54380e64e5bec4b52d
 DIST dchroot_0.12.1.tar.gz 20287 BLAKE2B 9353817ba93ad65dd76b21d4db5e2546480850cea51efeec1918d538c25944ee40e459af2c6c4d24c5bc80c8f8611219088962b24c32ff236f9259764ab99384 SHA512 4c0b9e30c68f7ff953a259b4d21f0fab58b6a15dd8ebf0666267879114c0fce37a9fc38d71e5047003676c1ec4211feb0d2c51aa44def81d0d5a40815fd1c600
-EBUILD dchroot-0.12.1.ebuild 736 BLAKE2B 2ab718c441a810ac97bc4aaeee9532fa6ce4db9e1fe2c8d4c202a4b818b9565eaea089c7eba5a3f5edd54a8b044cfaf7f4addb69e122b92faeb997b6318c55e8 SHA512 3d05031869171eb29bfc474834d5f7270215237d107bab1cb6a47ed0230091acd4063212030b6c19e5b478eaf11afabb8c82388c0abc108a87b3f5e38e85db5f
+EBUILD dchroot-0.12.1.ebuild 498 BLAKE2B edc902638df0366871c9bb0574488aacf086ffa8499c53eacc285d945ceccd22cbc3417941a99bc863ec6f70c084a78c4fd8eab716b80a9f8ac71a08f3e35a60 SHA512 e39ce00fc55db0f847eb98d7220d6fcfb39e9b1996a8270ddcf608799874b9332a6c1d677f97708d8628cbe403a371f4e4f4f10ad545d4cd69d8cbb69946ed9b
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-apps/dchroot/dchroot-0.12.1.ebuild b/sys-apps/dchroot/dchroot-0.12.1.ebuild
index 7f02674ae0ae..fef8cb146e1d 100644
--- a/sys-apps/dchroot/dchroot-0.12.1.ebuild
+++ b/sys-apps/dchroot/dchroot-0.12.1.ebuild
@@ -1,36 +1,27 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools
 
 DESCRIPTION="Utility for managing chroots for non-root users"
-HOMEPAGE="https://packages.debian.org/unstable/admin/dchroot"
-SRC_URI="mirror://debian/pool/main/d/dchroot/dchroot_${PV}.tar.gz"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P/-/_}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="sys-apps/help2man"
 RDEPEND="!dev-util/schroot[dchroot]"
+BDEPEND="sys-apps/help2man"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.1-no-werror.patch
+	"${FILESDIR}"/${P}-make.patch
 )
 
 src_prepare() {
-	sed -i \
-		-e '/^all:/s:$: docs:' \
-		-e '/^CFLAGS/s:-O2:@CFLAGS@:' \
-		-e '/@CFLAGS@/ s:@CFLAGS@:@CFLAGS@ @LDFLAGS@:' \
-		Makefile.in || die "sed failed"
-
 	default
-}
 
-src_compile() {
-	emake CC="$(tc-getCC)"
+	eautoreconf #874318
 }
diff --git a/sys-apps/dchroot/files/dchroot-0.12.1-make.patch b/sys-apps/dchroot/files/dchroot-0.12.1-make.patch
new file mode 100644
index 000000000000..1c6be7a65c91
--- /dev/null
+++ b/sys-apps/dchroot/files/dchroot-0.12.1-make.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/722920
+https://bugs.gentoo.org/824542
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4,8 +4,9 @@
+ 
+ INSTALL=install
+-CFLAGS=-Wl,-z,now -O2 -Wall -Wstrict-prototypes -Werror -g \
++CC := @CC@
++CFLAGS := @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ \
+ 	-DDCHROOT_VERSION="\"@DCHROOT_VERSION@\""
+ 
+-all: dchroot
++all: dchroot docs
+ 
+ docs: dchroot.1
diff --git a/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch b/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch
deleted file mode 100644
index 4cd270190456..000000000000
--- a/sys-apps/dchroot/files/dchroot-0.12.1-no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/824542
-https://bugs.gentoo.org/722920
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -3,7 +3,7 @@ mandir = ${prefix}/share/man
- sysconfdir = $(DESTDIR)/etc
- 
- INSTALL=install
--CFLAGS=-Wl,-z,now @CFLAGS@ @LDFLAGS@ -Wall -Wstrict-prototypes -Werror -g \
-+CFLAGS=-Wl,-z,now @CFLAGS@ @LDFLAGS@ -Wall -Wstrict-prototypes \
- 	-DDCHROOT_VERSION="\"@DCHROOT_VERSION@\""
- 
- all: dchroot docs
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index d5e1bcf09b0d..f37e5312764e 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,5 +1,5 @@
 DIST flatpak-1.12.3.tar.xz 1555340 BLAKE2B 512b3f6abfb06d242aedad2c27c9870750254a9d0a3769999739f8885bbf1740b649e2a41f2c079532b049fcce8b58529572ea35e930437ed6b62194a73bcbb6 SHA512 2f39665457b4c3b99e32ebc88cf5b70202dba6118887617d3d7faa20f688f3f3fc14e343b70c0d11eb15ee743a68d07078e6cda14fd91aa10ca375797cfc95bc
 DIST flatpak-1.14.0.tar.xz 1636864 BLAKE2B f7f211480577eb5bd422c49790ebfb84da5e5a03cc6dee3815af786bfcd347bd7b01e853c027a42a1510fba68d667c4a25f6b9f998753466baae61a765c73864 SHA512 88f011534a8da6c2421d7d24043756bfe6c46957b6d09ba96b269002a5f0d0372b51f4a8643af2020ef4ed8c5b5f102994ddab54a7052cfba15f8e3b160e8a83
-EBUILD flatpak-1.12.3.ebuild 2355 BLAKE2B f9ebfea4165e01d8dec3a1a1b951e54faa716cf60d3fabc620f81f768117e3e71afd50b3d3da92f4fef2bce0445b4a378642d5c6ffad07430286f6a609ffba48 SHA512 50a22836eaa9db267ca87d4cb9c3df095013623182abbae65dc917def226f19419960e2d78317f053dfb3b3742d2773cbb66d79fd84d41cdc4f2b78a016705f8
-EBUILD flatpak-1.14.0-r1.ebuild 2485 BLAKE2B f067a7008a6af638fa5edfa147951b1cbd70aff96dc2e7ac50bf112043cc76a10a638a647ddc29cd8542450eb82e64342885c88221c79f821ff15ef7f927d049 SHA512 2355f7a9db06fc03d5dde8a8a9b9de87f9f36fbb8ed13caa8a367513cdb83c52e2a822d1e410f20bcd8c6e4ed02255659381c1cedbdcbac194f05cbd10066419
+EBUILD flatpak-1.12.3.ebuild 2393 BLAKE2B 227b4fdf5e99cdaa7816010ff55bd06e4eeb6b34389d826fa39a2a198350fe96acf9f408e9ac1d23da00dbe71d8200e68849eeac3f375081a67f863d6b95a0de SHA512 40820a8cb27ad7947e8900ee854fc425d08397b80e841c08ccf428401880bc9fae44f2639b21a43908d15da2d53fd36aa3e9f5e1989dbc77bf1399547bd3f803
+EBUILD flatpak-1.14.0-r1.ebuild 2523 BLAKE2B ed7ec5af6f7203bc5bd1eca26ffa05a8110ec32e74e53033d72263f195f3d843237214fef1655fc0ff2e763c2538494178924763af5cb4fd644fb21227b41d05 SHA512 d9f05efc53864e89117e0f16b4118ff44f41da6bca0f34f21805d1afe79b62513c1ac31bd5f85d4d9ceab57ebf52d3cd3c40a4cedc75cb5cde89e43b469a6a2e
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.3.ebuild b/sys-apps/flatpak/flatpak-1.12.3.ebuild
index 8450f3e36916..8a2d52051324 100644
--- a/sys-apps/flatpak/flatpak-1.12.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.3.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 		dev-util/ostree[soup]
 	)
 	>=gnome-base/dconf-0.26:=
+	gnome-base/gsettings-desktop-schemas
 	>=net-libs/libsoup-2.4:=
 	sys-apps/bubblewrap
 	sys-apps/dbus
diff --git a/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild b/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
index cc9a529caedf..b42c343de33f 100644
--- a/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	>=dev-util/ostree-2020.8:=[gpg(+)]
 	dev-util/ostree[curl]
 	>=gnome-base/dconf-0.26:=
+	gnome-base/gsettings-desktop-schemas
 	net-misc/curl:=
 	sys-apps/bubblewrap
 	sys-apps/dbus
diff --git a/sys-apps/noexec/Manifest b/sys-apps/noexec/Manifest
index 14f848d8f697..1a1b8cdf66e5 100644
--- a/sys-apps/noexec/Manifest
+++ b/sys-apps/noexec/Manifest
@@ -1,3 +1,3 @@
 DIST noexec-1.1.0.tar.gz 157097 BLAKE2B a4a40039a30a8cbc456e30839dad712ff650b40d9373be82de0eee4c7a0281f4713b99eb8b05bd0a1bbcf41a9b75a7a7d937436501f38729a1a5c363bbdb3e7d SHA512 9a4fac2fd98fb4a0e1e3d9c7e67b76de623ec717f28e0ceade8dd39e2b0ca02f9fae77ebec256964faa05bed38d9cad23300e6606876ba71d64d757708ef648c
-EBUILD noexec-1.1.0-r1.ebuild 361 BLAKE2B 630c3c5533e6c0615b958476f87432c2ce9164f27084717f6949b2f1d5c0a27df0f2f0f3227fe1b8458d312f9720d137f709084e01dfc76ec8c620cc523f6ba7 SHA512 2dfbc322eff4e431524269d209973244de41e0ac93a818412ff32fe858ff10b38faf034775974a8fc8011a4b7569615a942af369b2b8729c306d9bfd93e7c018
+EBUILD noexec-1.1.0-r2.ebuild 643 BLAKE2B eac42f931abbcb8a06d81b5b5fc4aeb7ff6f0962bc02f10464e5998d3dff5710d42a9e94933d24caf5913768d4c7d94ea65051d1a83d3026e8c4bb5d99a99536 SHA512 5f5c24f9d428a11c7584ccf12ac973e10e526c9ffdf0375628f16586894d95f525dd99f0161e84eb80f42316dab51b4c0a6faec7ad119dba39dd93c01af2b9f2
 MISC metadata.xml 244 BLAKE2B 002482ce19b6023b618d761b814386a6785ae5c4440d1c19c45712ed27540788aeafbfc394598fb70dc8c78ca439f61a9801fbbc11e4e657201b487b7259008f SHA512 2a360879e067de2565427e48aa294d0d65f934ad877265f744439d35bfd69a0f3083ec9bc05ece6e89fe0865a314d8178a2a36dbb612f018aff04f087c717467
diff --git a/sys-apps/noexec/noexec-1.1.0-r1.ebuild b/sys-apps/noexec/noexec-1.1.0-r1.ebuild
deleted file mode 100644
index 5e25d33d7981..000000000000
--- a/sys-apps/noexec/noexec-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="a package for preventing processes from using exec system calls"
-HOMEPAGE="http://noexec.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="sys-libs/glibc"
diff --git a/sys-apps/noexec/noexec-1.1.0-r2.ebuild b/sys-apps/noexec/noexec-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..ab5153da8055
--- /dev/null
+++ b/sys-apps/noexec/noexec-1.1.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Package for preventing processes from using exec system calls"
+HOMEPAGE="https://noexec.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="sys-libs/glibc"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -e "/^#define PRELOAD_LIBRARY_PATH/s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
+		-i src/noexec_macro.h || die
+
+	eautoreconf #874426
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 44bcfa8d6e08..a74f9dfc58ff 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,18 +1,19 @@
 AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800
 AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429
 AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
+AUX 252-rc1-cryptsetup.patch 10252 BLAKE2B 5a028463c40699a088859e6834d22a951357c93813f3045747679237420c165698cf7115fb8ddbf2adcad876439a2bd74a82f803cc875a00d6807afad2a6cad9 SHA512 d02d00491001a505f44015af5d5a8596acfdb34688415c7e72b7b5cb0083a3890a99ac89458c58a32164ce248b87af9c6395dd4ea1386b13433fc2b508db2b48
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
+DIST systemd-252-rc1.tar.gz 11718698 BLAKE2B 599c5c125c0fb0477ea71195491962db230cbaa2c610afbb14a475263f356f160a77ba7321f425cb6db837649ccbce971f80daaf5524ace03362777a71e7a9b5 SHA512 e249eb39da41aca1bc371c9e2b61f135227b0653e4e175c4c6453b0ca4e1cd50894c005d4ef267b5122af4f339cd9b5a4b90a98c4f84f998f96a7ca1ed637d28
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 DIST systemd-stable-251.6.tar.gz 11448383 BLAKE2B 987ea88ea23662fd4119e3c796cc2e5f428fcce6cf0b033a5f8da7974c0026d41851f517e489354bbc22973b33c3932ac7280c56527f03a1fcbce3092148b638 SHA512 2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8
-EBUILD systemd-251.3.ebuild 15507 BLAKE2B a5b9463fe2f440b01ab987b134fb147f88a811393e8122f2e404ca8163c7805cf42844292da3dbed72140e188958ccd67f11fc000c94b2e76aea0054a7a0606e SHA512 d1cd4e249b30fe9f975c4a70d7efd08b718dab197d84de621ab2e407299de764a1b47dc7d5df60028e3a2a5feedc9824b5d295a71c5583c369cc8283565de281
 EBUILD systemd-251.4.ebuild 15500 BLAKE2B c8ea106e1dbbf830fba008ed6f70486e36a62947cf390f436b2c45856a8f3fc74d819f67983dde5fa49b854cf91e3c76e4ccb7d99af9c9753cc7a0183d8bb0d3 SHA512 f97e89cbc1fad054b265878f0f55b7bbfccdecc1f907743d4373cb7a9783805ea1e5536ad5fe759da4e3b6954146c9b456ce4147fa86f41c61187b11333ee8ec
 EBUILD systemd-251.5.ebuild 15508 BLAKE2B dd89dde571cfd27fad856e2802c8b837d96b567f07fcae62af911f9dc6ebf6752ef7a287a7f1d695695a8f84cd43638a156101fcd53488fd25bdf43d65cb8560 SHA512 1c4b6a2dd35171dea0363d1331bfa67967fdb9bc8025cf4b3fea7b20af60748373473a3efed0710a8c86762ba53fb3bdcd0df62bb1e70a55a43a1ab722171ecd
 EBUILD systemd-251.6.ebuild 15557 BLAKE2B 124b3527e460ec93d8a1f5a5fea3f435aa8db9a6b25b729ef46480b451a89aa77800d7a6062b7ba94d817152951f6f22c58d68708e2fd0fafbf73841b23bb9a0 SHA512 09f4318b267ef45fcd92d4ce3f25d5c6e665f0d1662cb339796c60e38c48ab780977d93f816f80c8e7512f6cb2c9802e68914375b351a08d14d96d2ff30365e5
+EBUILD systemd-252_rc1.ebuild 15414 BLAKE2B c6b3bc91da656036ec15f274551c377f94eb95110d9fc7d8f94601e1f0c4cf48fa030fc62a0d3bb5242d3061d132c30ca70f4a6be1526212f9190169de92896b SHA512 286665b61d82ee988be640b10103f2f05bba2c0c8efabc9cd8cbd2271e27e4e24b1cbca7f3273632bf269488b0a4743082097e4cb2dfab0cc12c32d0e3a6958d
 EBUILD systemd-9999.ebuild 15372 BLAKE2B f480ab02dd6910b271805ef126bfefd478b9c94487dd4d2134edebd5a15e780ecb9104ae16a0f50dd921f642cb78389ffb486cc9ea76ea3d4db863a0db12d63f SHA512 ee3c87a63e7295e02679364f7337985eaf073026e57672b6352bb65979224791e491222b4309ca66ecc4df6c1b312acb4b706419299800fa8c94e179c235f5c6
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/files/252-rc1-cryptsetup.patch b/sys-apps/systemd/files/252-rc1-cryptsetup.patch
new file mode 100644
index 000000000000..54b4ce1ea0aa
--- /dev/null
+++ b/sys-apps/systemd/files/252-rc1-cryptsetup.patch
@@ -0,0 +1,226 @@
+From bbf73b00697e77ca35ae60109418da77f257be52 Mon Sep 17 00:00:00 2001
+From: Daan De Meyer <daan.j.demeyer@gmail.com>
+Date: Tue, 11 Oct 2022 20:35:34 +0200
+Subject: [PATCH 1/2] cryptsetup-util: Always define dlopen_cryptsetup()
+
+---
+ src/shared/cryptsetup-util.c | 118 ++++++++++++++++++-----------------
+ src/shared/cryptsetup-util.h |   4 +-
+ 2 files changed, 63 insertions(+), 59 deletions(-)
+
+diff --git a/src/shared/cryptsetup-util.c b/src/shared/cryptsetup-util.c
+index da6dcb2f093a..401e7a3f9c7d 100644
+--- a/src/shared/cryptsetup-util.c
++++ b/src/shared/cryptsetup-util.c
+@@ -50,63 +50,6 @@ int (*sym_crypt_token_max)(const char *type);
+ crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
+ int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
+ 
+-int dlopen_cryptsetup(void) {
+-        int r;
+-
+-        r = dlopen_many_sym_or_warn(
+-                        &cryptsetup_dl, "libcryptsetup.so.12", LOG_DEBUG,
+-                        DLSYM_ARG(crypt_activate_by_passphrase),
+-#if HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY
+-                        DLSYM_ARG(crypt_activate_by_signed_key),
+-#endif
+-                        DLSYM_ARG(crypt_activate_by_volume_key),
+-                        DLSYM_ARG(crypt_deactivate_by_name),
+-                        DLSYM_ARG(crypt_format),
+-                        DLSYM_ARG(crypt_free),
+-                        DLSYM_ARG(crypt_get_cipher),
+-                        DLSYM_ARG(crypt_get_cipher_mode),
+-                        DLSYM_ARG(crypt_get_data_offset),
+-                        DLSYM_ARG(crypt_get_device_name),
+-                        DLSYM_ARG(crypt_get_dir),
+-                        DLSYM_ARG(crypt_get_type),
+-                        DLSYM_ARG(crypt_get_uuid),
+-                        DLSYM_ARG(crypt_get_verity_info),
+-                        DLSYM_ARG(crypt_get_volume_key_size),
+-                        DLSYM_ARG(crypt_init),
+-                        DLSYM_ARG(crypt_init_by_name),
+-                        DLSYM_ARG(crypt_keyslot_add_by_volume_key),
+-                        DLSYM_ARG(crypt_keyslot_destroy),
+-                        DLSYM_ARG(crypt_keyslot_max),
+-                        DLSYM_ARG(crypt_load),
+-                        DLSYM_ARG(crypt_resize),
+-                        DLSYM_ARG(crypt_resume_by_passphrase),
+-                        DLSYM_ARG(crypt_set_data_device),
+-                        DLSYM_ARG(crypt_set_debug_level),
+-                        DLSYM_ARG(crypt_set_log_callback),
+-#if HAVE_CRYPT_SET_METADATA_SIZE
+-                        DLSYM_ARG(crypt_set_metadata_size),
+-#endif
+-                        DLSYM_ARG(crypt_set_pbkdf_type),
+-                        DLSYM_ARG(crypt_suspend),
+-                        DLSYM_ARG(crypt_token_json_get),
+-                        DLSYM_ARG(crypt_token_json_set),
+-#if HAVE_CRYPT_TOKEN_MAX
+-                        DLSYM_ARG(crypt_token_max),
+-#endif
+-                        DLSYM_ARG(crypt_token_status),
+-                        DLSYM_ARG(crypt_volume_key_get));
+-        if (r <= 0)
+-                return r;
+-
+-        /* Redirect the default logging calls of libcryptsetup to our own logging infra. (Note that
+-         * libcryptsetup also maintains per-"struct crypt_device" log functions, which we'll also set
+-         * whenever allocating a "struct crypt_device" context. Why set both? To be defensive: maybe some
+-         * other code loaded into this process also changes the global log functions of libcryptsetup, who
+-         * knows? And if so, we still want our own objects to log via our own infra, at the very least.) */
+-        cryptsetup_enable_logging(NULL);
+-        return 1;
+-}
+-
+ static void cryptsetup_log_glue(int level, const char *msg, void *usrptr) {
+ 
+         switch (level) {
+@@ -246,6 +189,67 @@ int cryptsetup_add_token_json(struct crypt_device *cd, JsonVariant *v) {
+ }
+ #endif
+ 
++int dlopen_cryptsetup(void) {
++#if HAVE_LIBCRYPTSETUP
++        int r;
++
++        r = dlopen_many_sym_or_warn(
++                        &cryptsetup_dl, "libcryptsetup.so.12", LOG_DEBUG,
++                        DLSYM_ARG(crypt_activate_by_passphrase),
++#if HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY
++                        DLSYM_ARG(crypt_activate_by_signed_key),
++#endif
++                        DLSYM_ARG(crypt_activate_by_volume_key),
++                        DLSYM_ARG(crypt_deactivate_by_name),
++                        DLSYM_ARG(crypt_format),
++                        DLSYM_ARG(crypt_free),
++                        DLSYM_ARG(crypt_get_cipher),
++                        DLSYM_ARG(crypt_get_cipher_mode),
++                        DLSYM_ARG(crypt_get_data_offset),
++                        DLSYM_ARG(crypt_get_device_name),
++                        DLSYM_ARG(crypt_get_dir),
++                        DLSYM_ARG(crypt_get_type),
++                        DLSYM_ARG(crypt_get_uuid),
++                        DLSYM_ARG(crypt_get_verity_info),
++                        DLSYM_ARG(crypt_get_volume_key_size),
++                        DLSYM_ARG(crypt_init),
++                        DLSYM_ARG(crypt_init_by_name),
++                        DLSYM_ARG(crypt_keyslot_add_by_volume_key),
++                        DLSYM_ARG(crypt_keyslot_destroy),
++                        DLSYM_ARG(crypt_keyslot_max),
++                        DLSYM_ARG(crypt_load),
++                        DLSYM_ARG(crypt_resize),
++                        DLSYM_ARG(crypt_resume_by_passphrase),
++                        DLSYM_ARG(crypt_set_data_device),
++                        DLSYM_ARG(crypt_set_debug_level),
++                        DLSYM_ARG(crypt_set_log_callback),
++#if HAVE_CRYPT_SET_METADATA_SIZE
++                        DLSYM_ARG(crypt_set_metadata_size),
++#endif
++                        DLSYM_ARG(crypt_set_pbkdf_type),
++                        DLSYM_ARG(crypt_suspend),
++                        DLSYM_ARG(crypt_token_json_get),
++                        DLSYM_ARG(crypt_token_json_set),
++#if HAVE_CRYPT_TOKEN_MAX
++                        DLSYM_ARG(crypt_token_max),
++#endif
++                        DLSYM_ARG(crypt_token_status),
++                        DLSYM_ARG(crypt_volume_key_get));
++        if (r <= 0)
++                return r;
++
++        /* Redirect the default logging calls of libcryptsetup to our own logging infra. (Note that
++         * libcryptsetup also maintains per-"struct crypt_device" log functions, which we'll also set
++         * whenever allocating a "struct crypt_device" context. Why set both? To be defensive: maybe some
++         * other code loaded into this process also changes the global log functions of libcryptsetup, who
++         * knows? And if so, we still want our own objects to log via our own infra, at the very least.) */
++        cryptsetup_enable_logging(NULL);
++        return 1;
++#else
++        return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "cryptsetup support is not compiled in.");
++#endif
++}
++
+ int cryptsetup_get_keyslot_from_token(JsonVariant *v) {
+         int keyslot, r;
+         JsonVariant *w;
+diff --git a/src/shared/cryptsetup-util.h b/src/shared/cryptsetup-util.h
+index b1ce07ec8a50..b390dc9a5cbb 100644
+--- a/src/shared/cryptsetup-util.h
++++ b/src/shared/cryptsetup-util.h
+@@ -65,8 +65,6 @@ static inline int crypt_token_max(_unused_ const char *type) {
+ extern crypt_token_info (*sym_crypt_token_status)(struct crypt_device *cd, int token, const char **type);
+ extern int (*sym_crypt_volume_key_get)(struct crypt_device *cd, int keyslot, char *volume_key, size_t *volume_key_size, const char *passphrase, size_t passphrase_size);
+ 
+-int dlopen_cryptsetup(void);
+-
+ DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, crypt_free, NULL);
+ DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct crypt_device *, sym_crypt_free, NULL);
+ 
+@@ -91,6 +89,8 @@ static inline void sym_crypt_freep(struct crypt_device** cd) {}
+ 
+ #endif
+ 
++int dlopen_cryptsetup(void);
++
+ int cryptsetup_get_keyslot_from_token(JsonVariant *v);
+ 
+ static inline const char *mangle_none(const char *s) {
+
+From 86bebe385f6e35ecec708e44dae2b896f5bfa770 Mon Sep 17 00:00:00 2001
+From: Daan De Meyer <daan.j.demeyer@gmail.com>
+Date: Tue, 11 Oct 2022 20:36:03 +0200
+Subject: [PATCH 2/2] repart: Always define VerityMode from/to string functions
+
+---
+ src/partition/repart.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/partition/repart.c b/src/partition/repart.c
+index a0f7d4164500..dd544d6415a9 100644
+--- a/src/partition/repart.c
++++ b/src/partition/repart.c
+@@ -255,12 +255,11 @@ static const char *verity_mode_table[_VERITY_MODE_MAX] = {
+ 
+ #if HAVE_LIBCRYPTSETUP
+ DEFINE_PRIVATE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(encrypt_mode, EncryptMode, ENCRYPT_KEY_FILE);
+-DEFINE_PRIVATE_STRING_TABLE_LOOKUP(verity_mode, VerityMode);
+ #else
+ DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING_WITH_BOOLEAN(encrypt_mode, EncryptMode, ENCRYPT_KEY_FILE);
+-DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING(verity_mode, VerityMode);
+ #endif
+ 
++DEFINE_PRIVATE_STRING_TABLE_LOOKUP(verity_mode, VerityMode);
+ 
+ static uint64_t round_down_size(uint64_t v, uint64_t p) {
+         return (v / p) * p;
+From 748367c72368031ca0ef32fadd394c4bcacc126a Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Wed, 12 Oct 2022 21:47:29 +0200
+Subject: [PATCH] gpt-auto: allow using without cryptsetup
+
+Fixes #24978
+---
+ src/gpt-auto-generator/gpt-auto-generator.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
+index 31377d877d5c..5584eb22af1a 100644
+--- a/src/gpt-auto-generator/gpt-auto-generator.c
++++ b/src/gpt-auto-generator/gpt-auto-generator.c
+@@ -571,11 +571,15 @@ static int add_root_rw(DissectedPartition *p) {
+ 
+ #if ENABLE_EFI
+ static int add_root_cryptsetup(void) {
++#if HAVE_LIBCRYPTSETUP
+ 
+         /* If a device /dev/gpt-auto-root-luks appears, then make it pull in systemd-cryptsetup-root.service, which
+          * sets it up, and causes /dev/gpt-auto-root to appear which is all we are looking for. */
+ 
+         return add_cryptsetup("root", "/dev/gpt-auto-root-luks", true, false, NULL);
++#else
++        return 0;
++#endif
+ }
+ #endif
+ 
diff --git a/sys-apps/systemd/systemd-251.3.ebuild b/sys-apps/systemd/systemd-252_rc1.ebuild
index 30f67264f25b..6d2654a50d90 100644
--- a/sys-apps/systemd/systemd-251.3.ebuild
+++ b/sys-apps/systemd/systemd-252_rc1.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~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"
 fi
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
@@ -168,8 +168,8 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
 }
 
 QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
@@ -235,11 +235,7 @@ src_unpack() {
 
 src_prepare() {
 	local PATCHES=(
-		# Breaks Clang. Revert the commit for now and force off F_S=3.
-		# bug #841770.
-		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
-		# bug #863218
-		"${FILESDIR}/251-glibc-2.36.patch"
+		"${FILESDIR}/252-rc1-cryptsetup.patch"
 	)
 
 	if ! use vanilla; then
@@ -287,9 +283,8 @@ multilib_src_configure() {
 		-Dpamlibdir="$(getpam_mod_dir)"
 		# avoid bash-completion dep
 		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
 		$(meson_use split-usr)
-		-Dsplit-bin=true
+		$(meson_use split-usr split-bin)
 		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
 		# Avoid infinite exec recursion, bug 642724
@@ -371,6 +366,7 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	local rootprefix=$(usex split-usr '' /usr)
+	local sbin=$(usex split-usr sbin bin)
 
 	# meson doesn't know about docdir
 	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
@@ -379,19 +375,19 @@ multilib_src_install_all() {
 	dodoc "${FILESDIR}"/nsswitch.conf
 
 	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
 	fi
 
 	rm "${ED}"/etc/init.d/README || die
 	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
 
 	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
 		rm "${ED}"/usr/share/man/man1/init.1 || die
 		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
 	fi
 
-	if ! use resolvconf && ! use sysv-utils; then
+	if ! use resolvconf && ! use sysv-utils && use split-usr; then
 		rmdir "${ED}${rootprefix}"/sbin || die
 	fi