gentoo auto-resync : 09:11:2023 - 10:28:50

12 files changed, 77 insertions, 49 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1e1cfabfa305..963f733c5738 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index e58e6612810a..b8afb0da193d 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -2,7 +2,7 @@ AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3
 DIST debianutils_5.14.tar.xz 79676 BLAKE2B b8e6c5a38cf5fe8e3d8151b1c19cfda4d5866f805453eeb8376a94e1982653cb532ffefdb560f188574ba01e97249b49b69d41f1dda9aa76de4511034736965a SHA512 4a152fec6c363c0ca26339bf8bf3f39ec3c10227bbfe5d2f5974c24a6207fdb6c34644ecfdf0c773d4c778b1a95f91a15697b12b5c0cd9a6d0d8f369373b956f
 DIST debianutils_5.7.orig.tar.gz 257231 BLAKE2B 61d2e7abcd359c5dc87b7f91e510e91e1926183c15a572c7d87cf4a590dded2e2ee8c9b4e06f7f478353139870c808927575de233200ad69e084a6f971c4bd24 SHA512 79acd8885abca93842d696167171a359011c49a40f38deeb25bc94d62905f95afa3a7b2540d3bd4b0ffd363c5c48a439a1a68139a29d6c033980b019cea75d92
 DIST debianutils_5.8.orig.tar.gz 260865 BLAKE2B 8a2bb3dc06d6e7a41ca53759610c432eaf3797135b13d717d1e8969926388a6955ba020db64a039d1b8dc06a8ee47d5bc960c6f54fe6b9c17e2b361f5636ece3 SHA512 7fddff17804ab334ac1ab3fa4b76a3fed8d83dc2dbf8d9ab1e486b5f226ac8363e98336cfa651c7630eef5fffa4551dbf7a5da1ba60f033b279f9aca624d58a2
-EBUILD debianutils-5.14.ebuild 1045 BLAKE2B cff1c6378831c0a0a3e58843ee0d106adbb9ca29cb1203ebfbe8fd6850a5912195c16bfbe9aad119ef7251c48099fe82885d245766e26422ab20efc0f2e022d3 SHA512 5db059b7bac0268a321acdf6e7bf23ace425ea2c979b8f94d04acfec36b14fd687281eb96aee24d327df69c7724d74112c6a471cc7707fbcd2aa5c9cfd910f68
-EBUILD debianutils-5.7.ebuild 1044 BLAKE2B d8175b35f5ee63c395a7d7b87306bfd25be41c19d80890c218b8d6c61ecdc3cbea1fe5a90f17f23ce43269ec56f1252ae4c151319650fa931b6aaccf94c08a26 SHA512 8fdd414115cacc0c61ae0ce411ecaa724a0173c6d9f15c2664c900e62312bb7bcceb2175deea019d1ea374c56c66b89a43e4c2c316d88e9222495438e8d81593
-EBUILD debianutils-5.8.ebuild 1044 BLAKE2B c06d03032f3a3c942651c815df94d47dd8a4e362c15321f56f5f5393a7c2dd85f87783d77fb6dc1211e04cf9eaec34fe166965a74aefa7b8cad1643b72b5603e SHA512 2a05179432bac0a180e4a7a0ecb1070c77d6376b32c0584c8d3251bfa0adc6da7d4ebc0d744c8cb39c0bcc0fdcdffd7ffd5fbd33647bf87867dbd91dae833e4b
+EBUILD debianutils-5.14.ebuild 1040 BLAKE2B 31af95bca897d477781362895b6cf95c11cd7e40ddd5536ffeb158cd0e33cc3f09ddbe855e60ba35ddebc5037543f7b344dc8997d7f97ba3960d193cad35ef99 SHA512 dff83c29f454184345c65da92cfcd8a6be0b3f1d91662b3024a5d429479fbb317606c8eeec4fada08fddf20e9304530bd81491a8fcaa335db363503a0c9c936c
+EBUILD debianutils-5.7.ebuild 1039 BLAKE2B 04c53fe5e25a5cd42d83814f80276856a1c4cf4de440d0cb65b938b88d8780baa63263c96ea06aff33bacbeecdc78aa04c119ef3f0f28eadc7d5fde65623ea1d SHA512 63e083f40384ee0d7c628a8873b6ec8005b79989179b01e5c571c5dde978f00d16b0aaebe614c8b350dcb0f4deb5f542fefb2df3802f694f72bebeab1152640f
+EBUILD debianutils-5.8.ebuild 1039 BLAKE2B 829181bfaf9889fa257bd5b98a56b10841a0ca374b6dd106b361deef1092d648518603737f54ea952a3baab72783b8354b22f80fd0394a84c4c63be0f4914834 SHA512 d3338695d51db6a02c130105f68a0878964cc0310feb30cc5b08f771d2a964e3a92bb991017bf565466235aa60626079e0139839c303f7e759d77f90c71fa637
 MISC metadata.xml 446 BLAKE2B a681b76916f27a5d016fa34c6c6ce4abe887c1f46232cb6cd759ba699eca0cba865ff7b0d33900b1f9e858e016532815b18bf86cc211b97f57a1c0a56580d125 SHA512 c080d8ae5511a0870aa778f744518a2482e7d61ff9e653a808b3959571b8bb47dc90b1b1f2feaccc323df0521f4ae91efb43fa31bd6c8a72075c8b2e9dfeb829
