13 files changed, 55 insertions, 28 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a25c606661aa..a552c7972b89 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 60ad4c6a0e81..39201bc16088 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,4 +1,4 @@
 AUX fwupd-efi-1.4-efi_ld_override.patch 1219 BLAKE2B f501bd949a82d28bc9daaef5b62e726e18825a081a584b50358e566b5c3af1eb0eaf409d17d5947b85b4f15098bb5d12025037ddb7a74489b88a945fc8eafbbc SHA512 31f966a7babdaa3a232ca86df065ff8e3724829455a9a3ce733bbd8454bd2f45cd3abf0b2526793a6b20b60ed9fce39f87f3528fd89c8c15093d016b65fb3784
 DIST fwupd-efi-1.4.tar.xz 35984 BLAKE2B 24ce9788500781aac5b856740dc17d94bec79cf57f4f1a0359f42e6be4b9600d34259794a88f69bf83aa38ee5976b26228b20813f717edce5cc627c163585b40 SHA512 c330409861a8c1e332a0d4fd49c54ef2c5bf7cdaca99d14de39b50fb35f0c490e9f7f7a4c9dd48181bd509cd358c43eb23659536aea93408c1fefb47629e4991
-EBUILD fwupd-efi-1.4.ebuild 1264 BLAKE2B 4d35c471519353411751957cd8a13714bf50d15b9130bc8c6ab6156645b666baf68c144e5c032b3aaf634cf04ddba219d8b59e4ffa42b035f305ef106fb23a7b SHA512 6117816905c51eb22a9f0f79a311ea6e55c010ac2ddd95e7f7980c8a8e2d318a5db55bb703a7d675a8c4d9ce7fa303105f0f63e4469671c0988b249d08642b1e
+EBUILD fwupd-efi-1.4.ebuild 1399 BLAKE2B 726e24909760f613d5557fc5503a8658a5828b119173ba587bfb4b30d818991b87870ad5b3459b58d3c889014f6df997adf022d54fbb2296478d35c99cdb0143 SHA512 37343ef8181e59ee67da8f8508c63e601f96695f4bbdd260f2b82587817c2b931de5b8eb54b00183c036f2c3e94205e72881ac2524cb7a0b854c81bd995849bb
 MISC metadata.xml 502 BLAKE2B 37525a0056ad72eab2b2b7b15436181a8581075053704012670e1f0434c8af74bd0780f16f31fa5cd2c8836bc2e4d8f55dfd5a77140be83ebffda5ca9e1a1382 SHA512 70ccf403ddb8e4d33ee9cc6ba438583d42ab313784c3251919b74a6596c4e3593263a6400513605c1004bc0d3ebb1677febc31449096b825f688ed1cc7052c31
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
index 873f7f279123..553f1fbfc16e 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit meson python-any-r1 toolchain-funcs
+inherit meson python-any-r1 secureboot toolchain-funcs
 
 DESCRIPTION="EFI executable for fwupd"
 HOMEPAGE="https://fwupd.org"
@@ -39,6 +39,11 @@ python_check_deps() {
 	python_has_version "dev-python/pefile[${PYTHON_USEDEP}]"
 }
 
