Adding a patch to support Linux 3.3 kernels

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 42 insertions, 24 deletions

diff --git a/net-misc/r8168/ChangeLog b/net-misc/r8168/ChangeLog
index a4fa168144c2..4ca5f59d3cf3 100644
--- a/net-misc/r8168/ChangeLog
+++ b/net-misc/r8168/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/r8168
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/ChangeLog,v 1.6 2012/03/31 17:32:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/ChangeLog,v 1.7 2012/04/04 16:53:04 joker Exp $
+
+  04 Apr 2012; Christian Birchinger <joker@gentoo.org> r8168-8.028.00.ebuild:
+  Adding a patch to support Linux 3.3 kernels. This wont affect current users
+  with 3.2 kernels, so it's not required to bump the revision
 
   31 Mar 2012; Markos Chandras <hwoarang@gentoo.org> r8168-8.028.00.ebuild:
   Stable on amd64 wrt bug #404311
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 5c62e8644d89..ae669f00519a 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,28 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX r8168-8.028.00-linux-3.3-compat.patch 1116 RMD160 66a3fcb073b1447191ae82272353f53a3294f0c9 SHA1 991cba7f4bee92cf89c0b4b9b89b48ca7c3bbdcf SHA256 770fb3b938b3a95555194ee468990e70a4014bb907f58a803d8ee50ccffe8166
 DIST r8168-8.026.00.tar.bz2 62799 RMD160 47de502b22c3555b8dd95bde98ad0d012858c2dd SHA1 22128efb9e8a0b2a90e6c3b9ed912756d591da9e SHA256 e0a58706a956f22f6f44a617d218693888bfc5d3eba7197e61ed6cb75eebb425
 DIST r8168-8.027.00.tar.bz2 62916 RMD160 02536191adc1a10a4cbe7d6e3efdf61e65109842 SHA1 2ccdc38ca426f3e752e993326cc728e191cd2e1d SHA256 5bc3b44bd69a05e45ab13be727256a95adf18a658f726141283046b397dc22e2
 DIST r8168-8.028.00.tar.bz2 63208 RMD160 302b55b86d256c8a8e7899162e12a3b5bd7cfacc SHA1 b167a99622332fa96089d74392d26a81f9c679cd SHA256 c77873f43693eea5304e17e35ff3d6503f6581e358d28c38927573ea56f4d6a3
 EBUILD r8168-8.026.00.ebuild 755 RMD160 e96148051e589d535e9e60c80190a5ccdc0a3962 SHA1 ca22e5c14a6f45f164d00d478b4fe59480bf5856 SHA256 de30b1c2b625f1fa62ca61dd8fb8f16e67d11bbe0105d874f69780a3c1924f8c
 EBUILD r8168-8.027.00.ebuild 769 RMD160 30a963e19758a7e242fa50cb6d355f8b9bd7e05f SHA1 6cee6dec858d2db12de8b6a229732f239d694e81 SHA256 7661048835463948249e3b862a075d40d2b9ad1dd866748f77c2a75ddad80159
-EBUILD r8168-8.028.00.ebuild 778 RMD160 552cc89331160c62928648c53b54dd6fe793daea SHA1 6bb461f0b0257b15e2810c1d818585650dc45600 SHA256 b199dfa8d804356f12de5735d73c04dde0ad448d2f275cff3b0139ea117b2c5e
-MISC ChangeLog 1028 RMD160 dbecc2936fa300a2c244745b1e2b469c60789c3f SHA1 31c9e12783990828d52fe16eee3f04f02d0a8eb5 SHA256 a1f39f4ed642004689b030e37b1d3b4b401195baff3882b8896a5b4fffd6a8ac
+EBUILD r8168-8.028.00.ebuild 844 RMD160 c1c551350a76f03e25a0ef27817124892ed772ff SHA1 c2c9139563b75774d4496c2e9b8b09e6ded1ad51 SHA256 56e0ab7b119c746850d80a8a38f71f397ecb55b9c58b248b74907ec26ada66a7
+MISC ChangeLog 1244 RMD160 4ac98c98e893303e4760bd57e22fa6558d12a0b9 SHA1 1a22168b83f22f6d659e865cdec39f3c1592bbc6 SHA256 b94aa17181d4536e2cf61916ac81fc82609512da0ac65f3cdb19890ebf40f154
 MISC metadata.xml 550 RMD160 2a98a4eb0a6abb19f1c60383f052afc221848360 SHA1 3899cbf50f2afdc5a7ac9ef663ed9ddfe58bd7bb SHA256 b3367babace2233dd0dd6b95de96a04e1cb1b840b6421aac9169183af528740a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJPdz/AAAoJEPqDWhW0r/LC+0wP/38/k38jLFPz8GJKSiTXlIX9
-hxmixPIEjeIGMQNu4BPaQY0awcKG/GpXU9h0tKVLfg8xKC2dxSe+SZI12DF2ioVU
-/AM8PQD2eVy+oU8lzWuHaRc+UtL+DwaEXtz9xbQG2SzPLiIF/y8bj9DrCUXWDu67
-xQm3Qdpb6ZPQOa6nzMOgRnBYqSKmx4YM9Z7ObjCiT9ZSNhe1ZL0fWZpHK84pAcjB
-tRyHMe1LWOSJwQ1NliH2tHnDl3xxqrGcLkDKlVcA/Y8Ndw7e/cEMlbyGOHJ496K4
-IF7hzSDQxe5Z3oxFYFxwXG63dCPLAGbi/2FdxZhLtM+l2u28S+2nNWRWgLwA414k
-ublL/+QG+5qJThGMwhVNQUCxZitXX2S8pj/HMKdDBu1jHlV7F6T1tiZB7DHiw9Ge
-cht6tYdIEnxu7lWToD4GrZZFml+HFKBVBrtUqX0qE17bKAUPtnLAaC1rzt5p++/8
-XSqwbhWGpOV9yhHGHmJr+cBnUUdPI2y7lYITEn7UjfEwuneKNyLetIgu7F9nSCxQ
-mruiE8atfI+twtMB9wJQI+lRe3b/Ad5cC7hsD4cG3/adcFIUDSfcycRPsarqMI8U
-vbl0B4Ej+a/2SPvIbn1jgOX2H9uf1LSnN5oKCBkiY2SX9te8rBfL8PeebecDe4c3
-oVbJxzlPAU33aLvzDxl/
-=rCrI
------END PGP SIGNATURE-----
diff --git a/net-misc/r8168/files/r8168-8.028.00-linux-3.3-compat.patch b/net-misc/r8168/files/r8168-8.028.00-linux-3.3-compat.patch
new file mode 100644
index 000000000000..a599dba40d71
--- /dev/null
+++ b/net-misc/r8168/files/r8168-8.028.00-linux-3.3-compat.patch
@@ -0,0 +1,29 @@
+diff --git a/src/r8168_n.c b/src/r8168_n.c
+index 80cdf1a..4df0e48 100755
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -4,7 +4,7 @@
+ # r8168 is the Linux device driver released for RealTek RTL8168B/8111B,
+ # RTL8168C/8111C, RTL8168CP/8111CP, RTL8168D/8111D, RTL8168DP/8111DP, and
+ # RTL8168E/8111E Gigabit Ethernet controllers with PCI-Express interface.
+-#
++
+ # Copyright(c) 2011 Realtek Semiconductor Corp. All rights reserved.
+ #
+ # This program is free software; you can redistribute it and/or modify it
+@@ -2232,6 +2232,7 @@ static struct ethtool_ops rtl8168_ethtool_ops = {
+ 	.set_settings		= rtl8168_set_settings,
+ 	.get_msglevel		= rtl8168_get_msglevel,
+ 	.set_msglevel		= rtl8168_set_msglevel,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
+ 	.get_rx_csum		= rtl8168_get_rx_csum,
+ 	.set_rx_csum		= rtl8168_set_rx_csum,
+ 	.get_tx_csum		= rtl8168_get_tx_csum,
+@@ -2242,6 +2243,7 @@ static struct ethtool_ops rtl8168_ethtool_ops = {
+ 	.get_tso		= ethtool_op_get_tso,
+ 	.set_tso		= ethtool_op_set_tso,
+ #endif
++#endif
+ 	.get_regs		= rtl8168_get_regs,
+ 	.get_wol		= rtl8168_get_wol,
+ 	.set_wol		= rtl8168_set_wol,
diff --git a/net-misc/r8168/r8168-8.028.00.ebuild b/net-misc/r8168/r8168-8.028.00.ebuild
index 3ec954ea21b6..6de7a4e1fb05 100644
--- a/net-misc/r8168/r8168-8.028.00.ebuild
+++ b/net-misc/r8168/r8168-8.028.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.028.00.ebuild,v 1.2 2012/03/31 17:32:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/r8168-8.028.00.ebuild,v 1.3 2012/04/04 16:53:04 joker Exp $
 
 EAPI=4
 
@@ -21,6 +21,10 @@ CONFIG_CHECK="!R8169"
 
 ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-linux-3.3-compat.patch"
+}
+
 pkg_setup() {
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERNELDIR=${KV_DIR}"