From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 20 Dec 2015 19:16:37 +0000 (-0500)
Subject: app-emulation/qemu: disable libgcrypt usage #568856
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=64ce86d1757fa73a25cdca0287d5360cca5b531b;p=gentoo.git

app-emulation/qemu: disable libgcrypt usage #568856
---

diff --git a/app-emulation/qemu/qemu-2.5.0.ebuild b/app-emulation/qemu/qemu-2.5.0.ebuild
index 249a20a6dda7..70f595ea5b5c 100644
--- a/app-emulation/qemu/qemu-2.5.0.ebuild
+++ b/app-emulation/qemu/qemu-2.5.0.ebuild
@@ -343,6 +343,11 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
 		--python="${PYTHON}"
 		--cc="$(tc-getCC)"
 		--cxx="$(tc-getCXX)"
@@ -372,6 +377,7 @@ qemu_src_configure() {
 		$(conf_softmmu fdt)
 		$(conf_softmmu glusterfs)
 		$(conf_softmmu gnutls)
+		$(conf_softmmu gnutls nettle)
 		$(conf_softmmu gtk)
 		$(conf_softmmu infiniband rdma)
 		$(conf_softmmu iscsi libiscsi)
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 249a20a6dda7..70f595ea5b5c 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -343,6 +343,11 @@ qemu_src_configure() {
 		--disable-guest-agent
 		--disable-strip
 		--disable-werror
+		# We support gnutls/nettle for crypto operations.  It is possible
+		# to use gcrypt when gnutls/nettle are disabled (but not when they
+		# are enabled), but it's not really worth the hassle.  Disable it
+		# all the time to avoid automatically detecting it. #568856
+		--disable-gcrypt
 		--python="${PYTHON}"
 		--cc="$(tc-getCC)"
 		--cxx="$(tc-getCXX)"
@@ -372,6 +377,7 @@ qemu_src_configure() {
 		$(conf_softmmu fdt)
 		$(conf_softmmu glusterfs)
 		$(conf_softmmu gnutls)
+		$(conf_softmmu gnutls nettle)
 		$(conf_softmmu gtk)
 		$(conf_softmmu infiniband rdma)
 		$(conf_softmmu iscsi libiscsi)