Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/
Date: Sat, 06 May 2017 06:22:19
Message-Id: 1494051694.efc8fc95c76c5c4323230b3b1278e5e2fc4f9bf6.tamiko@gentoo
1 commit: efc8fc95c76c5c4323230b3b1278e5e2fc4f9bf6
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 6 06:21:34 2017 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Sat May 6 06:21:34 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc8fc95
7
8 app-emulation/qemu: update live ebuild
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 app-emulation/qemu/qemu-9999.ebuild | 10 +++++++---
13 1 file changed, 7 insertions(+), 3 deletions(-)
14
15 diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
16 index f5ab6dbad23..72541280894 100644
17 --- a/app-emulation/qemu/qemu-9999.ebuild
18 +++ b/app-emulation/qemu/qemu-9999.ebuild
19 @@ -8,7 +8,7 @@ PYTHON_REQ_USE="ncurses,readline"
20
21 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
22
23 -FIRMWARE_ABI_VERSION="2.9.0-r50"
24 +FIRMWARE_ABI_VERSION="2.9.0-r52"
25
26 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
27 user udev fcaps readme.gentoo-r1 pax-utils l10n
28 @@ -154,13 +154,15 @@ SOFTMMU_TOOLS_DEPEND="
29 X86_FIRMWARE_DEPEND="
30 pin-upstream-blobs? (
31 ~sys-firmware/ipxe-1.0.0_p20160620
32 - ~sys-firmware/seabios-1.10.1[binary,seavgabios]
33 + ~sys-firmware/seabios-1.10.2[binary,seavgabios]
34 ~sys-firmware/sgabios-0.1_pre8
35 + ~sys-firmware/edk2-ovmf-2017_pre20170505[binary]
36 )
37 !pin-upstream-blobs? (
38 sys-firmware/ipxe
39 - sys-firmware/seabios[seavgabios]
40 + >=sys-firmware/seabios-1.10.2[seavgabios]
41 sys-firmware/sgabios
42 + sys-firmware/edk2-ovmf
43 )"
44
45 CDEPEND="
46 @@ -679,8 +681,10 @@ src_install() {
47 if [[ -n ${softmmu_targets} ]]; then
48 # Remove SeaBIOS since we're using the SeaBIOS packaged one
49 rm "${ED}/usr/share/qemu/bios.bin"
50 + rm "${ED}/usr/share/qemu/bios-256k.bin"
51 if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
52 dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
53 + dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
54 fi
55
56 # Remove vgabios since we're using the seavgabios packaged one