gentoo auto-resync : 24:03:2025 - 00:31:53

5 files changed, 2 insertions, 35 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index f8a77c341837..a45b26ffc98b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 828653b21040..6b0c67a34034 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -10,6 +10,6 @@ DIST gnu-efi-4.0.0.tar.gz 228852 BLAKE2B 30a22785b43b586596e9b4cfd28181571552918
 EBUILD gnu-efi-3.0.15.ebuild 1917 BLAKE2B cd98c39082b4d0e8bdf2181738b81a115842eb303ec196569a5beff5212339b20f13ec62a6f4a31fa14db3cd3f3d9fd22c0d7ade1eec40e7eea87d1ea86a8193 SHA512 fb622477b316beb65ad1e187920ab75df0d646410f8e953971b8cff9e162b4a80ef911cde2b239faf0b196b5ecb14b3d4105429be3154949036ee921679e0b16
 EBUILD gnu-efi-3.0.17.ebuild 1948 BLAKE2B 6e9c1ea853cd12b47e60c25e889306698dbfba6cffb10fd7f7bac0ef3410d882559659d3f6f23f953d8c9071930a41875b0c75ca17b871bd3c852af891457dc3 SHA512 b5b46e15baca02080f3236ab796c8dfbed0c2cdf31593e9810304a9a853091492e47adb9429a7a82da6b50de5c6917f8a61a4588e78190d70af970d8126eb58e
 EBUILD gnu-efi-3.0.18-r5.ebuild 3870 BLAKE2B 310a7d020e19383faada9e5c5fd8475330b90e747e88d4bc1b6e73e0f91f26faf99376e901ce9706f75d5c011286e803135bd98f5490aac79960f208200536bc SHA512 b0ec2b61f890c93e38e7ad0846497b83dc99448ab6dbb4c39e286cfced1181184b220cd91e130f521e073ad0db883e4d3ecfdae3e18c7120022f9f0d524abe89
-EBUILD gnu-efi-3.0.19.ebuild 3993 BLAKE2B abc4a6c1c71a0b5a1e63e8d373f6a3f30b78a4f5aedc4bd67c681113707c77f7b7d1531ca108bbb74074b2d25f36d594796085488012664a92305e7523d2e0c5 SHA512 0f3868a5e58d7f56a2d342327657a13eddacd1dc4f56d0641b209d3ac35253ca9f68c7001e966508db523a730314f29e84adba15ee1d56a1ac980a17c5f522e0
+EBUILD gnu-efi-3.0.19.ebuild 3989 BLAKE2B 0744f67baf4cf11607e2edd44b288fb4d7e6b11f67e5ec9e7047bbdd5c8b6972f9aa01a6324a24fca63b8d669fd627bf308862aaff06896591e6650c68bad5aa SHA512 db6ca92b104ad4ae41ffdb49194d58e6b860421e116e9f02314b588adaee4612199647dd8046eb85ef9f21a904a873bf06e734668e73560d37325b37c1c68ed6
 EBUILD gnu-efi-4.0.0.ebuild 3985 BLAKE2B ba2e972bbd65c31f47a71921814e2437b95962e546715fe88628199855dd7716ca2cffaec020185891a8d473613f0aecbd3976668a54346fed62483a781ecd2d SHA512 0e6c8e4fb0aba21ac8f2107b3eeb1da510fe4f25f7cb3dd5a476c9551ec71a2cb81213d1a350bb36fb92d10f3b37aa8829a63c9af3fb597adb6a77e827668078
 MISC metadata.xml 381 BLAKE2B a3cbadc2ae97d29ac87c04f3209cd7f4879ef70903907f319b425f038f07fd6bbc357a0291e70909a3b0b2097de6b63daf0f568d0fd7097c7bd2d9c9c7f3a963 SHA512 abbdda69a47f94442977af7491596e40873767256f5e75c3c06b614a369ec8cb7103a132e77a95c99ba24e4b205e5c3fc267039c920c1268a19b17e4ac779b79
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
index d081e78f9e08..8a02c4f63f01 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ncroxon/gnu-efi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="-* amd64 arm arm64 ~loong ~riscv x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 REQUIRED_USE="
 	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
index 40b14b51bf40..131c5e77c2b9 100644
--- a/sys-boot/shim/Manifest
+++ b/sys-boot/shim/Manifest
@@ -1,9 +1,5 @@
-DIST shim-aa64-15.6-2.aarch64.rpm 466804 BLAKE2B 706f31835be24fee7202b8f8eb49204741d7726f106fad993ff524f475434ab3f23bebcd427f8a2aa4cd9a9c2494fdec9c2a49c29025364f0ebe989786f74c2f SHA512 72c2a62f380e76c3ea0fe5b13ef4e4bcd5e62e1b26b0b277c6ed8dd5d5e76f0f92770497da09e8ce12e6c60ee57d679d134f960a10639644dd751811563f1f29
 DIST shim-aa64-15.8-3.aarch64.rpm 466590 BLAKE2B ebd77148d363020d14b418dbb3107981b213b39914daa80765cc2db16c7b365eaebcbcba19b88459364967f2764f417aeffd34754aa92c2efc7aaa4e9d45b712 SHA512 d9b879706f7f6c7f7bfea92a443191811d39835074b3b6db3979c707b406b00884baff66ac79bf9bd66869240f668c6e6f987f8954a570d648933c85ea0da1c2
