From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EFB26139335 for ; Sun, 27 Jun 2021 08:23:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE882E086D; Sun, 27 Jun 2021 08:23:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73F11E086D for ; Sun, 27 Jun 2021 08:23:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E7EA33BE5A for ; Sun, 27 Jun 2021 08:23:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90B75798 for ; Sun, 27 Jun 2021 08:23:23 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1624781462.dc9587461b24be212de1d2b7cc54e0423240861c.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-6.0.0-r50.ebuild app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: dc9587461b24be212de1d2b7cc54e0423240861c X-VCS-Branch: master Date: Sun, 27 Jun 2021 08:23:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ad193608-9497-4e62-854d-63752938f3f9 X-Archives-Hash: 8495507db02e96a91e33d4a732cb07e1 commit: dc9587461b24be212de1d2b7cc54e0423240861c Author: Matthias Maier gentoo org> AuthorDate: Sun Jun 27 08:10:38 2021 +0000 Commit: Matthias Maier gentoo 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 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