2024-10-10 16:48:52 UTC

6 files changed, 36 insertions, 23 deletions

diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202202 b/metadata/md5-cache/sys-firmware/edk2-202202
index f9f9a680e669..d24898dec7d6 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202202
+++ b/metadata/md5-cache/sys-firmware/edk2-202202
@@ -1,4 +1,4 @@
-BDEPEND=app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( dev-lang/python:3.11[sqlite] dev-lang/python:3.10[sqlite] ) secureboot? ( app-crypt/sbsigntools dev-libs/openssl )
+BDEPEND=app-emulation/qemu >=dev-lang/nasm-2.0.7 sys-apps/which >=sys-power/iasl-20160729 || ( dev-lang/python:3.11[sqlite] dev-lang/python:3.10[sqlite] ) secureboot? ( app-crypt/sbsigntools dev-libs/openssl )
 DEFINED_PHASES=compile install postinst prepare setup
 DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=8
@@ -7,8 +7,8 @@ INHERIT=python-any-r1 readme.gentoo-r1 secureboot
 IUSE=secureboot
 KEYWORDS=-* amd64
 LICENSE=BSD-2 MIT
-RDEPEND=!sys-firmware/edk2-ovmf-bin
+RDEPEND=!sys-firmware/edk2-bin
 SLOT=0
 SRC_URI=https://github.com/tianocore/edk2/archive/edk2-stable202202.tar.gz -> edk2-ovmf-202202.tar.gz https://github.com/openssl/openssl/archive/d82e959e621a3d597f1e0d50ff8c2d8b96915fd7.tar.gz -> openssl-d82e959e621a3d597f1e0d50ff8c2d8b96915fd7.tar.gz https://github.com/google/brotli/archive/f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz -> brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz https://dev.gentoo.org/~ajak/distfiles/edk2-ovmf-202202-qemu-firmware.tar.xz
 _eclasses_=multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	python-utils-r1	c356a67b8e93889de6efff7d50599102	python-any-r1	f7b9a2fa38c69a9c2a7ad8fc9283ccf7	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	secureboot	b77b70edf988076b4776734f77b4f8c9
-_md5_=ee8592dc95579a4d8dfc93ee0738834e
+_md5_=104f06673ee46d10ab6f649bfff29e53
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202405 b/metadata/md5-cache/sys-firmware/edk2-202405
index 7bd7d50fe744..c0cd70e9de84 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202405
+++ b/metadata/md5-cache/sys-firmware/edk2-202405
@@ -1,4 +1,4 @@
-BDEPEND=app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( dev-lang/python:3.12[sqlite] ) secureboot? ( app-crypt/sbsigntools dev-libs/openssl )
+BDEPEND=app-emulation/qemu >=dev-lang/nasm-2.0.7 sys-apps/which >=sys-power/iasl-20160729 || ( dev-lang/python:3.12[sqlite] ) secureboot? ( app-crypt/sbsigntools dev-libs/openssl )
 DEFINED_PHASES=compile install postinst prepare setup
 DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=8
@@ -7,8 +7,8 @@ INHERIT=python-any-r1 readme.gentoo-r1 secureboot
 IUSE=secureboot
 KEYWORDS=-* ~amd64
 LICENSE=BSD-2 MIT