-DIST shim-ia32-15.6-2.x86_64.rpm 419081 BLAKE2B f7160dd1330bfd7ad2d64cfe370750f576f1e3291aa8bc8313d52869f3dd23228db8514e7578c2609428479e430a1d39c1992450f4f42197216c00c420a0a150 SHA512 045325802474f53c6e86eff1166f1a966268c9ad706fac4c08966f211dbc32fba21ed3a07c46445ec579ac1e2819a1313ff54d6169737806954962945c61bdc2
 DIST shim-ia32-15.8-3.x86_64.rpm 422489 BLAKE2B 00aa14d10ac0351e39f2b7bb2da6b31e048757ee9413b73f5a1638688e2b242c161b39b5d897c9414e435caab13456763dbe2c6bc46061ab3c29e14ab487e587 SHA512 10ef47014637f9df9f199d90e3869e96341723c23628cfd22465638028cc38b006a003c41ea7fd7f1885e4cb573a2f23034a237ea03ba231f8f0d37573bb2e23
-DIST shim-x64-15.6-2.x86_64.rpm 479835 BLAKE2B 7d12b97275c25659f94a8dd4c8678eb7df9e11fd3258966cb65c762467f28744b9403e13d5b5c98d6d6a5244ce4d81ef31b9d802040be99da03c1bb56be21275 SHA512 971978bddee95a6a134ef05c4d88cf5df41926e631de863b74ef772307f3e106c82c8f6889c18280d47187986abd774d8671c5be4b85b1b0bb3d1858b65d02cf
 DIST shim-x64-15.8-3.x86_64.rpm 478432 BLAKE2B cf1a032af75fc17e09444aae488c2921a8f0868d91ceb427835cd0378f6c7369e223b7fc08f0a596774b374e3f800b9ec941792e522d8c5281a395cf800c642a SHA512 4c3635d82980ccb604b568f072f30ac0c0055c6ed2985dade6a28c9070852a240bb33f15f9ef42c83fa46d212c18ae6f17abca9f3adda0a332b908ceda537e87
-EBUILD shim-15.6.ebuild 1100 BLAKE2B e835be1913762f2479311f78f28dd49e1bb647389f2a1eb3859dd0de05cffada8cc06f6def8a9c0ac0781faf9ef9ded80734e165bd3a32a66fcc7a5b6a9f54e0 SHA512 5a81058ce46f3bfaebaba9ecb5833717aa739551158b7154e2cb72e87d358dd7a41957464b15752d1fc47c49a3da30e37c761d0e9b4ce34d2c9394f351b2e951
 EBUILD shim-15.8.ebuild 1100 BLAKE2B de27e4b493af2b5a3cfc0aed262cfbf80780cfe9f42618df53716aac97ce9eb42f92b41fecbf083fc7ccc460a86cbbc9d33e7d498863d9a22bf19469cd27c097 SHA512 5429801e342dd19ae353dd77b644e3f2eccb1cd0352a6c872008d5878eac31139fd21c270934d6eceddba3ba3ae23f9055e33f5e711d0dabb68d8dde0c8e5360
 MISC metadata.xml 379 BLAKE2B b6eb0f18d22675a68c22cb8cffe964bb21d65fa2f2958740aab82cb96ced8922f7c0163aab8d19f9c9815bc237a9f841c2deb5391a7715c55f591742b4f8ca3c SHA512 d1283d44596721c8ac5c4e812124bf167cd3c834ef63d5a48917ab7995b69751a8400b00608eea1888ee9dab4dcb26a055664aa7feca6d2e8647c0bc7c2c0c24
diff --git a/sys-boot/shim/shim-15.6.ebuild b/sys-boot/shim/shim-15.6.ebuild
deleted file mode 100644
index fc117bf9f5c5..000000000000
--- a/sys-boot/shim/shim-15.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit rpm secureboot
-
-DESCRIPTION="Fedora's signed UEFI shim"
-HOMEPAGE="https://src.fedoraproject.org/rpms/shim"
-SRC_URI="amd64? ( https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-x64-${PV}-2.x86_64.rpm
-				https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-ia32-${PV}-2.x86_64.rpm )
-		x86? ( https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-x64-${PV}-2.x86_64.rpm
-				https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/x86_64/shim-ia32-${PV}-2.x86_64.rpm )
-		arm64? ( https://kojipkgs.fedoraproject.org/packages/shim/${PV}/2/aarch64/shim-aa64-${PV}-2.aarch64.rpm )"
-S="${WORKDIR}/boot/efi/EFI"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins BOOT/BOOT*.EFI
-	doins fedora/mm*.efi
-
-	# Shim is already signed with Microsoft keys, but MokManager still needs
-	# signing with our key otherwise we have to enrol the Fedora key in Mok list
-	secureboot_auto_sign --in-place
-}