app-emulation/qemu: update live ebuild

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index a1dcb27ce6d6ade9cbd7b64513288071916d6e9a..314d8ab73d5c9bb2dec52f039ae62d73f14addc2 100644 (file)
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -10,7 +10,7 @@ PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 
 FIRMWARE_ABI_VERSION="2.11.1-r50"
 
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+inherit eutils linux-info toolchain-funcs multilib python-r1 \
        user udev fcaps readme.gentoo-r1 pax-utils l10n
 
 if [[ ${PV} = *9999* ]]; then
@@ -34,8 +34,6 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug
        spice ssh static static-user systemtap tci test usb usbredir vde
        +vhost-net virgl virtfs +vnc vte xattr xen xfs"
 
-RESTRICT=strip
-
 COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
        mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
        sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
@@ -94,7 +92,7 @@ SOFTMMU_TOOLS_DEPEND="
        capstone? ( dev-libs/capstone:= )
        caps? ( sys-libs/libcap-ng[static-libs(+)] )
        curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-       fdt? ( >=sys-apps/dtc-1.4.2[static-libs(+)] )
+       fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
        glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
        gnutls? (
                dev-libs/nettle:=[static-libs(+)]
@@ -359,11 +357,6 @@ src_prepare() {
        check_targets IUSE_SOFTMMU_TARGETS softmmu
        check_targets IUSE_USER_TARGETS linux-user
 
-       # Alter target makefiles to accept CFLAGS set via flag-o
-       sed -i -r \
-               -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
-               Makefile Makefile.target || die
-
        default
 
        # Fix ld and objcopy being called directly
@@ -764,7 +757,7 @@ pkg_postinst() {
                udev_reload
        fi
 
-       [[ -f ${D}/usr/libexec/qemu-bridge-helper ]] && \
+       [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
                fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
 
        DISABLE_AUTOFORMATTING=true