| 1 |
commit: 868f13e4bf325f527de1ce74f4236de2a18d02dc |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 6 17:57:16 2017 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 6 18:27:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868f13e4 |
| 7 |
|
| 8 |
app-emulation/qemu: 2.9.0-r53, 9999: comestic changes |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
app-emulation/qemu/qemu-2.9.0-r53.ebuild | 12 ++++++++++-- |
| 13 |
app-emulation/qemu/qemu-9999.ebuild | 11 +++++++++-- |
| 14 |
2 files changed, 19 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/qemu/qemu-2.9.0-r53.ebuild b/app-emulation/qemu/qemu-2.9.0-r53.ebuild |
| 17 |
index bf27f618964..5518e2e813b 100644 |
| 18 |
--- a/app-emulation/qemu/qemu-2.9.0-r53.ebuild |
| 19 |
+++ b/app-emulation/qemu/qemu-2.9.0-r53.ebuild |
| 20 |
@@ -153,16 +153,16 @@ SOFTMMU_TOOLS_DEPEND=" |
| 21 |
|
| 22 |
X86_FIRMWARE_DEPEND=" |
| 23 |
pin-upstream-blobs? ( |
| 24 |
+ ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] |
| 25 |
~sys-firmware/ipxe-1.0.0_p20160620 |
| 26 |
~sys-firmware/seabios-1.10.2[binary,seavgabios] |
| 27 |
~sys-firmware/sgabios-0.1_pre8 |
| 28 |
- ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] |
| 29 |
) |
| 30 |
!pin-upstream-blobs? ( |
| 31 |
+ sys-firmware/edk2-ovmf |
| 32 |
sys-firmware/ipxe |
| 33 |
>=sys-firmware/seabios-1.10.2[seavgabios] |
| 34 |
sys-firmware/sgabios |
| 35 |
- sys-firmware/edk2-ovmf |
| 36 |
)" |
| 37 |
|
| 38 |
CDEPEND=" |
| 39 |
@@ -751,6 +751,7 @@ pkg_postinst() { |
| 40 |
|
| 41 |
if use pin-upstream-blobs && firmware_abi_change; then |
| 42 |
ewarn "This version of qemu pins new versions of firmware blobs:" |
| 43 |
+ ewarn " $(best_version sys-firmware/edk2-ovmf)" |
| 44 |
ewarn " $(best_version sys-firmware/ipxe)" |
| 45 |
ewarn " $(best_version sys-firmware/seabios)" |
| 46 |
ewarn " $(best_version sys-firmware/sgabios)" |
| 47 |
@@ -766,6 +767,12 @@ pkg_postinst() { |
| 48 |
pkg_info() { |
| 49 |
echo "Using:" |
| 50 |
echo " $(best_version app-emulation/spice-protocol)" |
| 51 |
+ echo " $(best_version sys-firmware/edk2-ovmf)" |
| 52 |
+ if has_version 'sys-firmware/edk2-ovmf[binary]'; then |
| 53 |
+ echo " USE=binary" |
| 54 |
+ else |
| 55 |
+ echo " USE=''" |
| 56 |
+ fi |
| 57 |
echo " $(best_version sys-firmware/ipxe)" |
| 58 |
echo " $(best_version sys-firmware/seabios)" |
| 59 |
if has_version 'sys-firmware/seabios[binary]'; then |
| 60 |
@@ -773,4 +780,5 @@ pkg_info() { |
| 61 |
else |
| 62 |
echo " USE=''" |
| 63 |
fi |
| 64 |
+ echo " $(best_version sys-firmware/sgabios)" |
| 65 |
} |
| 66 |
|
| 67 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 68 |
index 72541280894..e2807cac73a 100644 |
| 69 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 70 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 71 |
@@ -153,16 +153,16 @@ SOFTMMU_TOOLS_DEPEND=" |
| 72 |
|
| 73 |
X86_FIRMWARE_DEPEND=" |
| 74 |
pin-upstream-blobs? ( |
| 75 |
+ ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] |
| 76 |
~sys-firmware/ipxe-1.0.0_p20160620 |
| 77 |
~sys-firmware/seabios-1.10.2[binary,seavgabios] |
| 78 |
~sys-firmware/sgabios-0.1_pre8 |
| 79 |
- ~sys-firmware/edk2-ovmf-2017_pre20170505[binary] |
| 80 |
) |
| 81 |
!pin-upstream-blobs? ( |
| 82 |
+ sys-firmware/edk2-ovmf |
| 83 |
sys-firmware/ipxe |
| 84 |
>=sys-firmware/seabios-1.10.2[seavgabios] |
| 85 |
sys-firmware/sgabios |
| 86 |
- sys-firmware/edk2-ovmf |
| 87 |
)" |
| 88 |
|
| 89 |
CDEPEND=" |
| 90 |
@@ -747,6 +747,7 @@ pkg_postinst() { |
| 91 |
|
| 92 |
if use pin-upstream-blobs && firmware_abi_change; then |
| 93 |
ewarn "This version of qemu pins new versions of firmware blobs:" |
| 94 |
+ ewarn " $(best_version sys-firmware/edk2-ovmf)" |
| 95 |
ewarn " $(best_version sys-firmware/ipxe)" |
| 96 |
ewarn " $(best_version sys-firmware/seabios)" |
| 97 |
ewarn " $(best_version sys-firmware/sgabios)" |
| 98 |
@@ -769,4 +770,10 @@ pkg_info() { |
| 99 |
else |
| 100 |
echo " USE=''" |
| 101 |
fi |
| 102 |
+ echo " $(best_version sys-firmware/edk2-ovmf)" |
| 103 |
+ if has_version 'sys-firmware/edk2-ovmf[binary]'; then |
| 104 |
+ echo " USE=binary" |
| 105 |
+ else |
| 106 |
+ echo " USE=''" |
| 107 |
+ fi |
| 108 |
} |
Archives