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 437C6138334 for ; Thu, 26 Dec 2019 12:50:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FE62E0D6D; Thu, 26 Dec 2019 12:50:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 05CBFE0D6D for ; Thu, 26 Dec 2019 12:50: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 09E3734DBA7 for ; Thu, 26 Dec 2019 12:50:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C3603A for ; Thu, 26 Dec 2019 12:50: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: <1577364615.3a604286e9fb05cbc86e3a2fdaadc0f3ec7659c1.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/wireguard/wireguard-0.0.20191219-r1.ebuild net-vpn/wireguard/wireguard-0.0.20191219.ebuild net-vpn/wireguard/wireguard-9999.ebuild X-VCS-Directories: net-vpn/wireguard/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason A. Donenfeld X-VCS-Revision: 3a604286e9fb05cbc86e3a2fdaadc0f3ec7659c1 X-VCS-Branch: master Date: Thu, 26 Dec 2019 12:50: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: 0fd4f07c-6cd1-44da-997c-34f7803dd44d X-Archives-Hash: 1a4b87e0f7c26686a00f98edb8d595a9 commit: 3a604286e9fb05cbc86e3a2fdaadc0f3ec7659c1 Author: Jason A. Donenfeld gentoo org> AuthorDate: Thu Dec 26 12:39:21 2019 +0000 Commit: Jason A. Donenfeld gentoo 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 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 }