| 1 |
commit: e571e08e93398e44317b876f4afb122e7c572ca7 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 12 20:32:07 2017 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 12 20:32:07 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e571e08e |
| 7 |
|
| 8 |
app-emulation/qemu: Live ebuild maintennance, bug #631206 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/631206 |
| 11 |
Package-Manager: Portage-2.3.8, Repoman-2.3.4 |
| 12 |
|
| 13 |
app-emulation/qemu/qemu-9999.ebuild | 19 ++++++++++--------- |
| 14 |
1 file changed, 10 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 17 |
index a256ce5e7f7..1f09b78248a 100644 |
| 18 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 19 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 20 |
@@ -78,7 +78,6 @@ ALL_DEPEND=" |
| 21 |
# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) |
| 22 |
# softmmu targets (qemu-system-*). |
| 23 |
SOFTMMU_TOOLS_DEPEND=" |
| 24 |
- >=x11-libs/pixman-0.28.0[static-libs(+)] |
| 25 |
accessibility? ( |
| 26 |
app-accessibility/brltty[api] |
| 27 |
app-accessibility/brltty[static-libs(+)] |
| 28 |
@@ -89,7 +88,7 @@ SOFTMMU_TOOLS_DEPEND=" |
| 29 |
bzip2? ( app-arch/bzip2[static-libs(+)] ) |
| 30 |
caps? ( sys-libs/libcap-ng[static-libs(+)] ) |
| 31 |
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) |
| 32 |
- fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) |
| 33 |
+ fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) |
| 34 |
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) |
| 35 |
gnutls? ( |
| 36 |
dev-libs/nettle:=[static-libs(+)] |
| 37 |
@@ -370,6 +369,9 @@ src_prepare() { |
| 38 |
|
| 39 |
# Run after we've applied all patches. |
| 40 |
handle_locales |
| 41 |
+ |
| 42 |
+ # Remove bundled copy of libfdt |
| 43 |
+ rm -r dtc || die |
| 44 |
} |
| 45 |
|
| 46 |
## |
| 47 |
@@ -489,7 +491,6 @@ qemu_src_configure() { |
| 48 |
--disable-linux-user |
| 49 |
--enable-system |
| 50 |
--disable-tools |
| 51 |
- --with-system-pixman |
| 52 |
) |
| 53 |
local static_flag="static" |
| 54 |
;; |
| 55 |
@@ -687,7 +688,6 @@ src_install() { |
| 56 |
cd "${S}" |
| 57 |
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt |
| 58 |
newdoc pc-bios/README README.pc-bios |
| 59 |
- dodoc docs/qmp-*.txt |
| 60 |
|
| 61 |
if [[ -n ${softmmu_targets} ]]; then |
| 62 |
# Remove SeaBIOS since we're using the SeaBIOS packaged one |
| 63 |
@@ -775,17 +775,18 @@ pkg_postinst() { |
| 64 |
pkg_info() { |
| 65 |
echo "Using:" |
| 66 |
echo " $(best_version app-emulation/spice-protocol)" |
| 67 |
- echo " $(best_version sys-firmware/ipxe)" |
| 68 |
- echo " $(best_version sys-firmware/seabios)" |
| 69 |
- if has_version 'sys-firmware/seabios[binary]'; then |
| 70 |
+ echo " $(best_version sys-firmware/edk2-ovmf)" |
| 71 |
+ if has_version 'sys-firmware/edk2-ovmf[binary]'; then |
| 72 |
echo " USE=binary" |
| 73 |
else |
| 74 |
echo " USE=''" |
| 75 |
fi |
| 76 |
- echo " $(best_version sys-firmware/edk2-ovmf)" |
| 77 |
- if has_version 'sys-firmware/edk2-ovmf[binary]'; then |
| 78 |
+ echo " $(best_version sys-firmware/ipxe)" |
| 79 |
+ echo " $(best_version sys-firmware/seabios)" |
| 80 |
+ if has_version 'sys-firmware/seabios[binary]'; then |
| 81 |
echo " USE=binary" |
| 82 |
else |
| 83 |
echo " USE=''" |
| 84 |
fi |
| 85 |
+ echo " $(best_version sys-firmware/sgabios)" |
| 86 |
} |
Archives