+pkg_setup() {
+	python-any-r1_pkg_setup
+	secureboot_pkg_setup
+}
+
 src_prepare() {
 	default
 
@@ -58,3 +63,8 @@ src_configure() {
 
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+	secureboot_auto_sign
+}
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 9dc1b0ee0ba9..00c7f680941e 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -12,7 +12,7 @@ DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb6
 DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
 EBUILD systemd-utils-252.10.ebuild 11815 BLAKE2B d25fdb6b3ea15768a7894807906e8b9bdf97e11d45d07886eb8361d214de82494986efb9757fd7ffdbffeeb99495404340013c86d2a24e928c6b744e10b050f1 SHA512 bf6ad12b10422b678d3b2110e4e27249dedb1a997d5c283bb9f48c32d593f96343ae0031721053d911a77ebcd12a3e509574eeecb8ab11c7dda5037bf52dd2ed
 EBUILD systemd-utils-252.9.ebuild 11806 BLAKE2B 47a6f40881f6ed002bfa21c652dc0ddf6813bc74f842e33428241fdb26fb4f8948188f53589258146fcb0a865719e7aafe138a8854e70ea5f46aa87c7b9f0851 SHA512 3c5483674b0a468f0d0f1e4346ffc5f8f6d9c306a0a79d8908d440e837eff96cd8d032f98a521c016db48c9a5bb8bfea45306f83ae82587b92e556a8637282e4
-EBUILD systemd-utils-253.5.ebuild 11971 BLAKE2B 613fbd9a74a683892d36fc91ddea7dc2849fe698eaa85e56a594406cdadaa5483951c6ab5399569669e9580b271e8e3c14a78734300e0ff543fc9f5bdde273db SHA512 6aa3ecb99ff17ddf6b01da9a484d4e1ad42cb723be3affe594b6109598d83523a43938b9e8f4dd426937afa66c6197fbc4d1e96617f9b4e005a624cd681275c4
-EBUILD systemd-utils-253.6.ebuild 12096 BLAKE2B ee6c81f2517d49c099bbed2d6696253ae887f510637c26adb5263a87b9ed0936c9698a2c5e87e133a08ad81a5b5e068ff52fec354d7719b25ad6c2274e4739b2 SHA512 2fd8d818dcc40dfad192cbc55d77e84f5f3f6c062ec3f9ec14b75771f3024579eb8cc82bd44cffef0d4ef8a9a1a6bf09375478bbf542ca7a9e52d84714b2e8f3
-EBUILD systemd-utils-253.7.ebuild 12098 BLAKE2B 7ec47f163df41f5797a3d35045abc8c04bbba0a9942b9b540a69728bd33edd68c6af8b58e54fb6388946a840337ef31096df002019e7297455cc4ec2b4a2c17e SHA512 a3ef12fd1c71ff26a9b91428f39913ad583a48eeb52f1cf8368deb69570c9af0d13d4ce81bf7c9b91bbfa166f8c3d4869284ce4689a5e52c1c6a7f805884d860
+EBUILD systemd-utils-253.5.ebuild 12051 BLAKE2B 511960818a6e9fc2c0ed8d87f052a45cb25f833783d0478c0c0a39926e3971cd8fa44b9fa256a6e3b8cd3aa18e9fd879eaec50036272e5967c8b862a8490c239 SHA512 639bdd4d768a112be06f7cdb227b93ac2288462c614cbc9ab5e1d6a72784aace60a5d22743f13b2f409bf7bafe2f931cdb565c3792b9c0e81366bcc9788f90a0
+EBUILD systemd-utils-253.6.ebuild 12176 BLAKE2B 0a5b68aab6c9cb1b16a4de3bafbdccc91269921d7cab3b67a74513946ef86a7493a387009ced68f14029577504dcc496b272d32b6a04cd558995b3b53a7f38c3 SHA512 3d0b1c2aaf428b4df8dafcac39a1da389a8316a0b450a27dc5257d3effb85135e4d51f55735d7e7fde917976227526a8e70c01d9ac7c728d8daf8edd5631494e
+EBUILD systemd-utils-253.7.ebuild 12178 BLAKE2B 0702128e3569f12e0016cb95b65934ea36bf3f97589636f9c80f27d493c0e3c93d07808be3204a88fbd1249dda85c32792fa895ab68e3e988e548b4e955a7209 SHA512 71553c2636af3fc59e690192105e2f6d0776337486b869d7051e63ef9fa087b539c2283e63ea7a0f2d30d32dd2304bfbd734c5d80271ad679cbb459693067f2b
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
index 697439c0ae54..ce13ed37ce57 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
+inherit secureboot toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Utilities split out from systemd for OpenRC users"
 HOMEPAGE="https://systemd.io/"
@@ -113,6 +113,7 @@ pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
 		linux-info_pkg_setup
 	fi
+	use boot && secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -504,6 +505,8 @@ multilib_src_install_all() {
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/_udevadm
 	fi
+
+	use boot && secureboot_auto_sign
 }
 
 add_service() {
diff --git a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
index 6b7204dfdb49..794a24b4d0f1 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
+inherit secureboot toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Utilities split out from systemd for OpenRC users"
 HOMEPAGE="https://systemd.io/"
@@ -113,6 +113,7 @@ pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
 		linux-info_pkg_setup
 	fi
+	use boot && secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -506,6 +507,8 @@ multilib_src_install_all() {
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/_udevadm
 	fi
+
+	use boot && secureboot_auto_sign
 }
 
 add_service() {
diff --git a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
index 831a19ae7a53..49d0f39faa66 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.7.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-any-r1
-inherit toolchain-funcs udev usr-ldscript
+inherit secureboot toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Utilities split out from systemd for OpenRC users"
 HOMEPAGE="https://systemd.io/"
@@ -113,6 +113,7 @@ pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
 		linux-info_pkg_setup
 	fi
+	use boot && secureboot_pkg_setup
 }
 
 src_prepare() {
@@ -506,6 +507,8 @@ multilib_src_install_all() {
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/_udevadm
 	fi
+
+	use boot && secureboot_auto_sign
 }
 
 add_service() {
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 3dd56a956209..5f4a7e67e737 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -13,10 +13,10 @@ DIST systemd-stable-253.6.tar.gz 12069024 BLAKE2B 7dfb28127bf6c091180a6cfbae1eb6
 DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1
 EBUILD systemd-253.3-r1.ebuild 14579 BLAKE2B ec9e31176bad8f142e224369a868b275facb3d3f48e26a9753efd89f40af5c107e70febbbf79fffbefcfe174e258ffae6175e23dde6c3105cec40ec60e5aee7b SHA512 f25ca4b5fbeee20f1137ea9cdf7305a8eb41814ab10946bb3fbacb4bbd9aa5f03fe804119c76e5b4c05abc8b7abb2b5ed9d40dea300b009ca8dab774239b7069
 EBUILD systemd-253.4.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a416925cb0d2e5afc9972708efece0e65a52beae8870091cfca24751b741cabac2bb0934f16f90ea48e59eb67d1 SHA512 0877b4c30e086c98fdeae3a9beb56cc97aab0b5467882dcae748af1a639e551d2fa937f9acfe2f4bc16b663e45ef8efdb7e84cc358cc944fde0fd0334c8427af
-EBUILD systemd-253.5-r1.ebuild 14638 BLAKE2B bb5ed4957e83a475bd623082ddfd0eee83c64caeffaac19db420682020c7c96bf712284f8391d337a687e343293c1068fb8351c3150d12159027233e6a77eca9 SHA512 7f633ea7d5330c725a6af618e19194d1ff2c7c42f4168aedf5af7bb7fd9c52a67aa0fafe881fe65044dfc0d7bb4edc3f8475079d88bbc31d40bf7bdc247a005c
+EBUILD systemd-253.5-r1.ebuild 14719 BLAKE2B 6cd3532df5b775aa0f4a73029d0c31c74e652a8dcd94a8a4e9d915e136d8be8c5609dd0358aefbb23ebafece8e5ad59c59bb07cb44cbd19b7023237b5fe101b4 SHA512 24409d8d9f1160e486780b225c4c6ecf84912eee74f6d6c3a2360e65587202450d844b1c3f1ee31eba07ccee599bfb844dc4ee783ed0663c3fd3e69b88b41127
 EBUILD systemd-253.5.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a416925cb0d2e5afc9972708efece0e65a52beae8870091cfca24751b741cabac2bb0934f16f90ea48e59eb67d1 SHA512 0877b4c30e086c98fdeae3a9beb56cc97aab0b5467882dcae748af1a639e551d2fa937f9acfe2f4bc16b663e45ef8efdb7e84cc358cc944fde0fd0334c8427af
-EBUILD systemd-253.6.ebuild 14586 BLAKE2B 4cc363989883425fddb11441806c6e2803a933cf1d04c643c6039aab4b891477faad1c3d0815237ce4e8c187b40ffe3ef67d8a2b46eedf9976410399590189e4 SHA512 c05dfc1f5c6504c0f45fa58afd21738fa7729058b87035a1aaf33aa64babdd5cd244346fbd02d7c01484f59eb0b80027ae1d0e3adf13b38fd06c16f909a33b8f
-EBUILD systemd-253.7.ebuild 14588 BLAKE2B ac789628c1caa53681c78be188c85a660fd61a416925cb0d2e5afc9972708efece0e65a52beae8870091cfca24751b741cabac2bb0934f16f90ea48e59eb67d1 SHA512 0877b4c30e086c98fdeae3a9beb56cc97aab0b5467882dcae748af1a639e551d2fa937f9acfe2f4bc16b663e45ef8efdb7e84cc358cc944fde0fd0334c8427af
-EBUILD systemd-254_rc2.ebuild 14691 BLAKE2B 5ef1a87fcdff83d099d6b8e8dc7c381d111e7ffd9c7465083ae4a554fd7ce37006408bf95c8d19f4f8651ebc7f6a496188d6b9973efe6059fd9ab7dfb932b820 SHA512 791305b1abd083dff0f1ab38b65f3c8caaa606e721aa7ec079264b58e313d49ccdda4347b29761528769e1110f1cd31adf3207dedfe11a702a4b751bd413991d
-EBUILD systemd-9999.ebuild 14690 BLAKE2B c321f644f0274c5a6d009dab5434788d1861da71462384b72558a69265aa2190726a7e096dd0887314a9409a1a3cba7d5906cf4b56208a64bd73f7e7f1cf8d84 SHA512 5fa723a8c3a15e12d8c4313c21666dcd7fe8b8f779f42d0d9327277e5210ec6156e0063074628aa42010ccff1067086941beb776fd257748e87e99b648081b11
+EBUILD systemd-253.6.ebuild 14667 BLAKE2B 3b154c55c573e2306f871c362f3d7207fb9b7efee374f118cf4b94477a3e01060b473b293fe86d3ba0923fd9cd7d9e9f8b06490f59514002caadf1b203387e7d SHA512 3c39c8742b35540bb7d70e9277876c10e648e78d4e549cb65bb0a4b843aca3bbea91ee39e0698b294415e9e77dd6c7f350497fe5f841619e11cd2301950bafc0
+EBUILD systemd-253.7.ebuild 14669 BLAKE2B 106db6ca3073de27cd0f7c72b30397da77cbd98dfe1d1357f67d39f61e722c47d7fd5b3b7378e329883e9894cfe90159f3db50400ca5d791b438907b00b797b3 SHA512 56e632a1f7d396607df97f3bfbde8e85ed4534b69b341e196356adf26f932f54db0bde0365ea5e4ef8c84e36662b61b7465ba4b3336c0eebbaa3932554c13eaa
+EBUILD systemd-254_rc2.ebuild 14756 BLAKE2B b2614d70d6b3eca4121550a470c8b90f037d94f8abf027efbdbb2fd3fcaf922ef86bdcc94dd999d6f07696578e6f90ffd89c7c134680346e80f703b1168ccbef SHA512 31262bead78e4a8292f48d087dd08a281c8f76e2ddb9a2b6ef8a8f27df7987928c8495668b1cf07213e8a4043e977eb1a8c73a471b62878572ef6418c443a648
+EBUILD systemd-9999.ebuild 14755 BLAKE2B cceb8d7ff09750615299d8331ae02f3630f3bd7ada076ab6e464d3fecc592fa0e05c74e90eca9bf96aaddc925268eebcfb9a9d2deac56cdbb7e25a0f3faf451b SHA512 90ecdde3793a664b66d980f84eb4ea9a6616c5c04ff50676234c12402071b0ec49a876740de9c6e7665b8feefe0cdcebe60e32727e8d3c67bbea35cc81b0d9ca
 MISC metadata.xml 2612 BLAKE2B 60495769a304d0623f73de8eb305770eb93706fdcbea158a2de2beb72e5d04495fc5ef45b4e55d3003a9a70bc3f60a7a5d6880aaac9512647132be69f96112ad SHA512 397f63a498b46647edfb665f92680197607de5edef42c3c17ab96abf94f117d82eda4863bf138329e25880609e8c631e9d154277e8a548eafbe87e8b83e47ccc
diff --git a/sys-apps/systemd/systemd-253.5-r1.ebuild b/sys-apps/systemd/systemd-253.5-r1.ebuild
index 302a40317155..684c214f6aaa 100644
--- a/sys-apps/systemd/systemd-253.5-r1.ebuild
+++ b/sys-apps/systemd/systemd-253.5-r1.ebuild
@@ -26,8 +26,8 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-inherit bash-completion-r1 linux-info meson-multilib pam
-inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1
+inherit secureboot systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://systemd.io/"
@@ -222,7 +222,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	:
+	use gnuefi && secureboot_pkg_setup
 }
 
 src_unpack() {
@@ -409,6 +409,8 @@ multilib_src_install_all() {
 	fi
 
 	gen_usr_ldscript -a systemd udev
+
+	use gnuefi && secureboot_auto_sign
 }
 
 migrate_locale() {
diff --git a/sys-apps/systemd/systemd-253.6.ebuild b/sys-apps/systemd/systemd-253.6.ebuild
index 9196c2effc6c..448f69d1f790 100644
--- a/sys-apps/systemd/systemd-253.6.ebuild
+++ b/sys-apps/systemd/systemd-253.6.ebuild
@@ -26,8 +26,8 @@ else
 	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
-inherit bash-completion-r1 linux-info meson-multilib pam
-inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1
+inherit secureboot systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://systemd.io/"
@@ -222,7 +222,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	:
+	use gnuefi && secureboot_pkg_setup
 }
 
 src_unpack() {
@@ -408,6 +408,8 @@ multilib_src_install_all() {
 	fi
 
 	gen_usr_ldscript -a systemd udev
+
+	use gnuefi && secureboot_auto_sign
 }
 
 migrate_locale() {
diff --git a/sys-apps/systemd/systemd-253.7.ebuild b/sys-apps/systemd/systemd-253.7.ebuild
index 72824b08e850..cf50cf37cc92 100644
--- a/sys-apps/systemd/systemd-253.7.ebuild
+++ b/sys-apps/systemd/systemd-253.7.ebuild
@@ -26,8 +26,8 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-inherit bash-completion-r1 linux-info meson-multilib pam
-inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1
+inherit secureboot systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://systemd.io/"
@@ -222,7 +222,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	:
+	use gnuefi && secureboot_pkg_setup
 }
 
 src_unpack() {
@@ -408,6 +408,8 @@ multilib_src_install_all() {
 	fi
 
 	gen_usr_ldscript -a systemd udev
+
+	use gnuefi && secureboot_auto_sign
 }
 
 migrate_locale() {
diff --git a/sys-apps/systemd/systemd-254_rc2.ebuild b/sys-apps/systemd/systemd-254_rc2.ebuild
index 934ffc6b8a6b..79a152ddc472 100644
--- a/sys-apps/systemd/systemd-254_rc2.ebuild
+++ b/sys-apps/systemd/systemd-254_rc2.ebuild
@@ -26,8 +26,8 @@ else
 	#KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-inherit bash-completion-r1 linux-info meson-multilib pam
-inherit python-single-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 linux-info meson-multilib pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://systemd.io/"
@@ -230,7 +230,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	:
+	use boot && secureboot_pkg_setup
 }
 
 src_unpack() {
@@ -416,6 +416,7 @@ multilib_src_install_all() {
 
 	if use boot; then
 		python_fix_shebang "${ED}"
+		secureboot_auto_sign
 	fi
 }
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 683026ece4c8..1b78026dc881 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -26,8 +26,8 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-inherit bash-completion-r1 linux-info meson-multilib pam
-inherit python-single-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 linux-info meson-multilib pam python-single-r1
+inherit secureboot systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="http://systemd.io/"
@@ -230,7 +230,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	:
+	use boot && secureboot_pkg_setup
 }
 
 src_unpack() {
@@ -416,6 +416,7 @@ multilib_src_install_all() {
 
 	if use boot; then
 		python_fix_shebang "${ED}"
+		secureboot_auto_sign
 	fi
 }