gentoo resync : 28.04.2018

4 files changed, 2 insertions, 65 deletions

diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index f4dea99c4ab1..4fe69e9d6db7 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,7 +1,4 @@
 AUX linux-4.15-2.patch 3248 BLAKE2B 376d3ba01865ed6cfcedc7900e4a034881abb0ff5a98bc4f40a51122a6950f92ecfbb9e36590be3e735f69f4639b889d1d4b5e215fccf92090e157d96ce49f77 SHA512 b4bfb0f1674c1add10b743438853abe3892d7355d251d30cc5ee927c161541e8bb32ec0e89db1db3ca96f29f3273fe53cbce58e75094216e7f7738a952c430aa
-AUX r8168-8.044.02-linux-4.11.patch 1025 BLAKE2B 03113160d754fb68d1361a4f0e270bac5fae8324e54f40fdbe3ba9ab6c461b005f7fdc689b20662a479de0af2304a956b824900df9815612251d98c766b85ed4 SHA512 ecde1267124554fc3a964b1e72000a0af5b551f40c2ad0c8f4a6e487f70ca35ce8aef13cf139466ce0040750995f0aaa833a956b41548762d5df6aaf9547edb1
-DIST r8168-8.044.02.tar.bz2 95880 BLAKE2B f153b077f8112c2b3c81a923a9a9c7d5096d141adb1cc8dd220f9fdf5df32af90c30f19512dc95bb2761febcfe3a59b6634e9fdec8fbb08b6b493a15aad99d0f SHA512 d7e4fd73ee4f17440613b78163777fc0b9e472490a900fdf8e66c4e16f413cc01f49991a68c7bfb19ddf9577e706d0410ff7c8e85ced53e9740e69efda729512
 DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563
-EBUILD r8168-8.044.02.ebuild 767 BLAKE2B 97d11944d07292ab81224d5e66e683fea5af74dcd9561b89bb855c6b2e12d22e2133db3d894ab7dcdcb8efd8808908768aa8000f9a0e509412cc75cab14dc56f SHA512 95d90ef205878653f5c64f872daba715e29680fa291f5b7f1e3acba27b9e1199eac9542af054499a1437771bb2c0d4b36462edd0e696035de17ab33d64aa6d93
-EBUILD r8168-8.045.08.ebuild 766 BLAKE2B 8eba886ddac458cd004653b72e0fcac297322b50617d870a6bcc57c26c2de97c95c073a16173fb492675cbea8ed5efaa3adc752445b834203bfe0e3244fb9a6b SHA512 0d7c5b1035f139eb34210002d70a46f6150156eb6a747f48998ec2f84195198624ec72d9163e23a446dd90e6106c5a4036488bd2bfc8a3cc032eb82ab7c85b35
+EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629
 MISC metadata.xml 484 BLAKE2B d2e95cf281876ff9ac28d8c35fb696b4a813d40abbe84756f7cb83f6b6c495f89d6cbb3490ef7813eb0bc3b60ee31bfb00c14b6f4a351c7e14e207537cccd0f5 SHA512 7abfc4933b44ad4365a455892cc10ef3797827f87db77e8b8349e19f6d77922bf9c3c094e5f5c29694bc240e43ac72e88daf3acc3ed8d63ffd4b90554fe9e67e
diff --git a/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch b/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch
deleted file mode 100644
index ba1dd372dfab..000000000000
--- a/net-misc/r8168/files/r8168-8.044.02-linux-4.11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff a/src/r8168.h b/src/r8168.h
---- a/src/r8168.h	2017-01-11 14:19:18.000000000 +0800
-+++ b/src/r8168.h	2017-05-02 21:18:54.541652414 +0800
-@@ -36,6 +36,10 @@
- #include "r8168_realwow.h"
- #include "r8168_fiber.h"
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
-+#include <linux/sched/signal.h>
-+#endif
-+
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
- #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)
- #define vlan_tx_tag_present skb_vlan_tag_present
-diff a/src/r8168_n.c b/src/r8168_n.c
---- a/src/r8168_n.c	2017-01-11 14:18:43.000000000 +0800
-+++ b/src/r8168_n.c	2017-05-02 21:20:57.488644205 +0800
-@@ -25732,7 +25732,9 @@
-                         if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
-                                 rtl8168_rx_skb(tp, skb);
- 
-+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4, 10, 0))
-                         dev->last_rx = jiffies;
-+#endif
-                         RTLDEV->stats.rx_bytes += pkt_size;
-                         RTLDEV->stats.rx_packets++;
-                 }
diff --git a/net-misc/r8168/r8168-8.044.02.ebuild b/net-misc/r8168/r8168-8.044.02.ebuild
deleted file mode 100644
index 4822eb150790..000000000000
--- a/net-misc/r8168/r8168-8.044.02.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod eutils
-
-DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
-HOMEPAGE="http://www.realtek.com.tw"
-SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0009-${P}.tar.bz2 -> ${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-MODULE_NAMES="r8168(net:${S}/src)"
-BUILD_TARGETS="modules"
-
-CONFIG_CHECK="!R8169"
-ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-linux-4.11.patch
-)
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
-}
-
-src_install() {
-	linux-mod_src_install
-	dodoc README
-}
diff --git a/net-misc/r8168/r8168-8.045.08.ebuild b/net-misc/r8168/r8168-8.045.08.ebuild
index aefe5b84ce64..c9ecc0bee439 100644
--- a/net-misc/r8168/r8168-8.045.08.ebuild
+++ b/net-misc/r8168/r8168-8.045.08.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.realtek.com.tw"
 SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0010-${P}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 MODULE_NAMES="r8168(net:${S}/src)"
 BUILD_TARGETS="modules"