From: Jason A. Donenfeld <zx2c4@gentoo.org>
Date: Fri, 15 Jul 2016 14:43:37 +0000 (+0200)
Subject: net-misc/wireguard: improve dependencies
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e41adc5a07da69e7ea6724f708640439506898f9;p=gentoo.git

net-misc/wireguard: improve dependencies

Package-Manager: portage-2.3.0
---

diff --git a/net-misc/wireguard/wireguard-0.0.20160711.ebuild b/net-misc/wireguard/wireguard-0.0.20160711.ebuild
index f1bef431e1dd..ab901cd4639f 100644
--- a/net-misc/wireguard/wireguard-0.0.20160711.ebuild
+++ b/net-misc/wireguard/wireguard-0.0.20160711.ebuild
@@ -28,11 +28,8 @@ RDEPEND="${DEPEND}"
 
 MODULE_NAMES="wireguard(net:src)"
 BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1"
-CONFIG_CHECK="NET_UDP_TUNNEL IPV6 NETFILTER_XT_MATCH_HASHLIMIT ~PADATA"
-ERROR_NET_UDP_TUNNEL="WireGuard requires NET_UDP_TUNNEL."
-ERROR_IPV6="WireGuard requires IPV6 support in the kernel."
-ERROR_NETFILTER_XT_MATCH_HASHLIMIT="WireGuard requires NETFILTER_XT_MATCH_HASHLIMIT."
-ERROR_PADATA="If you're running a multicore system you likely should enable CONFIG_PADATA for improved performance and parallel crypto."
+CONFIG_CHECK="NET INET NET_UDP_TUNNEL NF_CONNTRACK NETFILTER_XT_MATCH_HASHLIMIT CRYPTO_BLKCIPHER ~PADATA"
+WARNING_PADATA="If you're running a multicore system you likely should enable CONFIG_PADATA for improved performance and parallel crypto."
 
 pkg_setup() {
 	linux-mod_pkg_setup
diff --git a/net-misc/wireguard/wireguard-9999.ebuild b/net-misc/wireguard/wireguard-9999.ebuild
index f1bef431e1dd..ab901cd4639f 100644
--- a/net-misc/wireguard/wireguard-9999.ebuild
+++ b/net-misc/wireguard/wireguard-9999.ebuild
@@ -28,11 +28,8 @@ RDEPEND="${DEPEND}"
 
 MODULE_NAMES="wireguard(net:src)"
 BUILD_PARAMS="KERNELDIR=${KERNEL_DIR} V=1"
-CONFIG_CHECK="NET_UDP_TUNNEL IPV6 NETFILTER_XT_MATCH_HASHLIMIT ~PADATA"
-ERROR_NET_UDP_TUNNEL="WireGuard requires NET_UDP_TUNNEL."
-ERROR_IPV6="WireGuard requires IPV6 support in the kernel."
-ERROR_NETFILTER_XT_MATCH_HASHLIMIT="WireGuard requires NETFILTER_XT_MATCH_HASHLIMIT."
-ERROR_PADATA="If you're running a multicore system you likely should enable CONFIG_PADATA for improved performance and parallel crypto."
+CONFIG_CHECK="NET INET NET_UDP_TUNNEL NF_CONNTRACK NETFILTER_XT_MATCH_HASHLIMIT CRYPTO_BLKCIPHER ~PADATA"
+WARNING_PADATA="If you're running a multicore system you likely should enable CONFIG_PADATA for improved performance and parallel crypto."
 
 pkg_setup() {
 	linux-mod_pkg_setup