diff --git a/sys-apps/debianutils/debianutils-5.14.ebuild b/sys-apps/debianutils/debianutils-5.14.ebuild
index f56e99e6a6b0..c71e9cb0196b 100644
--- a/sys-apps/debianutils/debianutils-5.14.ebuild
+++ b/sys-apps/debianutils/debianutils-5.14.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
 	installkernel? (
 		|| (
 			sys-kernel/installkernel-gentoo
-			sys-kernel/installkernel-systemd-boot
+			sys-kernel/installkernel-systemd
 		)
 	)
 "
diff --git a/sys-apps/debianutils/debianutils-5.7.ebuild b/sys-apps/debianutils/debianutils-5.7.ebuild
index 358f820b7322..0cc841149e59 100644
--- a/sys-apps/debianutils/debianutils-5.7.ebuild
+++ b/sys-apps/debianutils/debianutils-5.7.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
 	installkernel? (
 		|| (
 			sys-kernel/installkernel-gentoo
-			sys-kernel/installkernel-systemd-boot
+			sys-kernel/installkernel-systemd
 		)
 	)"
 
diff --git a/sys-apps/debianutils/debianutils-5.8.ebuild b/sys-apps/debianutils/debianutils-5.8.ebuild
index 3bd7fca2ed79..1909cc22de71 100644
--- a/sys-apps/debianutils/debianutils-5.8.ebuild
+++ b/sys-apps/debianutils/debianutils-5.8.ebuild
@@ -18,7 +18,7 @@ PDEPEND="
 	installkernel? (
 		|| (
 			sys-kernel/installkernel-gentoo
-			sys-kernel/installkernel-systemd-boot
+			sys-kernel/installkernel-systemd
 		)
 	)"
 
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 53bf250f1b12..b0b487cad2ec 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -11,5 +11,5 @@ DIST systemd-stable-253.12.tar.gz 12117485 BLAKE2B 8ed9e5a081c59a304698c8194fd15
 DIST systemd-stable-254.5.tar.gz 14334696 BLAKE2B 2f63d79ae93add69ac0b56dda9f67019340f84692de4da200557b9f5f1f16bebbad42a9a7e2d6ef7420aa37746d2ede0481fd8e39f03a31576c7e4e48e259ce3 SHA512 cac713670216add9e5473e2c86f04da441015e7cc0ac1500b9e1489a435f9b80c4c6ee24e9b22e4c4213a495bc1a0a908925df2045e344a2170d5aea6aafa16c
 EBUILD systemd-utils-253.11-r1.ebuild 12608 BLAKE2B aa3fc7468ada1b120d868cdbc94eeb22a5a4ec7ddbcca37d364cd996094021c82e8c98a2ff1e42f04cf57314ceb9a48b1edf7df3976de926fbfe208f422dd459 SHA512 51739b8478efb3bbf326b8681bb51adc2e150316fcae68984d68cbc05389e09c45da06cc77bb96ff2d43ad6c1951b91e05d41377e02684aa873d7c603e183d4d
 EBUILD systemd-utils-253.12-r1.ebuild 12616 BLAKE2B ba823f24fc2b19f5aa9ca1ff9df8521efe9847d5440cd3dfa35c912f5b8d32418cc13220e8e50422350f0dd1812f38a6c06c44d9e518aad3ebca9d17d4564029 SHA512 abb188db7c96f7a2afb022fb548106870f876fbeeac5cb415b2ef26fd34254ddad0568d6f74c1165dbb2549c5d144d7bfabef7aedf6ce120c1c1b339ccda4e16
