summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2017-05-06 12:57:16 -0500
committerMatthias Maier <tamiko@gentoo.org>2017-05-06 13:27:25 -0500
commit868f13e4bf325f527de1ce74f4236de2a18d02dc (patch)
tree1bb39a6e372555862066a02667f4e4c9b56de7d3 /app-emulation
parenttoolchain.eclass: enable pie and ssp for gcc >= 6 for #615370 (diff)
downloadgentoo-868f13e4bf325f527de1ce74f4236de2a18d02dc.tar.gz
gentoo-868f13e4bf325f527de1ce74f4236de2a18d02dc.tar.bz2
gentoo-868f13e4bf325f527de1ce74f4236de2a18d02dc.zip
app-emulation/qemu: 2.9.0-r53, 9999: comestic changes
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/qemu/qemu-2.9.0-r53.ebuild12
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild11
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 bf27f6189641..5518e2e813b0 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 725412808944..e2807cac73a5 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
}