[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

[Matthias Maier]

commit:     dc9587461b24be212de1d2b7cc54e0423240861c
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 27 08:10:38 2021 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jun 27 08:11:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc958746

app-emulation/qemu: pin new firmware versions

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 app-emulation/qemu/{qemu-9999.ebuild => qemu-6.0.0-r50.ebuild} | 8 +++++---
 app-emulation/qemu/qemu-9999.ebuild                            | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-6.0.0-r50.ebuild
similarity index 99%
copy from app-emulation/qemu/qemu-9999.ebuild
copy to app-emulation/qemu/qemu-6.0.0-r50.ebuild
index a3eabad867a..65c20aa5574 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0-r50.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="ncurses,readline"
 
-FIRMWARE_ABI_VERSION="5.2.0-r50"
+FIRMWARE_ABI_VERSION="6.0.0-r50"
 
 inherit eutils linux-info toolchain-funcs multilib python-r1
 inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
@@ -213,17 +213,18 @@ SOFTMMU_TOOLS_DEPEND="
        zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
 "
 
+EDK2_OVMF_VERSION="202105"
 SEABIOS_VERSION="1.14.0"
 
 X86_FIRMWARE_DEPEND="
        pin-upstream-blobs? (
-               ~sys-firmware/edk2-ovmf-202008[binary]
+               ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary]
                ~sys-firmware/ipxe-1.21.1[binary,qemu]
                ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
                ~sys-firmware/sgabios-0.1_pre10[binary]
        )
        !pin-upstream-blobs? (
-               sys-firmware/edk2-ovmf
+               >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
                sys-firmware/ipxe[qemu]
                >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
                sys-firmware/sgabios
@@ -276,6 +277,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
        "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
        "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
+       "${FILESDIR}"/${PN}-6.0.0-make.patch
 )
 
 QA_PREBUILT="

diff --git a/app-emulation/qemu/qemu-9999.ebuild 
b/app-emulation/qemu/qemu-9999.ebuild
index a3eabad867a..9919b6047c6 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="ncurses,readline"
 
-FIRMWARE_ABI_VERSION="5.2.0-r50"
+FIRMWARE_ABI_VERSION="6.0.0-r50"
 
 inherit eutils linux-info toolchain-funcs multilib python-r1
 inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
@@ -213,17 +213,18 @@ SOFTMMU_TOOLS_DEPEND="
        zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
 "
 
+EDK2_OVMF_VERSION="202105"
 SEABIOS_VERSION="1.14.0"
 
 X86_FIRMWARE_DEPEND="
        pin-upstream-blobs? (
-               ~sys-firmware/edk2-ovmf-202008[binary]
+               ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary]
                ~sys-firmware/ipxe-1.21.1[binary,qemu]
                ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios]
                ~sys-firmware/sgabios-0.1_pre10[binary]
        )
        !pin-upstream-blobs? (
-               sys-firmware/edk2-ovmf
+               >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
                sys-firmware/ipxe[qemu]
                >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios]
                sys-firmware/sgabios