[gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard/

[Jason A. Donenfeld]

commit:     3a604286e9fb05cbc86e3a2fdaadc0f3ec7659c1
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 12:39:21 2019 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 12:50:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a604286

net-vpn/wireguard: revbump to 0.0.20191219-r1 for split tools package

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 ...191219.ebuild => wireguard-0.0.20191219-r1.ebuild} | 19 ++++---------------
 net-vpn/wireguard/wireguard-9999.ebuild               | 19 ++++---------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/net-vpn/wireguard/wireguard-0.0.20191219.ebuild 
b/net-vpn/wireguard/wireguard-0.0.20191219-r1.ebuild
similarity index 91%
rename from net-vpn/wireguard/wireguard-0.0.20191219.ebuild
rename to net-vpn/wireguard/wireguard-0.0.20191219-r1.ebuild
index e405c52079d..917e43d3e74 100644
--- a/net-vpn/wireguard/wireguard-0.0.20191219.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20191219-r1.ebuild
@@ -23,8 +23,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug +module +tools module-src"
 
-DEPEND="tools? ( net-libs/libmnl || ( net-firewall/nftables 
net-firewall/iptables ) )"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="${DEPEND}
+       tools? ( net-vpn/wireguard-tools )
+"
 
 MODULE_NAMES="wireguard(kernel/drivers/net:src)"
 BUILD_TARGETS="module"
@@ -55,23 +57,10 @@ src_compile() {
        BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
        use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
        use module && linux-mod_src_compile
-       use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools 
CC="$(tc-getCC)" LD="$(tc-getLD)"
 }
 
 src_install() {
        use module && linux-mod_src_install
-       if use tools; then
-               dodoc README.md
-               dodoc -r contrib/examples
-               emake \
-                       WITH_BASHCOMPLETION=yes \
-                       WITH_SYSTEMDUNITS=yes \
-                       WITH_WGQUICK=yes \
-                       DESTDIR="${D}" \
-                       BASHCOMPDIR="$(get_bashcompdir)" \
-                       PREFIX="${EPREFIX}/usr" \
-                       -C src/tools install
-       fi
        use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src 
dkms-install
 }
 

diff --git a/net-vpn/wireguard/wireguard-9999.ebuild 
b/net-vpn/wireguard/wireguard-9999.ebuild
index e405c52079d..917e43d3e74 100644
--- a/net-vpn/wireguard/wireguard-9999.ebuild
+++ b/net-vpn/wireguard/wireguard-9999.ebuild
@@ -23,8 +23,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug +module +tools module-src"
 
-DEPEND="tools? ( net-libs/libmnl || ( net-firewall/nftables 
net-firewall/iptables ) )"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="${DEPEND}
+       tools? ( net-vpn/wireguard-tools )
+"
 
 MODULE_NAMES="wireguard(kernel/drivers/net:src)"
 BUILD_TARGETS="module"
@@ -55,23 +57,10 @@ src_compile() {
        BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
        use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
        use module && linux-mod_src_compile
-       use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools 
CC="$(tc-getCC)" LD="$(tc-getLD)"
 }
 
 src_install() {
        use module && linux-mod_src_install
-       if use tools; then
-               dodoc README.md
-               dodoc -r contrib/examples
-               emake \
-                       WITH_BASHCOMPLETION=yes \
-                       WITH_SYSTEMDUNITS=yes \
-                       WITH_WGQUICK=yes \
-                       DESTDIR="${D}" \
-                       BASHCOMPDIR="$(get_bashcompdir)" \
-                       PREFIX="${EPREFIX}/usr" \
-                       -C src/tools install
-       fi
        use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src 
dkms-install
 }