gentoo auto-resync : 21:03:2024 - 01:00:11

3 files changed, 10 insertions, 10 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b77f221336e4..5add65c34bfd 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 851f104ddd28..1720c1495a2f 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,7 +1,7 @@
 DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38
 DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
-DIST installkernel-30.tar.gz 20945 BLAKE2B 1363545c06f368c8efed4f0fb026a68fbe1d34019573ca9bdd3eaaa2b2c83232c0b23c41351f8bef287d47a3c07aa20ce8900d5b452213d30c412617d33ef114 SHA512 2e506c018c255f23a81ca5bfb7e82c2ebf6a949be67d7876ac63b29773b630543225d1fc4a07f074f43b7e866381c654eb9a85ff3d8e2ced5d2c05c9a6afd412
+DIST installkernel-33.tar.gz 20734 BLAKE2B a1ac65c1122341fcaeb4e05980873b8025a4878100a732164286f737aeb8e2ff7f1593143a5482f9a79ef6e5343e3da8e125677f12adf05ad9b63995bf3ca865 SHA512 c75fc9de36bb2fae21571edf6daebfd2e5f5479860d31697f2e623d023af48728a964f7c9b998f4c2359dc4ab9463bfc5374f686108e2247441b94b71aefeb69
 EBUILD installkernel-25.ebuild 4731 BLAKE2B 56cce11d6b06595043f7f6a30409ddf4e9c8126a1ee5ac2495f2021f93bc6bfe7db4ad14a163580173dad37008daf6f3179a6b086eb0e28946041a2bf005ba06 SHA512 f35ea8d7094d530f64013241e7c71273de9b1d7d7264d50b964ff1bd55191107bef43fd924189ab5654e500d0b6a0344e40f929ae3cfac47a5c79369eef2e4d9
 EBUILD installkernel-28.ebuild 4910 BLAKE2B bcd58c179e6497da6d3848028879957b3d02b59983b8fbe26bfb2ee86d51aa06e02e89d6e9b1875eff7ff13fa17f0a478661f10749e978c13b60dd5b55fb9d7e SHA512 c0291648ca9fc91ff166871e21285dbba0994aff42bb6b1632bea47cde2b1a8ae36c9c6189a3239e9651d4c688d3599ab1d49f566bf60acabf49fc780b23a2b6
-EBUILD installkernel-30.ebuild 5931 BLAKE2B bed970d0ed10a099d3df282988248bb2f5567c474150dc3a1079bad949e82909bb5b5b370954f5e08858eadbecdbdedb1defec13744fd61d0a14ac977b8127ef SHA512 f5d4b5a7e8429e944bc926dd32abbc4eaa1171dffe097c2103013328f47a9de503775f461678560b9729ddbb673b24acbadc3610436e2c793618757a1d3db7a6
+EBUILD installkernel-33.ebuild 5841 BLAKE2B 937eee705724f23d247f6fed4a2432e63a09eb607cb0c5f8b6abc2206dd5edb94349b0d979a3d1bc3618ede0a492a7047c92f4a641949c03ba24f4dbfac0a3c3 SHA512 c452a758850a673a45e13063bf23da87600ef94fa0cab2aa5b7c2f701294a68d624c4d894f6d002b52f32f30d542343fe9a05531c36f084460c59972d2eb1fc1
 MISC metadata.xml 1288 BLAKE2B a80d5022072c362c1787723b7222638f01993675f5c3bbc87962d998497dcd1673664ef4802cb8b3bce7ad81825521be1747c00f6ef5f5e1c9e2d976b09c8d85 SHA512 d51a5b1c5977049a9a499c2f7edcd95ea5e2b47c4fb49fa76d3df9839b2ad7652bbfff41fae823da3b86a52f2b9cb120759a15e5e9967e7b1148ea3bc92ed793
diff --git a/sys-kernel/installkernel/installkernel-30.ebuild b/sys-kernel/installkernel/installkernel-33.ebuild
index 9ba8f5cf4c74..f6c3c526454e 100644
--- a/sys-kernel/installkernel/installkernel-30.ebuild
+++ b/sys-kernel/installkernel/installkernel-33.ebuild
@@ -19,7 +19,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="dracut efistub grub refind systemd systemd-boot uki ukify"
 REQUIRED_USE="
-	efistub? ( systemd )
 	systemd-boot? ( systemd )
 	ukify? ( uki )
 	?? ( efistub grub refind systemd-boot )
@@ -41,10 +40,12 @@ RDEPEND="
 		)
 	)
 	efistub? (
-		>=app-emulation/virt-firmware-24.2_p20240315-r2
-		|| (
-			sys-apps/systemd[boot(-)]
-			sys-apps/systemd-utils[boot(-)]
+		systemd? (
+			>=app-emulation/virt-firmware-24.2_p20240315-r2
+			|| (
+				sys-apps/systemd[boot(-)]
+				sys-apps/systemd-utils[boot(-)]
+			)
 		)
 	)
 	grub? ( sys-boot/grub )
@@ -90,7 +91,6 @@ src_install() {
 	use ukify && doexe hooks/60-ukify.install
 
 	exeinto /usr/lib/kernel/postinst.d
-	use uki && doexe hooks/90-uki-copy.install
 	use grub && doexe hooks/91-grub-mkconfig.install
 	use refind && doexe hooks/95-refind-copy-icon.install
 
@@ -98,8 +98,8 @@ src_install() {
 	doexe hooks/systemd/00-00machineid-directory.install
 	doexe hooks/systemd/10-copy-prebuilt.install
 	doexe hooks/systemd/90-compat.install
-	use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
 	use grub && doexe hooks/systemd/91-grub-mkconfig.install
+	use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install
 	use refind && doexe hooks/systemd/95-refind-copy-icon.install
 
 	if use systemd; then
@@ -185,7 +185,7 @@ pkg_postinst() {
 		fi
 	fi
 
-	if use efistub && ! has_version "${CATEGORY}/${PN}[efistub]"; then
+	if use efistub; then
 		ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations"
 		ewarn "often differ between vendors and as a result EFI stub booting is not"
 		ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method"