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

4 files changed, 27 insertions, 25 deletions

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() {