Version bump with a new kernel 3.3 support patch from Richard Yao <ryao@cs.stonybrook.edu>

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

4 files changed, 92 insertions, 2 deletions

diff --git a/net-misc/r8168/ChangeLog b/net-misc/r8168/ChangeLog
index 47cf94452e6b..5b815fad7a57 100644
--- a/net-misc/r8168/ChangeLog
+++ b/net-misc/r8168/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2012/04/16 18:33:08 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/r8168/ChangeLog,v 1.10 2012/05/05 19:10:34 joker Exp $
+
+*r8168-8.029.00 (05 May 2012)
+
+  05 May 2012; Christian Birchinger <joker@gentoo.org> +r8168-8.029.00.ebuild,
+  +files/r8168-8.029.00-linux-3.3-compat.patch:
+  Version bump with a new kernel 3.3 support patch from Richard Yao
+  <ryao@cs.stonybrook.edu>
 
   16 Apr 2012; Christian Birchinger <joker@gentoo.org>
   files/r8168-8.028.00-linux-3.3-compat.patch:
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 97482eb0240e..b7823a590c33 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,9 +1,12 @@
 AUX r8168-8.028.00-linux-3.3-compat.patch 724 RMD160 562be32b65c92bba35f9d8bcada04591e7cfc4ce SHA1 bde112202c16ded24df6c97e0825ef618411903e SHA256 64d45a082464cfe170c82f6e35a501c8e84b69c83ccce6bcf48c312665c53b18
+AUX r8168-8.029.00-linux-3.3-compat.patch 1572 RMD160 fbe4fedcc92f2c6fe937c910c6486212c8fab4cd SHA1 2ca7509dcd73a14036254f9c01ef923a075fbd4a SHA256 035fa465ba9573536a588dd06f141c35d197d54e1d00f2c6dc22aa74ca813ab8
 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
+DIST r8168-8.029.00.tar.bz2 63166 RMD160 066279a10fe3c4ab6f2d103429c3496b762cace3 SHA1 6156548aa926a283ffdbb6f00e305908060ae609 SHA256 211a2994c9caf57321dafdb3acdfaa877f0b3f447798dc2abd2e417db3b0e515
 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 848 RMD160 72188f6a48d34ccd9e53e20d8c2b7f88f2d681b2 SHA1 34a03e89060366a80a4e544819dee1d796a83b7e SHA256 b888bd28da9e6340360ab85122ca8d6da04badb8b20825b752ae1e8bf71e3d39
-MISC ChangeLog 1542 RMD160 e8ae25e86ab81ee51bea32d6b90111d23fbc435d SHA1 3a4c039c00f457ea1ea326f42634195bd8a86fb5 SHA256 7bf1156d5fb725396d44606214cb641fc911fe42b82778ed000bc3618e67400c
+EBUILD r8168-8.029.00.ebuild 845 RMD160 6b16bf859bc5ea2ee027907eb62fb74a8f12d8f5 SHA1 d18d9b22b174572eec7a023e619115fa9d8dc616 SHA256 0cf2c20a611e3f2f8b71fdf683189d71ed48b67752169fcec084e53260afb894
+MISC ChangeLog 1797 RMD160 fd2bc6126cccafcaa8e6da42638d155e84f07d26 SHA1 c34063d14de238e51e7843bc5cce7ac87642ca2a SHA256 ddad16614ed2310dc7940080a2468e351e25087539c3687e05c51bd0126107cd
 MISC metadata.xml 550 RMD160 2a98a4eb0a6abb19f1c60383f052afc221848360 SHA1 3899cbf50f2afdc5a7ac9ef663ed9ddfe58bd7bb SHA256 b3367babace2233dd0dd6b95de96a04e1cb1b840b6421aac9169183af528740a
diff --git a/net-misc/r8168/files/r8168-8.029.00-linux-3.3-compat.patch b/net-misc/r8168/files/r8168-8.029.00-linux-3.3-compat.patch
new file mode 100644
index 000000000000..8e0dff40574f
--- /dev/null
+++ b/net-misc/r8168/files/r8168-8.029.00-linux-3.3-compat.patch
@@ -0,0 +1,44 @@
+diff --git a/src/r8168_n.c b/src/r8168_n.c
+index ef297ce..cd2780a 100755
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -1845,7 +1845,11 @@ rtl8168_rx_vlan_skb(struct rtl8168_private *tp,
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++static netdev_features_t rtl8168_fix_features(struct net_device *dev, netdev_features_t features)
++#else
+ static u32 rtl8168_fix_features(struct net_device *dev, u32 features)
++#endif
+ {
+ 	if (dev->mtu > MSSMask)
+ 		features &= ~NETIF_F_ALL_TSO;
+@@ -1853,7 +1857,11 @@ static u32 rtl8168_fix_features(struct net_device *dev, u32 features)
+ 	return features;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++static int rtl8168_set_features(struct net_device *dev, netdev_features_t features)
++#else
+ static int rtl8168_set_features(struct net_device *dev, u32 features)
++#endif
+ {
+ 	struct rtl8168_private *tp = netdev_priv(dev);
+ 	void __iomem *ioaddr = tp->mmio_addr;
+@@ -2229,6 +2237,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,
+@@ -2239,6 +2248,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,
\ No newline at end of file
diff --git a/net-misc/r8168/r8168-8.029.00.ebuild b/net-misc/r8168/r8168-8.029.00.ebuild
new file mode 100644
index 000000000000..a55e157c998a
--- /dev/null
+++ b/net-misc/r8168/r8168-8.029.00.ebuild
@@ -0,0 +1,36 @@
+# 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.029.00.ebuild,v 1.1 2012/05/05 19:10:34 joker Exp $
+
+EAPI=4
+
+inherit linux-mod eutils
+
+DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
+HOMEPAGE="http://www.realtek.com.tw"
+SRC_URI="http://r8168.googlecode.com/files/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+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"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-linux-3.3-compat.patch"
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README
+}