net-misc/r8168: Fix building 8.047.05 on Linux 5.4

Closes: https://bugs.gentoo.org/701200
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/net-misc/r8168/files/linux-5.4.patch b/net-misc/r8168/files/linux-5.4.patch
new file mode 100644 (file)
index 0000000..1979835
--- /dev/null
+++ b/net-misc/r8168/files/linux-5.4.patch
@@ -0,0 +1,12 @@
+diff -Naur r8168-8.047.05.orig/src/r8168_n.c r8168-8.047.05/src/r8168_n.c
+--- r8168-8.047.05.orig/src/r8168_n.c  2019-07-23 10:22:09.000000000 +0800
++++ r8168-8.047.05/src/r8168_n.c       2019-12-23 00:55:34.121947346 +0800
+@@ -56,7 +56,7 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/completion.h>
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) && LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
+ #include <linux/pci-aspm.h>
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)

diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild
index 5d05429e616c9033730b65d7c8bea44cb44708fb..152d2ec6ffca2a61c14e637c39969f843516ad8b 100644 (file)
--- a/net-misc/r8168/r8168-8.047.05.ebuild
+++ b/net-misc/r8168/r8168-8.047.05.ebuild
@@ -19,6 +19,10 @@ BUILD_TARGETS="modules"
 CONFIG_CHECK="!R8169"
 ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
 
+PATCHES=(
+       "${FILESDIR}"/linux-5.4.patch
+)
+
 pkg_nofetch() {
        einfo "Please download ${SRC_URI} from:"
        einfo "  ${HOMEPAGE}"