-RDEPEND=!sys-firmware/edk2-ovmf-bin
+RDEPEND=!sys-firmware/edk2-bin
 SLOT=0
 SRC_URI=https://github.com/tianocore/edk2/archive/edk2-stable202405.tar.gz -> edk2-ovmf-202405.tar.gz https://github.com/openssl/openssl/archive/de90e54bbe82e5be4fb9608b6f5c308bb837d355.tar.gz -> openssl-de90e54bbe82e5be4fb9608b6f5c308bb837d355.tar.gz https://github.com/google/brotli/archive/f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz -> brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/370b5944c046bab043dd8b133727b2135af7747a.tar.gz -> mipi-sys-t-370b5944c046bab043dd8b133727b2135af7747a.tar.gz https://github.com/Mbed-TLS/mbedtls/archive/8c89224991adff88d53cd380f42a2baa36f91454.tar.gz -> mbedtls-370b5944c046bab043dd8b133727b2135af7747a.tar.gz https://github.com/DMTF/libspdm/archive/828ef62524bcaeca4e90d0c021221e714872e2b5.tar.gz -> libspdm-370b5944c046bab043dd8b133727b2135af7747a.tar.gz https://dev.gentoo.org/~ajak/distfiles/edk2-ovmf-202202-qemu-firmware.tar.xz
 _eclasses_=multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	python-utils-r1	c356a67b8e93889de6efff7d50599102	python-any-r1	f7b9a2fa38c69a9c2a7ad8fc9283ccf7	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	secureboot	b77b70edf988076b4776734f77b4f8c9
-_md5_=24912b610928c3f634997181f59a1a70
+_md5_=5e3977cbfa045f43e9aa6b4ee22d49dc
diff --git a/metadata/md5-cache/sys-firmware/edk2-202408 b/metadata/md5-cache/sys-firmware/edk2-202408
new file mode 100644
index 000000000000..3a002325e925
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/edk2-202408
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.13[sqlite] dev-lang/python:3.12[sqlite] ) app-emulation/qemu app-emulation/virt-firmware >=sys-power/iasl-20160729 amd64? ( >=dev-lang/nasm-2.0.7 ) secureboot? ( app-crypt/sbsigntools dev-libs/openssl )
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DESCRIPTION=TianoCore EDK II UEFI firmware for virtual machines
+EAPI=8
+HOMEPAGE=https://github.com/tianocore/edk2
+INHERIT=edo prefix python-any-r1 readme.gentoo-r1 secureboot toolchain-funcs
+IUSE=secureboot
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=BSD-2 MIT
+RDEPEND=!sys-firmware/edk2-bin
+SLOT=0
+SRC_URI=https://github.com/tianocore/edk2/archive/edk2-stable202408.tar.gz -> edk2-202408.tar.gz https://github.com/google/brotli/archive/f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz -> brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz https://github.com/DMTF/libspdm/archive/50924a4c8145fc721e17208f55814d2b38766fe6.tar.gz -> libspdm-50924a4c8145fc721e17208f55814d2b38766fe6.tar.gz https://github.com/Mbed-TLS/mbedtls/archive/8c89224991adff88d53cd380f42a2baa36f91454.tar.gz -> mbedtls-8c89224991adff88d53cd380f42a2baa36f91454.tar.gz https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/370b5944c046bab043dd8b133727b2135af7747a.tar.gz -> mipi-sys-t-370b5944c046bab043dd8b133727b2135af7747a.tar.gz https://github.com/openssl/openssl/archive/de90e54bbe82e5be4fb9608b6f5c308bb837d355.tar.gz -> openssl-de90e54bbe82e5be4fb9608b6f5c308bb837d355.tar.gz amd64? ( https://uefi.org/sites/default/files/resources/x64_DBXUpdate_05092023.bin https://uefi.org/sites/default/files/resources/x64_DBXUpdate.bin -> x64_DBXUpdate_05092023.bin ) arm64? ( https://uefi.org/sites/default/files/resources/arm64_DBXUpdate_05092023.bin https://uefi.org/sites/default/files/resources/arm64_DBXUpdate.bin -> arm64_DBXUpdate_05092023.bin https://github.com/devicetree-org/pylibfdt/archive/cfff805481bdea27f900c32698171286542b8d3c.tar.gz -> pylibfdt-cfff805481bdea27f900c32698171286542b8d3c.tar.gz )
+_eclasses_=edo	367e103a74bf77e6a8da7894d999fa3c	prefix	c3c4c93ebda319c0fa7ed6f942ba1010	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	python-utils-r1	c356a67b8e93889de6efff7d50599102	python-any-r1	f7b9a2fa38c69a9c2a7ad8fc9283ccf7	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	secureboot	b77b70edf988076b4776734f77b4f8c9
+_md5_=8e9bb994cd1bde4cef667ba1dbe20755
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-bin-202202 b/metadata/md5-cache/sys-firmware/edk2-bin-202202
index 89c3c23317aa..5146745b2e0f 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-bin-202202
+++ b/metadata/md5-cache/sys-firmware/edk2-bin-202202
@@ -7,8 +7,8 @@ INHERIT=readme.gentoo-r1 secureboot
 IUSE=secureboot
 KEYWORDS=amd64 arm64 ~loong ~ppc ppc64 ~riscv x86
 LICENSE=BSD-2 MIT
