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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

7 files changed, 34 insertions, 25 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/Manifest b/app-emulation/qemu/Manifest
index 6614a1c92c85..f2c816decb7a 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -33,26 +33,26 @@ EBUILD qemu-1.6.1.ebuild 17742 SHA256 93d4b5c0abe3171f4c3e1836d64f296eb125ef9c1d
 EBUILD qemu-1.6.2.ebuild 17740 SHA256 f41910723e8c7b26351d8f74cfbf76ab4efc26e1d773bafcff6eae81c8caff0a SHA512 a93596e46df82e7aaad430e4458e16c61a43f4860e32e5c7456223b571e13a182b1099bbad3d82eadc3b115b2f40a88b3fac4e80a4ecc6f5f31c27f81523e53e WHIRLPOOL 62b1bfc3cc54bfacc849b8fac63c894dee6c0a6ace4dbec745132accd59f439c2aff0604de33fe57a1ac79b1afebcd4fd7f388506f23988297459e7cb86b0d01
 EBUILD qemu-1.7.0.ebuild 17679 SHA256 beb978b28d6659537cf3728f47e3676e30de84ff16f9b227e4c9cd8289291e7a SHA512 e533f97415e6f3839da4df3f5b7d684beafcfc1e5288949c547b9cb4ca608ae2a7956da54fea9dcc4b233245e62fa962b37ea961de1c96cb17eb6b05087d9a1e WHIRLPOOL 9475909bf46f03445e7a959baa272d42304696fc74d17dd78b12a77db8e10965dbb39468bcaa2095aee6ab39cada2ad4181856dc3d610c4d0200c1f75a70caac
 EBUILD qemu-1.7.1.ebuild 17679 SHA256 5f1210b57f7b0c78f7f800a4945e7a5705bd92ccd7badfd41269034235ef3940 SHA512 2d596e280f3b2c312df5448109534043ce27038529a22cd068c6a5973e44e0f8b955b358883b007c62d3cc02374412d31084e3c2eb55abeb1d55ae23b4d46bf0 WHIRLPOOL 75fd489fab0857a3bd1728a0212c3d6690eb8acb159fb002115e575f1a7747374f1a04696374af830d5a3af6035cde30dbc2ef698c71ffd96a1dd7bb64309ed7
