From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 15 Jan 2020 15:51:32 +0000
Subject: gentoo resync : 15.01.2020

---
 net-misc/r8168/Manifest              |  5 +++--
 net-misc/r8168/files/linux-5.4.patch | 12 ++++++++++++
 net-misc/r8168/metadata.xml          |  5 +----
 net-misc/r8168/r8168-8.047.05.ebuild |  4 ++++
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 net-misc/r8168/files/linux-5.4.patch

(limited to 'net-misc/r8168')

diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index a5c885e77655..68c288f5fcbf 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,6 +1,7 @@
 AUX linux-4.15-2.patch 3248 BLAKE2B 376d3ba01865ed6cfcedc7900e4a034881abb0ff5a98bc4f40a51122a6950f92ecfbb9e36590be3e735f69f4639b889d1d4b5e215fccf92090e157d96ce49f77 SHA512 b4bfb0f1674c1add10b743438853abe3892d7355d251d30cc5ee927c161541e8bb32ec0e89db1db3ca96f29f3273fe53cbce58e75094216e7f7738a952c430aa
+AUX linux-5.4.patch 531 BLAKE2B e928e157f0e77da1857715cc2c5d8ecc37e968dd4c2d2f4bf754b0f3c40abba148f8e2da33e1df9e2265022de2618a9aa9c1a45a3fe9ebd72f83fa5da35d0531 SHA512 8f200510dca69ca2ab3e856b4b0f43e5ca62035c1295d66562c88c596aa9aab3e361ec3090106cdc4fa489aa416b92f2417bf1e9847953d50822bb7d85325641
 DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563
 DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6
 EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629
-EBUILD r8168-8.047.05.ebuild 920 BLAKE2B dab9ae702be8ab8a3831cd5bffa59cc50568a39fac3151808fbc13ec35c8b3564b13a952784361ebb4a02f12de3464ae8b8a03b125706bb01f27bd77d0bec7ba SHA512 6fa701e698809e092cec6f333218b01afcad37e593de77b4875c5f22af3ac38013569ba8280954bee6c1618b55d004a27c0707aa424f1e9e37b4edeb108479c5
-MISC metadata.xml 484 BLAKE2B d2e95cf281876ff9ac28d8c35fb696b4a813d40abbe84756f7cb83f6b6c495f89d6cbb3490ef7813eb0bc3b60ee31bfb00c14b6f4a351c7e14e207537cccd0f5 SHA512 7abfc4933b44ad4365a455892cc10ef3797827f87db77e8b8349e19f6d77922bf9c3c094e5f5c29694bc240e43ac72e88daf3acc3ed8d63ffd4b90554fe9e67e
+EBUILD r8168-8.047.05.ebuild 964 BLAKE2B 9f22ada0e96b4c2eb3694d3f3a701126a63d83aa604b4bc54c07dec87643a082f667eba18d3fac61da233dbec632b19e11b97e6e11ddda577ae7832d49752f9c SHA512 19b08b997d683619659e27291db7ec96bc21fcfc373cf917fb7231745c27f7e2bc8d921a07510309381cb6c5f036b3e4d84cb6cb1c48e514f7e011bac03eb4ae
+MISC metadata.xml 402 BLAKE2B 85f808730ecf18c69caa2f0299d881ad0e23956515ff7bfa6941a9abf0b89d5c994e452fd9b6e0e10bec8786cb056d83072fed4dd990de4403317a97c26f3ea8 SHA512 ae3047ed24b4b998463b7d155671ddb1e960af5fd50da7f0f6ac2f831628936f3c4917bbf5622688fc4ee19f9faf7c91b7990b37eb29711bb1ca11ca5ee0878f
diff --git a/net-misc/r8168/files/linux-5.4.patch b/net-misc/r8168/files/linux-5.4.patch
new file mode 100644
index 000000000000..197983597be7
--- /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/metadata.xml b/net-misc/r8168/metadata.xml
index 31b4221e42ea..cc09120dcec1 100644
--- a/net-misc/r8168/metadata.xml
+++ b/net-misc/r8168/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chewi@gentoo.org</email>
-		<name>James Le Cuirot</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription>Official Realtek r8168 linux driver. The following cards are currently supported:
 RTL8111B RTL8168B RTL8111 RTL8168 RTL8111C RTL8111CP RTL8111D(L) RTL8168C
 RTL8111DP RTL8111E RTL8168E RTL8111F RTL8411</longdescription>
diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild
index 5d05429e616c..152d2ec6ffca 100644
--- 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}"
-- 
cgit v1.2.3