From 6e7474b723ede505cbb4764767e13184117ecc2a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 20 Jan 2017 11:20:50 -0600 Subject: [PATCH] app-emulation/qemu: drop USE=uuid in newer versions #606506 Qemu always builds in their own uuid generation logic now and never looks at the external libuuid, so they've dropped the configure flag to match. --- app-emulation/qemu/qemu-2.8.0.ebuild | 4 +--- app-emulation/qemu/qemu-9999.ebuild | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app-emulation/qemu/qemu-2.8.0.ebuild b/app-emulation/qemu/qemu-2.8.0.ebuild index de01f6ce5a5e..29ca03256763 100644 --- a/app-emulation/qemu/qemu-2.8.0.ebuild +++ b/app-emulation/qemu/qemu-2.8.0.ebuild @@ -30,7 +30,7 @@ gnutls gtk gtk2 infiniband iscsi +jpeg \ kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python \ rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu -static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \ +static-user systemtap tci test +threads usb usbredir vde +vhost-net \ virgl virtfs +vnc vte xattr xen xfs" COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips @@ -133,7 +133,6 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) @@ -429,7 +428,6 @@ qemu_src_configure() { $(conf_softmmu ssh libssh2) $(conf_softmmu usb libusb) $(conf_softmmu usbredir usb-redir) - $(conf_softmmu uuid) $(conf_softmmu vde) $(conf_softmmu vhost-net) $(conf_softmmu virgl virglrenderer) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 8b5b30ce4a07..09a1c73df737 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -30,7 +30,7 @@ gnutls gtk gtk2 infiniband iscsi +jpeg \ kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python \ rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu -static-user systemtap tci test +threads usb usbredir +uuid vde +vhost-net \ +static-user systemtap tci test +threads usb usbredir vde +vhost-net \ virgl virtfs +vnc vte xattr xen xfs" COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips @@ -133,7 +133,6 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND} ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) @@ -425,7 +424,6 @@ qemu_src_configure() { $(conf_softmmu ssh libssh2) $(conf_softmmu usb libusb) $(conf_softmmu usbredir usb-redir) - $(conf_softmmu uuid) $(conf_softmmu vde) $(conf_softmmu vhost-net) $(conf_softmmu virgl virglrenderer) -- 2.26.2