-EBUILD qemu-2.0.0-r1.ebuild 17774 SHA256 609e46792569c64f76a180adca9d60c82d6ff7e8aa505402aa5445a9e439dc26 SHA512 2f66b63445502ec522388c53e8ba6ca6357bbb5db4df7a395439bbaab6844bc368ccc73d63c21160f3a176773b718fddf759fb370ccebc8d102f75bbf64a54f9 WHIRLPOOL 2c3d7c915d9463104bb42911a2be8ed300fcc28f9c03b66af277b339a3830374b6bf4940c002fc4ea83177d11d9f946f3c43ef318c0099a9ff480929529f74ff
-EBUILD qemu-2.0.0.ebuild 17240 SHA256 24bb08495a885b9310bea53a21cdde76561c598ade9af7a7973562938f93047e SHA512 aa0e6d9e9f669f7b2266d9f207806c61ec44d71ad3c965836f32285dcf9424ccd1e71c0d1b6818c9cd24a082412e60309d6557b03ec687b0b60dc2abbc38051c WHIRLPOOL 5f9644ce1c5ce5410aa2cba8f1f14aa8292607b9d02bbf36b9b7017b46bd42834335ff25d34beff0a9c58126571ccaf5fdb8ea8769ae685f085108c737751c26
-EBUILD qemu-2.1.0.ebuild 17409 SHA256 962cfa01108c74d1b165054b2b5f524fa2bc877f73f8ca75b6e4237837e7a060 SHA512 6f83edffd6b8e718881aec159fc0e88f51bb5da9ee1a68fb1c01e3429a2dd081b40bfaa2bab78b8726747c49026249609350f174b434a967558a26a6bc88d125 WHIRLPOOL bbc4e245e46124a66b38c2afe7206bc5cb14e785365ca255814d61e5c45e1c4c9ef2ea2d772cb1906f1e626fcbec9fc7b99206d04591779b81ad511fc972e0c1
-EBUILD qemu-9999.ebuild 17363 SHA256 2608f7a4a614847391ae666290c0b72820d37d73cdade4bb4565e2b891142e30 SHA512 2d35374502ce4c4e29ccd8879fccdb95cbfe731954143cfdf4561b52fd943829ed7fb1ef449fd490721fcc112bdba220bb5199b71da0b1e2300b6f8e6eb0eaad WHIRLPOOL a19e6caa2a87346fe5c69ba19352830b4828aa83b2e59be70f2517ef2838445b5eafd88b36658cea7da45df48250c657ace6a070e132bc09aa1ada7f9d7455ac
-MISC ChangeLog 45388 SHA256 40ccfd3ca93ec9f2754cb6f0176eb8f1a2ac5df78103966114cf7838ea16cfae SHA512 de3a71581d2fa8526c9d6955c05baa32cff4c4290ea21b76358c03cf5e1250f105864563a0906f868a4c9e6202b3000bf125c4ea0d6983ab7188abe35006bd0e WHIRLPOOL 1c511a27196043ec7e2dc0e36ee5659eb81b3cce312f8a6f91d9788f4f8eae77c1a3b53c770be995d3c4aa086da899bf340cc25d46a26b9ced1425c6ba303bb7
-MISC metadata.xml 3515 SHA256 dfde4a226457996dfb5cc86ddb77cb1514db7a7d9b1c999db77d313146b6b4df SHA512 c7c6b742cc1be5fe440bcba43693c3b5d30e8039b1f1f5aa2a179af35d18aee05439e48f768b20318e15317a0f0d300cead74ad585b82767c5d51a8e7ec3fffa WHIRLPOOL 96ec11e854a58593a4a29d66404dd10d354cf19608053b60704a7466817c8d677f8c15ba1434d6674bd7f41cf28020ee3e3a412837c62930abb4521a0e57c127
+EBUILD qemu-2.0.0-r1.ebuild 17803 SHA256 78d1a5e721b940ad982fd272c0940ee9561c4b3ec04891a8d814320d330adb6f SHA512 82abc780afe457b8026856ecc7e65adbab7e76c5351c03b94f4e5166a42777ae8bc04c4464075b0a95cac8c762dd0a59c2f1b37ce294bd54fdb2d56b9dd3c908 WHIRLPOOL a0d27d3bd54c61c3f638f96047656b7e3f5688a50cf4243118caf56e8f2df1b3ec96382711c6d76bcf26d89aa9d22ba46ceefcf93613eb15619f6b92bb017ff6
+EBUILD qemu-2.0.0.ebuild 17268 SHA256 65f46652d72cac72a29aff89449d76a7d43805e4f69fd0e525059a9a115d55fd SHA512 c0b5f5220bc383b9700b7d74f88a9367e883af0ff6336a7154c1e86632fa073c3188762091bc496d7f6415d068c023a1423ffd4095696fce44835e44cd70efea WHIRLPOOL 21365f0036f741034380ba4b4b6994a0db6b2aa71bec86e6f5515c883c20d60ebe86294d745df57ff33668970a9b82f38922f6e7c4bb56bc7655ac7de4f51c34
+EBUILD qemu-2.1.0.ebuild 17437 SHA256 f35f1c8debb9e575e0394889e357b67db881f4bbb1ef7ec27ffc9bf1ed3b94ac SHA512 b210a3e6c4e7db50e20a75a962b48a971cb37a5041de981bcf8f59d94f35a4db8b78da01f75a144c9b3ea3dfc01ec2ec4b985290b1cbbb7a86de57ed51afa04e WHIRLPOOL e443a901ee30f44b1db727052ce493283b3c70ecba4f848b5cdc1fe635f67f89f40d3d48423a8804bdf57ba340758f5882569ba0e0f0bc9d352c9c619bd89457
+EBUILD qemu-9999.ebuild 17391 SHA256 0800b12ffe6a7e71161284f0b97558077619c2a5e494af7a46d25624062f21d6 SHA512 b9a95498ef251d2a5530a22fe094796d593a148123179d4e45c9810ee881f3860357d34478a99844c02428e9f1f0fe724b443663fca5207dd1ef27cd8603dd91 WHIRLPOOL 8b67eb4195fd2640d6802cbfd5b5b3a90793d937194c42f1074300588046c5c8e8eb59b1d921ab3ba899c59cbbd8db308d0019078984e6796451fdad8972156c
+MISC ChangeLog 45594 SHA256 4cf33b7cc0f133a05e7298b55ed484edbec1fbddcc8a8d556deb4a43e2f77381 SHA512 68217e30ee7934f0925b5fe582a985a1d6c4e76bfc45c4c94ff759c64f33b820c101584566b21cd8aab878623ef7167aab31480cd8aea62d25c2fc335e7d35e4 WHIRLPOOL 42e700182703fa13a23bf10f011530a745b733af51dc6477b7e50dcc72cebf95c33377aa85dadc86997d8b059468c6a17e8e643dca79f1b7ad617ec8c196bfd1
+MISC metadata.xml 3574 SHA256 6312326f3428f7652b7bd8e2060b4834dbf54423904c29f0a31a72559e066050 SHA512 8b0ffb74fadcf620f34615c29c0e60297a8a159db5e32e55646963dc877f875324b10ddeb7192a8ca1cc27bc9e36cc214a762a6feaff4b2530209ad2c1176612 WHIRLPOOL a7b83dedadb18ef83d226ae8f8ec0bca73e756a654effdb350165710a521412de0d14c9b65e889936fdef52fb07024bc037294fc1741a5820e3808c7b998edc0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT3yyDAAoJEPGu1DbS6WIABhMP/0JX2g0PFOWQu7l7sCiI8RNM
-N5lrJqfUK5lJ8SRA16rvvjo1N1WNlQYnTjdeIw2q/F/9AJT1rgir88HNYQPvXO41
-bUNdgt6xYZ5HWMYjQDHVTDsBEN/9g/B4JyDy+cn2onyoUXRjtvWQBp784NsD2KA5
-FIIIrVuuUdjhJEr4sElkf0ttGR2zL/cDAgNRS+GsJcjOig5l6g7FuKqEJD2vA2FC
-NUPcJoA+yPYSfAPiSdwXr8R6EEtWJyQyQkJuc2tWKkdEK6HmMZ8OlrM97Rs5Rgc5
-ak/EPFO7HoV2gheyMt3wU1OtjeO5KHkrp6878QF/eX9yV7hnahOyUq7zaF05JuEl
-LpHE9HZTCBV6K7pJ7y6F8YVV/kFvAhb8C1wEgvnVL5lbcDq1Q85ah+c5BnkaxKpx
-dQEb6hKdKlGAWWsqmysMgif2WMEFcSm86VREuCAfuMxdk2iIJpsob65jNvcXs8Ok
-+gKrG+sgovoE20b0pHRHDDMEydjHbVgkyuWjufWssuc/B/JeV2Q8ETDEtdzLa80l
-PGMcij4O3Ku52ThAqab2aSdXAI5VCYAGmLJ5XjIsEHfLXiMWm5scK9nKBcVIKIUU
-eRZEm9eeC3/3stMLbtf0kbjkSrNMPN84UY2IOtR1ttLpqqDL94/3N9gHJy/egK8k
-2XF6H0E5+vevN2OzOs/J
-=ynTH
+iQIcBAEBCAAGBQJT4JFiAAoJEPGu1DbS6WIAUBwP/0mVmY3wD9fLb+DZD8+9YJZP
+1db6Icy9nOcO6LpJlKX/l9puoZdUXGsxw4e1UHbYU3GqkQ7U8zBLWJuR8ON/VEYO
+asE2yHakZuOOTYWQr0ftuTZQHrkPqJin98ELIvlx8uA1q288+64ZQWMuCdGvRgjV
+SC4YRmw0BRnrxNi4HKck0a81vSTPW2D3/xso3R0GAyDLUQpCFa1mffEBAnbkhFLa
+WWtt4RDSBEF0ZEhDgT3mLacb8Ivg32pvR1d/8eITZaB+4xRdUlcyt1gyyST2p2Uu
+dBJUZodiunCKKoo1z0ehIWZVKwA8EPxlj9F6gocx5rwbrCtndgnkPZr51HAvfeRQ
+R2746SchFcKwQFXU6WYF2T51EGQkR5OWCQb+YF9iXn6WPVKhcJUJMiUTRvC+jaPl
+yLl7lSYZBpF5RhzezdKE0NGbYX9Fck4gxdRRn6YHCfs7XNrcpT0txoEUFjS7sNKX
+P1dEspZGcg8c+48/HLc7RszfJfDNnEaTEr5DEDi2qQqjKiGVbSPO9tC3BLceaSrr
+twSxx/SmRxSTEFMXR5wNpYUhwUQo0FOwV4g6dEn27P2R0pmIJM+O96yjlpylLMFC
+uB+Cu2HZNijU9fv6kfgeX+/UG0DBVuriHZW0PCvyCFXDv23VPvTYTrkDOuWOlZTK
+ctpGofcRVZlQFCfwTIcg
+=nHZg
 -----END PGP SIGNATURE-----
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)