-EBUILD systemd-utils-254.5-r1.ebuild 12535 BLAKE2B 1b0bc042a678b70c5e62001e84f6227696cba0123229a68b992f5fba0807345bb1ef6aac66e944ca797dadfb69fc95c872b3a28453a5ae0947f327a68f0cb234 SHA512 f622e19c0fe73c2775bd0eaa32c10eba0ee70c05bff1f9172640ac768a1680c701d3fa8f1b603aab1bf6ac09292a7710291c7b3abd21ab12e31b34fc3a377506
-MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
+EBUILD systemd-utils-254.5-r2.ebuild 13076 BLAKE2B b3da8f4d0f6ce116618e6f7885b41bc0ef5724b1ec3d58b7fd080494a29bb101dddab4e0fc278a50ba340c1988055fe6a5ee352bc1aad33012226a1ee4d15dad SHA512 90b6f053e921aa6d80b19d484a5f5ac8f74325f1d4e2e08e379a1fb53456e7250b60e9969b6b3ca7e5ce26ac6215d419742e81f36decc6ebbb3d47b2f1f35e27
+MISC metadata.xml 821 BLAKE2B 6bef03e6675a5b12c8df50bdea38186cdd89d28451a8fbc2d1af1946c4c0978ae9e7a0153506a1c26c2e24b2f8569c168fc30c79e48f2b804666f2feaa728b13 SHA512 eb7e2dee51117fcd21417c37ab0283f2f10aff20d0fbe6762ee2bca2c7888e5a5835fe5195a1dcbf298d80105e3aa84f36f897088804b5f0a1ed38ad673f2603
diff --git a/sys-apps/systemd-utils/metadata.xml b/sys-apps/systemd-utils/metadata.xml
index a5585a7ca034..e2af023a5096 100644
--- a/sys-apps/systemd-utils/metadata.xml
+++ b/sys-apps/systemd-utils/metadata.xml
@@ -6,10 +6,12 @@
 	</maintainer>
 	<use>
 		<flag name="boot">Enable systemd-boot (UEFI boot manager)</flag>
+		<flag name="kernel-install">Enable kernel-install</flag>
 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
 		<flag name="sysusers">Enable systemd-sysusers</flag>
 		<flag name="tmpfiles">Enable systemd-tmpfiles</flag>
 		<flag name="udev">Enable systemd-udev (userspace device manager)</flag>
+		<flag name="ukify">Enable systemd-ukify</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">systemd/systemd</remote-id>
diff --git a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
index 12e727d7e3fa..d31c70d4444c 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.5-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.5-r2.ebuild
@@ -28,9 +28,11 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
 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"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
 REQUIRED_USE="
-	|| ( boot tmpfiles sysusers udev )
+	|| ( kernel-install tmpfiles sysusers udev )
+	boot? ( kernel-install )
+	ukify? ( boot )
 	${PYTHON_REQUIRED_USE}
 "
 RESTRICT="!test? ( test )"
@@ -61,8 +63,8 @@ DEPEND="${COMMON_DEPEND}
 PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
 
 RDEPEND="${COMMON_DEPEND}
-	boot? (
-		!<sys-boot/systemd-boot-250
+	boot? ( !<sys-boot/systemd-boot-250 )
+	ukify? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep "${PEFILE_DEPEND}")
 	)
