app-emulation/qemu: 2.9.0-r53, 9999: comestic changes

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/app-emulation/qemu/qemu-2.9.0-r53.ebuild b/app-emulation/qemu/qemu-2.9.0-r53.ebuild
index bf27f6189641af2dcdd0bda2ec241d13a25dcef2..5518e2e813b02454019ad390b6ac2df544c712de 100644 (file)
--- 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 725412808944d9727755dc8b1c602aa349d4cf0c..e2807cac73a58fabf5f9e516a4f31bee7a30002a 100644 (file)
--- 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
 }