Version bump.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)

3 files changed, 9 insertions, 21 deletions

diff --git a/net-misc/r8168/ChangeLog b/net-misc/r8168/ChangeLog
index cfb8245960a5..ccaf362a3bc6 100644
--- a/net-misc/r8168/ChangeLog
+++ b/net-misc/r8168/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/r8168
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/ChangeLog,v 1.18 2015/04/16 22:48:37 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/ChangeLog,v 1.19 2015/07/19 09:20:51 chewi Exp $
+
+*r8168-8.040.00 (19 Jul 2015)
+
+  19 Jul 2015; James Le Cuirot <chewi@gentoo.org> +r8168-8.040.00.ebuild,
+  -files/r8168-8.039.00-linux-4-compat.patch, -r8168-8.039.00.ebuild:
+  Version bump.
 
   16 Apr 2015; James Le Cuirot <chewi@gentoo.org>
   +files/r8168-8.039.00-linux-4-compat.patch, r8168-8.039.00.ebuild:
diff --git a/net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch b/net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch
deleted file mode 100644
index 67ad6a25f1b5..000000000000
--- a/net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/r8168_n.c b/src/r8168_n.c
-index 9d6f231..c4200d0 100755
---- a/src/r8168_n.c
-+++ b/src/r8168_n.c
-@@ -3291,6 +3291,9 @@ rtl8168_tx_vlan_tag(struct rtl8168_private *tp,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
-         tag = (tp->vlgrp && vlan_tx_tag_present(skb)) ?
-               TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
-+        tag = (skb_vlan_tag_present(skb)) ?
-+              TxVlanTag | swab16(skb_vlan_tag_get(skb)) : 0x00;
- #else
-         tag = (vlan_tx_tag_present(skb)) ?
-               TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
diff --git a/net-misc/r8168/r8168-8.039.00.ebuild b/net-misc/r8168/r8168-8.040.00.ebuild
index 29c50e786da9..46cec063626e 100644
--- a/net-misc/r8168/r8168-8.039.00.ebuild
+++ b/net-misc/r8168/r8168-8.040.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.039.00.ebuild,v 1.2 2015/04/16 22:48:37 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.040.00.ebuild,v 1.1 2015/07/19 09:20:51 chewi Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit 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/0001-r8168-8.039.00.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/cn/nic/0002-${P}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
@@ -21,10 +21,6 @@ CONFIG_CHECK="!R8169"
 
 ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-linux-4-compat.patch"
-}
-
 pkg_setup() {
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERNELDIR=${KV_DIR}"