@@ -105,10 +107,8 @@ BDEPEND="
 	$(python_gen_cond_dep "
 		dev-python/jinja[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
-		boot? (
-			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
-			test? ( ${PEFILE_DEPEND} )
-		)
+		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+		ukify? ( test? ( ${PEFILE_DEPEND} ) )
 	")
 "
 
@@ -159,11 +159,13 @@ multilib_src_configure() {
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dsysvinit-path=
 		$(meson_native_use_bool boot bootloader)
+		$(meson_native_use_bool kernel-install)
 		$(meson_native_use_bool selinux)
 		$(meson_native_use_bool sysusers)
 		$(meson_use test tests)
 		$(meson_native_use_bool tmpfiles)
 		$(meson_use udev hwdb)
+		$(meson_native_use_bool ukify)
 
 		# Link staticly with libsystemd-shared
 		-Dlink-boot-shared=false
@@ -282,14 +284,18 @@ multilib_src_compile() {
 		if use boot; then
 			targets+=(
 				bootctl
-				kernel-install
 				man/bootctl.1
-				man/kernel-install.8
-				90-loaderentry.install
 				src/boot/efi/linux$(efi_arch).efi.stub
 				src/boot/efi/systemd-boot$(efi_arch).efi
 			)
 		fi
+		if use kernel-install; then
+			targets+=(
+				kernel-install
+				90-loaderentry.install
+				man/kernel-install.8
+			)
+		fi
 		if use sysusers; then
 			targets+=(
 				systemd-sysusers.standalone
@@ -359,6 +365,13 @@ multilib_src_compile() {
 				)
 			fi
 		fi
+		if use ukify; then
+			targets+=(
+				ukify
+				60-ukify.install
+				man/ukify.1
+			)
+		fi
 	fi
 	if use udev; then
 		targets+=(
@@ -425,14 +438,19 @@ multilib_src_install() {
 	if multilib_is_native_abi; then
 		if use boot; then
 			into /usr
-			dobin bootctl kernel-install
-			doman man/{bootctl.1,kernel-install.8}
-			# 90-loaderentry.install is generated from 90-loaderentry.install.in
-			exeinto usr/lib/kernel/install.d
-			doexe src/kernel-install/*.install
+			dobin bootctl
+			doman man/bootctl.1
 			insinto usr/lib/systemd/boot/efi
 			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
 		fi
+		if use kernel-install; then
+			dobin kernel-install
+			doman man/kernel-install.8
+			# 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
 		if use sysusers; then
 			into "${rootprefix:-/}"
 			newbin systemd-sysusers{.standalone,}
@@ -468,6 +486,11 @@ multilib_src_install() {
 			doman man/libudev.3
 			doman man/udev_*.3
 		fi
+		if use ukify; then
+			exeinto "${rootprefix}"/lib/systemd/
+			doexe ukify
+			doman man/ukify.1
+		fi
 	fi
 	if use udev; then
 		meson_install --no-rebuild --tags libudev
@@ -524,6 +547,7 @@ multilib_src_install_all() {
 		doins shell-completion/zsh/_udevadm
 	fi
 
+	use ukify && python_fix_shebang "${ED}"
 	use boot && secureboot_auto_sign
 }
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 5421214d4d55..aaf7c910ca65 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -17,6 +17,6 @@ EBUILD systemd-253.3-r1.ebuild 14579 BLAKE2B ec9e31176bad8f142e224369a868b275fac
 EBUILD systemd-253.6.ebuild 14661 BLAKE2B 4d08e0b78f8748ae78b9eaded181c740bc5c5f78f83fe7dc61cc9738658bedd6811e0d214c32e719e96898ad70008d15e527e12b7df17b122f3d9ce45505e94a SHA512 1d5ee451cf3a0494399c2f30c9cf5e93be11bcfce4c5a834521b4a2de1da7c80ba60b1195d142fb92ffbaf1a69e524849c15bb729ba2dbcab9f2956c08a559de
 EBUILD systemd-254.3.ebuild 14824 BLAKE2B 30302795c1190012a9ea1540fc4f6b04d35d27afdac5aa170a2ea0082183f51448631b653a4cfbb98befaa6f0df1d07c0c59d4e467ba74d5bba01b53cdc7fd18 SHA512 b1d9acd433a6b5606361c59ff5afb51179ca98213629bbe7b26d55f8f4b7fd80a7beee57e5e9588360a0e62d79a6a2de9fad75d72499b5ae19968a831a422608
 EBUILD systemd-254.4.ebuild 14824 BLAKE2B 30302795c1190012a9ea1540fc4f6b04d35d27afdac5aa170a2ea0082183f51448631b653a4cfbb98befaa6f0df1d07c0c59d4e467ba74d5bba01b53cdc7fd18 SHA512 b1d9acd433a6b5606361c59ff5afb51179ca98213629bbe7b26d55f8f4b7fd80a7beee57e5e9588360a0e62d79a6a2de9fad75d72499b5ae19968a831a422608
-EBUILD systemd-254.5.ebuild 14819 BLAKE2B aa8d2c3ea7510b1579ae2386040c000a3be561913b33e4a036434701005efb3c1c3ae8ab6b5d44a8733bdcab0bc03008916ac0e431bfb9591598da957f06e6ee SHA512 1bb7226d88840b743d2813ef9abd462935586b37d594f5f7ad10f00efe1cf0fb2f1a5474458cb8667051c0644ac81ec22b2aa3fd0a1593e7e04bc757f2f8f9cc
-EBUILD systemd-9999.ebuild 13878 BLAKE2B daccb868d6a012322019329cd171c31a773e12cfb8838b2ad2e5107bba6caedd308c33559d310439b5e369be433c71682944f75e008df8e6c7ca1a2d3dba4c17 SHA512 095f8e6a23aaf20939a1eec930c5f4bdf122a1b3fe2320d9e4471294acc426f765e867d4e77839087f7066c0a33e4e905d94e7e03c551431e5bb955b38feeb0c
-MISC metadata.xml 2612 BLAKE2B 60495769a304d0623f73de8eb305770eb93706fdcbea158a2de2beb72e5d04495fc5ef45b4e55d3003a9a70bc3f60a7a5d6880aaac9512647132be69f96112ad SHA512 397f63a498b46647edfb665f92680197607de5edef42c3c17ab96abf94f117d82eda4863bf138329e25880609e8c631e9d154277e8a548eafbe87e8b83e47ccc
+EBUILD systemd-254.5-r1.ebuild 14964 BLAKE2B 5bde714048b0ba5ad7bd18c718a657f448f0fec150bf1ba40882500414b37dd4bbb6a88fc61aa3aebb1eb6d47b71b0b78bad2868959ce8df74d2b9531f99d28a SHA512 853e414190f6f1f4bc6c27eac86738a09788434f74095ca1781f007aa83c891feef99b359ccc4f12130bcec508e1424fd4283f2642a7d613b09758692e4c1814
+EBUILD systemd-9999.ebuild 14023 BLAKE2B 534827f44ee655a3a8a2eb4af2aa02012815d51f18fe3a32b5af90bbc9472b02b9b4d6a7bbb780ccf0541874677298b5df485b439dec5d7e2af12ee030ca0501 SHA512 2f08adb171c7cc86372b90956b0e45aff921e3502ccf819397cd12ae219b66cbd198ee428b2255edd8dd6aa880d18f3bc2ec4bdaa50993707ebe9af8266da37c
+MISC metadata.xml 2720 BLAKE2B 44456625ba29d7e5929d9f778bf5559a52a480eb10630b870029280532ea8ee204572161d55337d1b4dcfd7c4e20636f7f84a55326612b469b010a344eca0f14 SHA512 748db9ab9d477583377c55fad5ad5417f94b598f3c1479aac3735465a85a1004c9395d929450b3078f9d08f76963a4d5583333da0e81e2f8dbd8d5cb74882275
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 9576ddd514ee..abd1315edcc4 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -23,6 +23,7 @@
 		<flag name="http">Enable embedded HTTP server in journald</flag>
 		<flag name="importd">Enable import daemon</flag>
 		<flag name="iptables">Use libiptc from <pkg>net-firewall/iptables</pkg> for NAT support in systemd-networkd; this is used only if the running kernel does not support nftables</flag>
+		<flag name="kernel-install">Enable kernel-install</flag>
 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
 		<flag name="lz4">Enable lz4 compression for the journal</flag>
 		<flag name="openssl">Enable use of <pkg>dev-libs/openssl</pkg> for various features</flag>
@@ -32,6 +33,7 @@
 		<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
 		<flag name="tpm">Enable TPM support</flag>
+		<flag name="ukify">Enable systemd-ukify</flag>
 		<flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag>
 		<flag name="xkb">Depend on <pkg>x11-libs/libxkbcommon</pkg> to allow logind to control the X11 keymap</flag>
 	</use>
diff --git a/sys-apps/systemd/systemd-254.5.ebuild b/sys-apps/systemd/systemd-254.5-r1.ebuild
index 3fbd0bbf96e1..663677dee912 100644
--- a/sys-apps/systemd/systemd-254.5.ebuild
+++ b/sys-apps/systemd/systemd-254.5-r1.ebuild
@@ -36,9 +36,9 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="
 	acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnutls homed http idn importd iptables +kmod
+	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 vanilla xkb +zstd
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
 "
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -47,6 +47,8 @@ REQUIRED_USE="
 	homed? ( cryptsetup pam openssl )
 	importd? ( curl lzma || ( gcrypt openssl ) )
 	pwquality? ( homed )
+	boot? ( kernel-install )
+	ukify? ( boot )
 "
 RESTRICT="!test? ( test )"
 
@@ -124,7 +126,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=acct-user/systemd-resolve-0-r1
 	>=acct-user/systemd-timesync-0-r1
 	>=sys-apps/baselayout-2.2
-	boot? (
+	ukify? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep "${PEFILE_DEPEND}")
 	)
@@ -170,10 +172,8 @@ BDEPEND="
 	$(python_gen_cond_dep "
 		dev-python/jinja[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
-		boot? (
-			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
-			test? ( ${PEFILE_DEPEND} )
-		)
+		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+		ukify? ( test? ( ${PEFILE_DEPEND} ) )
 	")
 "
 
@@ -302,6 +302,7 @@ multilib_src_configure() {
 		$(meson_native_use_bool importd)
 		$(meson_native_use_bool importd bzip2)
 		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kernel-install)
 		$(meson_native_use_bool kmod)
 		$(meson_use lz4)
 		$(meson_use lzma xz)
@@ -319,6 +320,7 @@ multilib_src_configure() {
 		$(meson_native_use_bool selinux)
 		$(meson_native_use_bool tpm tpm2)
 		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool ukify)
 		$(meson_native_use_bool xkb xkbcommon)
 		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
 		# Breaks screen, tmux, etc.
@@ -408,10 +410,8 @@ multilib_src_install_all() {
 
 	gen_usr_ldscript -a systemd udev
 
-	if use boot; then
-		python_fix_shebang "${ED}"
-		secureboot_auto_sign
-	fi
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
 }
 
 migrate_locale() {
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7c6c59f40926..f4cfdbfefc00 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -36,9 +36,9 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="
 	acl apparmor audit boot cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnutls homed http idn importd iptables +kmod
+	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 vanilla xkb +zstd
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm ukify vanilla xkb +zstd
 "
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -47,6 +47,8 @@ REQUIRED_USE="
 	homed? ( cryptsetup pam openssl )
 	importd? ( curl lzma || ( gcrypt openssl ) )
 	pwquality? ( homed )
+	boot? ( kernel-install )
+	ukify? ( boot )
 "
 RESTRICT="!test? ( test )"
 
@@ -124,7 +126,7 @@ RDEPEND="${COMMON_DEPEND}
 	>=acct-user/systemd-resolve-0-r1
 	>=acct-user/systemd-timesync-0-r1
 	>=sys-apps/baselayout-2.2
-	boot? (
+	ukify? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep "${PEFILE_DEPEND}")
 	)
@@ -170,10 +172,8 @@ BDEPEND="
 	$(python_gen_cond_dep "
 		dev-python/jinja[\${PYTHON_USEDEP}]
 		dev-python/lxml[\${PYTHON_USEDEP}]
-		boot? (
-			>=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}]
-			test? ( ${PEFILE_DEPEND} )
-		)
+		boot? ( >=dev-python/pyelftools-0.30[\${PYTHON_USEDEP}] )
+		ukify? ( test? ( ${PEFILE_DEPEND} ) )
 	")
 "
 
@@ -300,6 +300,7 @@ multilib_src_configure() {
 		$(meson_native_use_bool importd)
 		$(meson_native_use_bool importd bzip2)
 		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kernel-install)
 		$(meson_native_use_bool kmod)
 		$(meson_use lz4)
 		$(meson_use lzma xz)
@@ -317,6 +318,7 @@ multilib_src_configure() {
 		$(meson_native_use_bool selinux)
 		$(meson_native_use_bool tpm tpm2)
 		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool ukify)
 		$(meson_native_use_bool xkb xkbcommon)
 		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
 		# Breaks screen, tmux, etc.
@@ -395,10 +397,8 @@ multilib_src_install_all() {
 		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
 	fi
 
-	if use boot; then
-		python_fix_shebang "${ED}"
-		secureboot_auto_sign
-	fi
+	use ukify && python_fix_shebang "${ED}"
+	use boot && secureboot_auto_sign
 }
 
 migrate_locale() {