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

[Jason A. Donenfeld]

commit:     bda5207741e4e1ae4513f51b7fc1162b39cb4101
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 15:20:54 2019 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 15:25:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda52077

net-vpn/wireguard-modules: allow out of tree kernel builds

We also update the version situation description.

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

 .../wireguard-modules/wireguard-modules-0.0.20191226.ebuild | 13 ++++++++++---
 net-vpn/wireguard-modules/wireguard-modules-9999.ebuild     | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/net-vpn/wireguard-modules/wireguard-modules-0.0.20191226.ebuild 
b/net-vpn/wireguard-modules/wireguard-modules-0.0.20191226.ebuild
index 2fe86edba28..dd0ff73d495 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-0.0.20191226.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-0.0.20191226.ebuild
@@ -33,14 +33,21 @@ CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
 pkg_setup() {
        if use module; then
                linux-mod_pkg_setup
-               if kernel_is -lt 3 10 0 || kernel_is -ge 5 6 0; then
-                       die "This version of ${PN} requires 3.10 <= Linux <= 
5.5.y"
+               if kernel_is -ge 5 6 0; then
+                       eerror
+                       eerror "WireGuard has been merged upstream in Linux 
5.6. Therefore,"
+                       eerror "you no longer need this compatibility ebuild. 
Instead, simply"
+                       eerror "enable CONFIG_WIREGUARD=y in your kernel 
configuration."
+                       eerror
+                       die "Use CONFIG_WIREGUARD=y for kernels >= 5.6, and do 
not use this package."
+               elif kernel_is -lt 3 10 0; then
+                       die "This version of ${PN} requires Linux >= 3.10."
                fi
        fi
 }
 
 src_compile() {
-       BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+       BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
        use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
        use module && linux-mod_src_compile
 }

diff --git a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild 
b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
index 2fe86edba28..dd0ff73d495 100644
--- a/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
+++ b/net-vpn/wireguard-modules/wireguard-modules-9999.ebuild
@@ -33,14 +33,21 @@ CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_ALGAPI"
 pkg_setup() {
        if use module; then
                linux-mod_pkg_setup
-               if kernel_is -lt 3 10 0 || kernel_is -ge 5 6 0; then
-                       die "This version of ${PN} requires 3.10 <= Linux <= 
5.5.y"
+               if kernel_is -ge 5 6 0; then
+                       eerror
+                       eerror "WireGuard has been merged upstream in Linux 
5.6. Therefore,"
+                       eerror "you no longer need this compatibility ebuild. 
Instead, simply"
+                       eerror "enable CONFIG_WIREGUARD=y in your kernel 
configuration."
+                       eerror
+                       die "Use CONFIG_WIREGUARD=y for kernels >= 5.6, and do 
not use this package."
+               elif kernel_is -lt 3 10 0; then
+                       die "This version of ${PN} requires Linux >= 3.10."
                fi
        fi
 }
 
 src_compile() {
-       BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+       BUILD_PARAMS="KERNELDIR=${KV_OUT_DIR}"
        use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
        use module && linux-mod_src_compile
 }