| 1 |
commit: c2fafdda6d93784e9900e2520bec54f4dac9af8b |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 29 03:23:17 2019 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 29 06:48:45 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2fafdda |
| 7 |
|
| 8 |
app-emulation/qemu: update live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/qemu/qemu-9999.ebuild | 13 +++---------- |
| 14 |
1 file changed, 3 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 17 |
index a1dcb27ce6d..314d8ab73d5 100644 |
| 18 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 19 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 20 |
@@ -10,7 +10,7 @@ PLOCALES="bg de_DE fr_FR hu it tr zh_CN" |
| 21 |
|
| 22 |
FIRMWARE_ABI_VERSION="2.11.1-r50" |
| 23 |
|
| 24 |
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \ |
| 25 |
+inherit eutils linux-info toolchain-funcs multilib python-r1 \ |
| 26 |
user udev fcaps readme.gentoo-r1 pax-utils l10n |
| 27 |
|
| 28 |
if [[ ${PV} = *9999* ]]; then |
| 29 |
@@ -34,8 +34,6 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug |
| 30 |
spice ssh static static-user systemtap tci test usb usbredir vde |
| 31 |
+vhost-net virgl virtfs +vnc vte xattr xen xfs" |
| 32 |
|
| 33 |
-RESTRICT=strip |
| 34 |
- |
| 35 |
COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel |
| 36 |
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x |
| 37 |
sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb" |
| 38 |
@@ -94,7 +92,7 @@ SOFTMMU_TOOLS_DEPEND=" |
| 39 |
capstone? ( dev-libs/capstone:= ) |
| 40 |
caps? ( sys-libs/libcap-ng[static-libs(+)] ) |
| 41 |
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) |
| 42 |
- fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] ) |
| 43 |
+ fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) |
| 44 |
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) |
| 45 |
gnutls? ( |
| 46 |
dev-libs/nettle:=[static-libs(+)] |
| 47 |
@@ -359,11 +357,6 @@ src_prepare() { |
| 48 |
check_targets IUSE_SOFTMMU_TARGETS softmmu |
| 49 |
check_targets IUSE_USER_TARGETS linux-user |
| 50 |
|
| 51 |
- # Alter target makefiles to accept CFLAGS set via flag-o |
| 52 |
- sed -i -r \ |
| 53 |
- -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \ |
| 54 |
- Makefile Makefile.target || die |
| 55 |
- |
| 56 |
default |
| 57 |
|
| 58 |
# Fix ld and objcopy being called directly |
| 59 |
@@ -764,7 +757,7 @@ pkg_postinst() { |
| 60 |
udev_reload |
| 61 |
fi |
| 62 |
|
| 63 |
- [[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \ |
| 64 |
+ [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ |
| 65 |
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper |
| 66 |
|
| 67 |
DISABLE_AUTOFORMATTING=true |
Archives