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

[Matthias Maier]

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
 }