From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-948335-garchives=archives.gentoo.org@lists.gentoo.org> 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 63E1D139695 for <garchives@archives.gentoo.org>; Sat, 6 May 2017 18:27:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8057E0CDA; Sat, 6 May 2017 18:27:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F346E0CDA for <gentoo-commits@lists.gentoo.org>; Sat, 6 May 2017 18:27:45 +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 087633416D9 for <gentoo-commits@lists.gentoo.org>; Sat, 6 May 2017 18:27:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D35E7447 for <gentoo-commits@lists.gentoo.org>; Sat, 6 May 2017 18:27:42 +0000 (UTC) From: "Matthias Maier" <tamiko@gentoo.org> 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" <tamiko@gentoo.org> Message-ID: <1494095245.868f13e4bf325f527de1ce74f4236de2a18d02dc.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-2.9.0-r53.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: 868f13e4bf325f527de1ce74f4236de2a18d02dc X-VCS-Branch: master Date: Sat, 6 May 2017 18:27:42 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ec1c0050-f8a0-4145-b3a2-57ce5b95eb89 X-Archives-Hash: 50a969875a6ba6ecfb1b790d2449cac7 commit: 868f13e4bf325f527de1ce74f4236de2a18d02dc Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Sat May 6 17:57:16 2017 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Sat May 6 18:27:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868f13e4 app-emulation/qemu: 2.9.0-r53, 9999: comestic changes Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-emulation/qemu/qemu-2.9.0-r53.ebuild | 12 ++++++++++-- app-emulation/qemu/qemu-9999.ebuild | 11 +++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app-emulation/qemu/qemu-2.9.0-r53.ebuild b/app-emulation/qemu/qemu-2.9.0-r53.ebuild index bf27f618964..5518e2e813b 100644 --- a/app-emulation/qemu/qemu-2.9.0-r53.ebuild +++ b/app-emulation/qemu/qemu-2.9.0-r53.ebuild @@ -153,16 +153,16 @@ SOFTMMU_TOOLS_DEPEND=" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( + ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 - ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ) !pin-upstream-blobs? ( + sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios - sys-firmware/edk2-ovmf )" CDEPEND=" @@ -751,6 +751,7 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" + ewarn " $(best_version sys-firmware/edk2-ovmf)" ewarn " $(best_version sys-firmware/ipxe)" ewarn " $(best_version sys-firmware/seabios)" ewarn " $(best_version sys-firmware/sgabios)" @@ -766,6 +767,12 @@ pkg_postinst() { pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" + echo " $(best_version sys-firmware/edk2-ovmf)" + if has_version 'sys-firmware/edk2-ovmf[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi echo " $(best_version sys-firmware/ipxe)" echo " $(best_version sys-firmware/seabios)" if has_version 'sys-firmware/seabios[binary]'; then @@ -773,4 +780,5 @@ pkg_info() { else echo " USE=''" fi + echo " $(best_version sys-firmware/sgabios)" } diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 72541280894..e2807cac73a 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -153,16 +153,16 @@ SOFTMMU_TOOLS_DEPEND=" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( + ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ~sys-firmware/ipxe-1.0.0_p20160620 ~sys-firmware/seabios-1.10.2[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8 - ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] ) !pin-upstream-blobs? ( + sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios - sys-firmware/edk2-ovmf )" CDEPEND=" @@ -747,6 +747,7 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" + ewarn " $(best_version sys-firmware/edk2-ovmf)" ewarn " $(best_version sys-firmware/ipxe)" ewarn " $(best_version sys-firmware/seabios)" ewarn " $(best_version sys-firmware/sgabios)" @@ -769,4 +770,10 @@ pkg_info() { else echo " USE=''" fi + echo " $(best_version sys-firmware/edk2-ovmf)" + if has_version 'sys-firmware/edk2-ovmf[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi }