Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

4 files changed, 27 insertions, 40 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/Manifest b/net-misc/r8168/Manifest
index ac0ac1c7dc95..72a6a77a4002 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -2,29 +2,28 @@
 Hash: SHA256
 
 AUX r8168-8.028.00-linux-3.3-compat.patch 724 SHA256 64d45a082464cfe170c82f6e35a501c8e84b69c83ccce6bcf48c312665c53b18 SHA512 8d42d14dd3b121a1dd2105ff9dde40d56e236066e519fa0677de72e3c19c4e2097239ffb3fc60beb456475c870743183620b6eff30a29ddf529ccdb51c4aac3e WHIRLPOOL 0c8a1df4e11e4ea0ca689fe15e2055233e87cf069b387d447287aa515c08bb26776f4313461dc89d7bf85b4d5ade6e74c49d864b8a43a73bc6df56927e6d8749
-AUX r8168-8.039.00-linux-4-compat.patch 628 SHA256 e6087439b30c8f6c26113c182dd1f95044d918241b1c281b6e84b9a334e68910 SHA512 d2dd86131085a7f3f26ebca1a3786338c752c68fb3325d76e038504e22a56e3ce12743daa87cc1136833bd10fd7d46e8afb79c0d8c78838ea2b78aa253809c13 WHIRLPOOL 100483d96b6888e9dd0e8b27d3a29c82db9180f8f9c7fbe032dda42de9402584d5e926d4e68beb43c87e6de03293c030e755b19f12f30b532f1efed9926f9d40
 DIST r8168-8.028.00.tar.bz2 63208 SHA256 c77873f43693eea5304e17e35ff3d6503f6581e358d28c38927573ea56f4d6a3
-DIST r8168-8.039.00.tar.bz2 81132 SHA256 767d922270274e781d8d42493a0021db1cafcb0388ac62564d0c0c3d82703edd SHA512 30c1d7a96b048518f0755cd616e1b1f5c3c7d1343a903dd8169e6bcb145c0a3ac0d7bbcdee6d2a2dd8b76c69f807a56e4678c5e19a10da3f46fe70e0aa5f10d2 WHIRLPOOL 5423d86ddb733a0236fd3a38ac43dd371bbd9255480983fdb9f2bc023977b84367df2b93cf91851eeef3267fdef2cb389231a6522f23148e8739f8587ff9ed36
+DIST r8168-8.040.00.tar.bz2 87770 SHA256 da0444fcd7aabb7762310cdf2047fd0aeb7a9ed97a3d6b80d62a0fc71e0730bf SHA512 58ec8c1ff8742ad1ee0e2a0fa1141a8ace26cac954542b16325c0d9eba6113a2baaf4de2c61025a6fc6532eb17aa2e7645daee0fef539b219f863355c731d6d8 WHIRLPOOL 80ca19d49e03ca6d1b9524710511a3b632a13ec8045515c3264663a73394cede1e04d4cad2f8f1ea5d7a8b3ab9554c1bfaec7ae356bcdf397ba6d045123d314c
 EBUILD r8168-8.028.00.ebuild 848 SHA256 b888bd28da9e6340360ab85122ca8d6da04badb8b20825b752ae1e8bf71e3d39 SHA512 d254ffa67f3691b3a48c86e0874f5311612c24d2e6d11b8c0531acdaa8eaa27137c7b5a95dec6dd9630d2c48ee1782a487a37065f3056ff5396b7b4bf97140c7 WHIRLPOOL 78be42d320afa0a4b858664b61780058d3473caa07d76386165523ddb34da338401313a437388cb82efc8dee365fcc118f64637c7f9284811a750b138555b659
-EBUILD r8168-8.039.00.ebuild 904 SHA256 b618ee646df5df8d5e53cf65748bea8769cb2b9c96935721d2130f34c6ef296f SHA512 4151c823ba6df5d775dcdc00fced737d41ed2877578da3e1973a553dbc3dd7e73f1c83bf0e46e746da261754a0b5532331c3efebf25281034a81cf6eaf18d3c4 WHIRLPOOL ef249d772924990fad2779ddf0da7d3f8ef60213022e92337db723a9607a7e347f72f97292c3d059d827a12715cdf8e20e631baab12004439b023410c80cebd9
-MISC ChangeLog 3536 SHA256 e86848375e2eae35cdc2000ebf612a586ce7f872e73d78933b4a0800fdaefd30 SHA512 c454699e7dc7e23d1fd1da36d36a7b80b4787978499d65cdfd169d7fef9a786824fc51e3b799c5a1520da046b0b74c8258a5951f48e4b92ec0f6ec2c7698605f WHIRLPOOL 236c0e13864501a53eba0bdf954038328ec25ab7ae9cbbd38033ffa4c432b66db0723ffda5153d69e1b757a2eba806f90c0fcf9f4fc87f8dd68b24bfa9ff175d
+EBUILD r8168-8.040.00.ebuild 827 SHA256 404977e3266f013b80803c995d519cb11c2c9aeb696f2348d20c128dbce05f27 SHA512 12aef4766806c883f6f63bed4dbf5e7458a7af8530bdab24bfc6e39b08d41825a7cf93a22f6fbb8eb93f6eb6e36176f3dd51f1db957d85bcea5e5d77f131617f WHIRLPOOL 587253d6dbc9394b2e46336ba20c176c761af514886eb2cee55367bffd1b72111d1ce36196561973a7787d5a0b166fd4c1df5ce8dc7b3b9603353a2f4e386b74
+MISC ChangeLog 3728 SHA256 424f3b10769cb336cdb960db026a732eaf427a4b9448121d4c6fb89b0ef576ff SHA512 15dabd6c4a4d691b31cb39a0877446826d43aced01293738a05eaffacd841de74701c0ad295c33c25b34363e3e88c68cb6c4cb497244a0da8b4f70a19bb9824c WHIRLPOOL 2d04133047e2dd730c06beea3934d147c1ab9b4096c433348b2d44e4bbdd46d0376492dce6432cc21f113007dea948b5227d202939cf7d42ea8ed7e0e0ada113
 MISC metadata.xml 470 SHA256 d33029ad508235cd26612cf55c82a7b6945d15d32dd103dc27375e95981d9f7f SHA512 c6c5592d0b00fa550f043fa4e3dc88d462a2e466d28ed34c846a226e702cbd6007a957cc16a26ede6854231b3b0d6221d69724a5e57c348e8d802789f8dab20b WHIRLPOOL 2524f8a8eb0ec80df589febbe2f17c9ec27b64d5efa8b78f86ab48dd276b5224586d36272b34d3e35f43f75af6dd812623c028463ba0c1a11c91b3f0c63ed60c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVMDxLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVq2v0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kCOoQAIm95kZNvhKg8+6oZJpJxhWb
-UaIvUipeGtD9tT5UHYtt4DN3FRvU9eBpIEo1txJ1Qd0Bw9YYNUCjbbNTQElklD/y
-/LN0TDrwoisrp3UGNX/Z5qEE25YemdG6e1zDMTKDhPHX5wJIaEbyFDCsCAiDLvww
-v+JpNK+3QFW6pGP0a2B3tsqNbf5IoJMjnHAo5+fyG0aFT+zFnq1CPJ5EXknEWhvM
-gE8Cg/I+/lizDNJwvoT0nJFFFFrS7HNoMRW3YP005h4g+Lv6uyMSIN8JqSs4FCPo
-2O4yGMFCA/npGS1oq0cPLIZb1AapYo854Z1lsz/kx5Y20DC7FKxZY0EnOdizYO7z
-meHsFfUAcix4G49r5VXZXlTYIrbFtbMVqTG/gZEPTlR2gKU8KHXZ0GXBYe3yYWRs
-w/ER0nXkwuSHm14kWtdyRBMxpV6WdktFjyDRhR1VO/eT45nHhrBamH6rUnhYx22f
-o6x4IMPRbPfY7AjX00G5UmCuvd8aXxbJVXOxdcBYNNOHjBqEWloYSHqzuGPgfiDc
-iEwoxkiSyftU7Hny6f98KuZ6UgwAMZBIMPkgGwK+OHwpkOkzfttz0mS7VIyNqtxw
-XbmErVWP6+5iiLYF84XMpnOk7J8SQO+4tyg/1blV8lSHbNK7D5BNPIAK1bGkwL5E
-8Nt+g0Tzt9Vk3c98vTgj
-=rR+D
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kEn0P/0jsO0NdGTolLmcSoGhK1YKH
+JHWjwxTEGHk7KtlzCuGEE1L6jzv78TGjR2PAap7HVhCesfjcsEJEKo9W2/ODUmmr
+kQARTPUR/cVi9a4R4/3lOJ1ZS+174qoBUHcOPkzyXoS+MmBRst6aag17NMSqfXex
+Fv+mkflZ1of028iTs38PI/UTXKrv3bJ4ZQbvHpTiP4ciSeT+4YqIBmh3vyb73PxD
+/lsMGeLgPycAWmqbrnKHtIi+om4w8JX1QNx5Dj7YYbKxhpeABnXBODVdjs5LgnpS
+TOYcCu7dQ1EoxiHFenZC6tMtVh6hi/EFirQDVxTsAOY8O+UNTheM8zyxDuuZGkiD
+bMg38cTj0bGFOCQOcv/ZtTPRtAEbyhB8J9d/MF+/ABtc/ErbqTiGitGW47st5eUG
+Qsy4hC6TwUBK0PJkgRUc/J1zoQ3JNihAen9tLgEwzbLf6cwVLBgk9u16Z8rWwU7+
+kmaY3rETFTrYUBlxUsVcAaHSDiQYGebQPi5MBBTREgHs0MVeGQiY4a7QaO0T1SN5
+zfuIAJeKWYUOWTck+w8yZpRXVIwim5xQS8nkbJlyiwqaBphnqdqJY79hKmdr9xuO
+tkpK96+Ko4aq9wvWjOCvy80J/G39VPfAdPl1MEoR5i8q42c86VkBEZYwh8J2LuZn
+Ubkw6N9q8USNUXCB+6zc
+=wuPf
 -----END PGP SIGNATURE-----
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}"