From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E02F138334 for ; Sat, 28 Dec 2019 08:04:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A234E0AFB; Sat, 28 Dec 2019 08:04:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3C7CE0AF6 for ; Sat, 28 Dec 2019 08:04:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A3B634DC3D for ; Sat, 28 Dec 2019 08:04:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A86074 for ; Sat, 28 Dec 2019 08:04:29 +0000 (UTC) From: "Jason A. Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason A. Donenfeld" Message-ID: <1577520254.95513fef437a6bc42c196885f3d4a45ff6b11947.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/wireguard-tools/metadata.xml net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild net-vpn/wireguard-tools/wireguard-tools-9999.ebuild X-VCS-Directories: net-vpn/wireguard-tools/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: 95513fef437a6bc42c196885f3d4a45ff6b11947 X-VCS-Branch: master Date: Sat, 28 Dec 2019 08:04:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 642bbd3e-2c7d-4915-9d14-ba3117ffab51 X-Archives-Hash: 3f1aa1ef4cf551b2f0e2fe9f7a5f7a0c commit: 95513fef437a6bc42c196885f3d4a45ff6b11947 Author: Jason A. Donenfeld gentoo org> AuthorDate: Sat Dec 28 08:03:27 2019 +0000 Commit: Jason A. Donenfeld gentoo org> CommitDate: Sat Dec 28 08:04:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95513fef net-vpn/wireguard-tools: make wg-quick(8) optional Closes: https://bugs.gentoo.org/671894 Suggested-by: Aaron Jones gmail.com> Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jason A. Donenfeld gentoo.org> net-vpn/wireguard-tools/metadata.xml | 3 +++ net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild | 9 +++++++-- net-vpn/wireguard-tools/wireguard-tools-9999.ebuild | 9 +++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/net-vpn/wireguard-tools/metadata.xml b/net-vpn/wireguard-tools/metadata.xml index 915f0022706..652da2d16d0 100644 --- a/net-vpn/wireguard-tools/metadata.xml +++ b/net-vpn/wireguard-tools/metadata.xml @@ -5,4 +5,7 @@ zx2c4@gentoo.org Jason A. Donenfeld + + Install the wg-quick(8) helper tool. Most users want to use this. + diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild index 5c75ad1f60b..8a3241a0355 100644 --- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild +++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild @@ -19,11 +19,15 @@ fi LICENSE="GPL-2" SLOT="0" +IUSE="+wg-quick" BDEPEND="virtual/pkgconfig" DEPEND="net-libs/libmnl" RDEPEND="${DEPEND} - || ( net-firewall/nftables net-firewall/iptables ) + wg-quick? ( + || ( net-firewall/nftables net-firewall/iptables ) + virtual/resolvconf + ) !<=net-vpn/wireguard-0.0.20191219 " @@ -33,6 +37,7 @@ wg_quick_optional_config_nob() { } pkg_setup() { + use wg-quick || return 0 wg_quick_optional_config_nob IP_ADVANCED_ROUTER wg_quick_optional_config_nob IP_MULTIPLE_TABLES wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES @@ -67,7 +72,7 @@ src_install() { emake \ WITH_BASHCOMPLETION=yes \ WITH_SYSTEMDUNITS=yes \ - WITH_WGQUICK=yes \ + WITH_WGQUICK=$(usex wg-quick) \ DESTDIR="${D}" \ BASHCOMPDIR="$(get_bashcompdir)" \ SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \ diff --git a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild index 5c75ad1f60b..8a3241a0355 100644 --- a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild +++ b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild @@ -19,11 +19,15 @@ fi LICENSE="GPL-2" SLOT="0" +IUSE="+wg-quick" BDEPEND="virtual/pkgconfig" DEPEND="net-libs/libmnl" RDEPEND="${DEPEND} - || ( net-firewall/nftables net-firewall/iptables ) + wg-quick? ( + || ( net-firewall/nftables net-firewall/iptables ) + virtual/resolvconf + ) !<=net-vpn/wireguard-0.0.20191219 " @@ -33,6 +37,7 @@ wg_quick_optional_config_nob() { } pkg_setup() { + use wg-quick || return 0 wg_quick_optional_config_nob IP_ADVANCED_ROUTER wg_quick_optional_config_nob IP_MULTIPLE_TABLES wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES @@ -67,7 +72,7 @@ src_install() { emake \ WITH_BASHCOMPLETION=yes \ WITH_SYSTEMDUNITS=yes \ - WITH_WGQUICK=yes \ + WITH_WGQUICK=$(usex wg-quick) \ DESTDIR="${D}" \ BASHCOMPDIR="$(get_bashcompdir)" \ SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \