Add USE=lzo/snappy to control liblzo/snappy automagic deps.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

5 files changed, 27 insertions, 10 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 0c6d8c913094..01b5d1a53095 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.276 2014/08/05 08:16:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.277 2014/08/05 08:21:36 vapier Exp $
+
+  05 Aug 2014; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  qemu-2.0.0-r1.ebuild, qemu-2.1.0.ebuild, qemu-9999.ebuild:
+  Add USE=lzo/snappy to control liblzo/snappy automagic deps.
 
   05 Aug 2014; Mike Frysinger <vapier@gentoo.org> metadata.xml,
   qemu-2.0.0-r1.ebuild, qemu-2.1.0.ebuild, qemu-9999.ebuild:
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 75afe6d88c45..59b54295eb03 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -29,6 +29,7 @@
 	<flag name='static-softmmu'>Builds the Software MMU (system) targets as static binaries</flag>
 	<flag name='static-user'>Build the User targets as static binaries</flag>
 	<flag name='static'>Enables both 'static-softmmu' and 'static-user'</flag>
+	<flag name='snappy'>Enable support for snappy compression</flag>
 	<flag name='systemtap'>Enable SystemTAP/DTrace tracing</flag>
 	<flag name='tci'>Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
     <flag name='tls'>Enable TLS support for the VNC console server.
diff --git a/app-emulation/qemu/qemu-2.0.0-r1.ebuild b/app-emulation/qemu/qemu-2.0.0-r1.ebuild
index 1aadb672edd9..14e1e2452114 100644
--- a/app-emulation/qemu/qemu-2.0.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.11 2014/08/05 08:16:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.12 2014/08/05 08:21:36 vapier Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
 gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD ncurses nfs nls opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls opengl +png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
 static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
 virtfs +vnc xattr xen xfs"
 
@@ -71,6 +71,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
 	jpeg? ( virtual/jpeg[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? ( sys-libs/ncurses[static-libs(+)] )
 	nfs? ( net-fs/libnfs[static-libs(+)] )
 	png? ( media-libs/libpng[static-libs(+)] )
@@ -78,6 +79,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	snappy? ( app-arch/snappy[static-libs(+)] )
 	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
 	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
 	tls? ( net-libs/gnutls[static-libs(+)] )
@@ -336,6 +338,7 @@ qemu_src_configure() {
 			$(use_enable iscsi libiscsi)
 			$(use_enable jpeg vnc-jpeg)
 			$(use_enable kernel_linux kvm)
+			$(use_enable lzo)
 			$(use_enable ncurses curses)
 			$(use_enable nfs libnfs)
 			$(use_enable opengl glx)
@@ -344,6 +347,7 @@ qemu_src_configure() {
 			$(use_enable sasl vnc-sasl)
 			$(use_enable seccomp)
 			$(use_enable smartcard smartcard-nss)
+			$(use_enable snappy)
 			$(use_enable spice)
 			$(use_enable ssh libssh2)
 			$(use_enable tls quorum)
diff --git a/app-emulation/qemu/qemu-2.1.0.ebuild b/app-emulation/qemu/qemu-2.1.0.ebuild
index e9b184bd474e..58735ef087bf 100644
--- a/app-emulation/qemu/qemu-2.1.0.ebuild
+++ b/app-emulation/qemu/qemu-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.0.ebuild,v 1.3 2014/08/05 08:16:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.0.ebuild,v 1.4 2014/08/05 08:21:36 vapier Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
 gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD ncurses nfs nls opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls opengl +png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
 static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
 virtfs +vnc xattr xen xfs"
 
@@ -71,6 +71,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
 	jpeg? ( virtual/jpeg[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? ( sys-libs/ncurses[static-libs(+)] )
 	nfs? ( net-fs/libnfs[static-libs(+)] )
 	png? ( media-libs/libpng[static-libs(+)] )
@@ -78,6 +79,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	snappy? ( app-arch/snappy[static-libs(+)] )
 	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
 	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
 	tls? ( net-libs/gnutls[static-libs(+)] )
@@ -330,6 +332,7 @@ qemu_src_configure() {
 			$(use_enable iscsi libiscsi)
 			$(use_enable jpeg vnc-jpeg)
 			$(use_enable kernel_linux kvm)
+			$(use_enable lzo)
 			$(use_enable ncurses curses)
 			$(use_enable nfs libnfs)
 			$(use_enable opengl glx)
@@ -338,6 +341,7 @@ qemu_src_configure() {
 			$(use_enable sasl vnc-sasl)
 			$(use_enable seccomp)
 			$(use_enable smartcard smartcard-nss)
+			$(use_enable snappy)
 			$(use_enable spice)
 			$(use_enable ssh libssh2)
 			$(use_enable tls quorum)
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index cc7e368f838f..978b623d9abb 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.81 2014/08/05 08:16:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.82 2014/08/05 08:21:36 vapier Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@ LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
 gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD ncurses nfs nls opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls opengl +png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
 static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
 virtfs +vnc xattr xen xfs"
 
@@ -71,6 +71,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
 	jpeg? ( virtual/jpeg[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? ( sys-libs/ncurses[static-libs(+)] )
 	nfs? ( net-fs/libnfs[static-libs(+)] )
 	png? ( media-libs/libpng[static-libs(+)] )
@@ -78,6 +79,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	snappy? ( app-arch/snappy[static-libs(+)] )
 	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
 	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
 	tls? ( net-libs/gnutls[static-libs(+)] )
@@ -330,6 +332,7 @@ qemu_src_configure() {
 			$(use_enable iscsi libiscsi)
 			$(use_enable jpeg vnc-jpeg)
 			$(use_enable kernel_linux kvm)
+			$(use_enable lzo)
 			$(use_enable ncurses curses)
 			$(use_enable nfs libnfs)
 			$(use_enable opengl glx)
@@ -338,6 +341,7 @@ qemu_src_configure() {
 			$(use_enable sasl vnc-sasl)
 			$(use_enable seccomp)
 			$(use_enable smartcard smartcard-nss)
+			$(use_enable snappy)
 			$(use_enable spice)
 			$(use_enable ssh libssh2)
 			$(use_enable tls quorum)