-RDEPEND=!sys-firmware/edk2-ovmf
+RDEPEND=!sys-firmware/edk2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ajak/distfiles/edk2-ovmf-202202-1.xpak
 _eclasses_=readme.gentoo-r1	b045f3acf546393ab6b3170781875358	secureboot	b77b70edf988076b4776734f77b4f8c9
-_md5_=773c9576eda87eedd7f74b765a4d8dc0
+_md5_=462128ac27bed2848dc9c26a7d43b3e8
diff --git a/metadata/md5-cache/sys-firmware/edk2-bin-202408 b/metadata/md5-cache/sys-firmware/edk2-bin-202408
new file mode 100644
index 000000000000..06bcb68dd6a6
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/edk2-bin-202408
@@ -0,0 +1,14 @@
+BDEPEND=secureboot? ( app-crypt/sbsigntools dev-libs/openssl )
+DEFINED_PHASES=install postinst preinst prepare setup unpack
+DESCRIPTION=TianoCore EDK II UEFI firmware for virtual machines
+EAPI=8
+HOMEPAGE=https://github.com/tianocore/edk2
+INHERIT=readme.gentoo-r1 secureboot
+IUSE=secureboot
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=BSD-2 MIT
+RDEPEND=!sys-firmware/edk2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~chewi/distfiles/edk2-202408-1-amd64.xpak https://dev.gentoo.org/~chewi/distfiles/edk2-202408-1-arm64.xpak
+_eclasses_=readme.gentoo-r1	b045f3acf546393ab6b3170781875358	secureboot	b77b70edf988076b4776734f77b4f8c9
+_md5_=9909b9b587dba333257b0c85105dbb3c
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r2 b/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r2
deleted file mode 100644
index 643660a54ad6..000000000000
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202105-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=secureboot? ( app-crypt/sbsigntools dev-libs/openssl )
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!binary? ( amd64? ( app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( dev-lang/python:3.11[sqlite] dev-lang/python:3.10[sqlite] ) ) )
-DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
-EAPI=7
-HOMEPAGE=https://github.com/tianocore/edk2
-INHERIT=python-any-r1 readme.gentoo-r1 secureboot
-IUSE=+binary secureboot
-KEYWORDS=amd64 arm64 ~loong ~ppc ppc64 ~riscv x86
-LICENSE=BSD-2 MIT
-REQUIRED_USE=!amd64? ( binary )
-SLOT=0
-SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable202105.tar.gz -> edk2-ovmf-202105.tar.gz https://github.com/openssl/openssl/archive/e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz -> openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-202105-r1-bin.tar.xz ) https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-202105-qemu-firmware.tar.xz
-_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multiprocessing	1e32df7deee68372153dca65f4a7c21f	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	multilib	b2a329026f2e404e9e371097dda47f96	python-utils-r1	c356a67b8e93889de6efff7d50599102	python-any-r1	f7b9a2fa38c69a9c2a7ad8fc9283ccf7	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	secureboot	b77b70edf988076b4776734f77b4f8c9
-_md5_=24225129792c5ce3d88b6e69edec41a6