| 1 |
commit: 957bf522818bbb6b3dbae061f29a1d42fca6a887 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 3 00:38:17 2017 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 3 00:38:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957bf522 |
| 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 | 23 +++++++---------------- |
| 13 |
1 file changed, 7 insertions(+), 16 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 16 |
index 2b67a28100a..af471f81307 100644 |
| 17 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 18 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 19 |
@@ -65,14 +65,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 20 |
# The attr lib isn't always linked in (although the USE flag is always |
| 21 |
# respected). This is because qemu supports using the C library's API |
| 22 |
# when available rather than always using the extranl library. |
| 23 |
-# |
| 24 |
-# To configure and compile qemu user targets or tools alone the following |
| 25 |
-# dependencies are not strictly necessary: |
| 26 |
-# alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
| 27 |
-# fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) |
| 28 |
-# pulseaudio? ( media-sound/pulseaudio ) |
| 29 |
-# seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) |
| 30 |
-# but these are so few it is not worth the effort to separate this list. |
| 31 |
ALL_DEPEND=" |
| 32 |
>=dev-libs/glib-2.0[static-libs(+)] |
| 33 |
sys-libs/zlib[static-libs(+)] |
| 34 |
@@ -161,12 +153,10 @@ X86_FIRMWARE_DEPEND=" |
| 35 |
pin-upstream-blobs? ( |
| 36 |
~sys-firmware/seabios-1.10.1 |
| 37 |
~sys-firmware/sgabios-0.1_pre8 |
| 38 |
- ~sys-firmware/vgabios-0.7a |
| 39 |
) |
| 40 |
!pin-upstream-blobs? ( |
| 41 |
sys-firmware/seabios |
| 42 |
sys-firmware/sgabios |
| 43 |
- sys-firmware/vgabios |
| 44 |
)" |
| 45 |
|
| 46 |
CDEPEND=" |
| 47 |
@@ -694,13 +684,15 @@ src_install() { |
| 48 |
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" |
| 49 |
rm "${ED}/usr/share/qemu/vgabios-qxl.bin" |
| 50 |
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" |
| 51 |
+ rm "${ED}/usr/share/qemu/vgabios-virtio.bin" |
| 52 |
rm "${ED}/usr/share/qemu/vgabios-vmware.bin" |
| 53 |
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then |
| 54 |
- dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin |
| 55 |
- dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin |
| 56 |
- dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin |
| 57 |
- dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin |
| 58 |
- dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin |
| 59 |
+ dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin |
| 60 |
+ dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin |
| 61 |
+ dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin |
| 62 |
+ dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin |
| 63 |
+ dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin |
| 64 |
+ dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin |
| 65 |
fi |
| 66 |
|
| 67 |
# Remove sgabios since we're using the sgabios packaged one |
| 68 |
@@ -746,5 +738,4 @@ pkg_info() { |
| 69 |
else |
| 70 |
echo " USE=''" |
| 71 |
fi |
| 72 |
- echo " $(best_version sys-firmware/vgabios)" |
| 73 |
} |
Archives