Control quorum via USE=tls since it also relies on gnutls.

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

6 files changed, 15 insertions, 6 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 31a936b4e93e..f7af9af62866 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.274 2014/08/04 06:47:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.275 2014/08/05 08:10:07 vapier Exp $
+
+  05 Aug 2014; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  qemu-2.0.0-r1.ebuild, qemu-2.0.0.ebuild, qemu-2.1.0.ebuild, qemu-9999.ebuild:
+  Control quorum via USE=tls since it also relies on gnutls.
 
   04 Aug 2014; Mike Frysinger <vapier@gentoo.org> files/qemu-binfmt.initd-r1:
   actually use the new $QEMU_BINFMT_FLAGS
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 632219864185..2c2f103c6131 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -31,7 +31,8 @@
 	<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.
-		For 1.4 and newer this also enables WebSocket support.</flag>
+		For 1.4 and newer this also enables WebSocket support.
+		For 2.0 and newer this also enables disk quorum support.</flag>
     <flag name='jpeg'>Enable jpeg image support for the VNC console server</flag>
     <flag name='png'>Enable png image support for the VNC console server</flag>
 	<flag name='usb'>Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
diff --git a/app-emulation/qemu/qemu-2.0.0-r1.ebuild b/app-emulation/qemu/qemu-2.0.0-r1.ebuild
index 33db8a64cc63..afa7f9dd9329 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.9 2014/07/29 10:23:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.10 2014/08/05 08:10:07 vapier Exp $
 
 EAPI=5
 
@@ -344,6 +344,7 @@ qemu_src_configure() {
 			$(use_enable smartcard smartcard-nss)
 			$(use_enable spice)
 			$(use_enable ssh libssh2)
+			$(use_enable tls quorum)
 			$(use_enable tls vnc-tls)
 			$(use_enable tls vnc-ws)
 			$(use_enable usb libusb)
diff --git a/app-emulation/qemu/qemu-2.0.0.ebuild b/app-emulation/qemu/qemu-2.0.0.ebuild
index 892e887303f7..5bbbfe6692ea 100644
--- a/app-emulation/qemu/qemu-2.0.0.ebuild
+++ b/app-emulation/qemu/qemu-2.0.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.0.0.ebuild,v 1.13 2014/06/06 01:42:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0.ebuild,v 1.14 2014/08/05 08:10:07 vapier Exp $
 
 EAPI=5
 
@@ -335,6 +335,7 @@ qemu_src_configure() {
 			$(use_enable smartcard smartcard-nss)
 			$(use_enable spice)
 			$(use_enable ssh libssh2)
+			$(use_enable tls quorum)
 			$(use_enable tls vnc-tls)
 			$(use_enable tls vnc-ws)
 			$(use_enable usb libusb)
diff --git a/app-emulation/qemu/qemu-2.1.0.ebuild b/app-emulation/qemu/qemu-2.1.0.ebuild
index 21d203ab6ad9..9798268b679d 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.1 2014/08/04 06:45:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.0.ebuild,v 1.2 2014/08/05 08:10:07 vapier Exp $
 
 EAPI=5
 
@@ -338,6 +338,7 @@ qemu_src_configure() {
 			$(use_enable smartcard smartcard-nss)
 			$(use_enable spice)
 			$(use_enable ssh libssh2)
+			$(use_enable tls quorum)
 			$(use_enable tls vnc-tls)
 			$(use_enable tls vnc-ws)
 			$(use_enable usb libusb)
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index be6be2d8e7eb..89a9504d4e10 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.79 2014/07/29 10:23:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.80 2014/08/05 08:10:07 vapier Exp $
 
 EAPI=5
 
@@ -338,6 +338,7 @@ qemu_src_configure() {
 			$(use_enable smartcard smartcard-nss)
 			$(use_enable spice)
 			$(use_enable ssh libssh2)
+			$(use_enable tls quorum)
 			$(use_enable tls vnc-tls)
 			$(use_enable tls vnc-ws)
 			$(use_enable usb libusb)