remove NVIDIA_i2c-hwmon.patch as requested by NVIDIA as this isn't safe with certain NVIDIA skus.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

8 files changed, 15 insertions, 52 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 80c9de98da1e..f4c1b8f18d99 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.148 2009/06/12 19:48:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.149 2009/06/12 19:53:35 cardoe Exp $
+
+  12 Jun 2009; Doug Goldstein <cardoe@gentoo.org>
+  -files/NVIDIA_i2c-hwmon.patch, nvidia-drivers-96.43.09.ebuild,
+  nvidia-drivers-96.43.11.ebuild, nvidia-drivers-173.14.15.ebuild,
+  nvidia-drivers-173.14.18.ebuild, nvidia-drivers-180.29.ebuild,
+  nvidia-drivers-180.60.ebuild:
+  remove NVIDIA_i2c-hwmon.patch as requested by NVIDIA as this isn't safe
+  with certain NVIDIA skus.
 
   12 Jun 2009; Doug Goldstein <cardoe@gentoo.org>
   -files/nvidia-2.6.28.patch, -nvidia-drivers-71.86.06.ebuild,
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_i2c-hwmon.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_i2c-hwmon.patch
deleted file mode 100644
index f9fdc27d74ad..000000000000
--- a/x11-drivers/nvidia-drivers/files/NVIDIA_i2c-hwmon.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- usr/src/nv/nv-i2c.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- NVIDIA-Linux-x86-1.0-9746-pkg1.orig/usr/src/nv/nv-i2c.c	2006-12-15 19:32:58.000000000 +0100
-+++ NVIDIA-Linux-x86-1.0-9746-pkg1/usr/src/nv/nv-i2c.c	2007-01-06 16:50:48.000000000 +0100
-@@ -250,6 +250,10 @@ void* NV_API_CALL nv_i2c_add_adapter(nv_
-     snprintf(pI2cAdapter->name, I2C_NAME_SIZE,
-              "NVIDIA i2c adapter %u at %x:%02x.%u", port, nv->bus,
-              nv->slot, PCI_FUNC(nvl->dev->devfn));
-+#ifdef I2C_CLASS_HWMON
-+    if (port == 2)
-+        pI2cAdapter->class = I2C_CLASS_HWMON;
-+#endif
- 
-     // add our data to the structure
-     pI2cAdapter->algo_data = (void *)nv;
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild
index e9632f5f6fc3..1e50d33122c0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild,v 1.4 2009/05/06 16:30:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.15.ebuild,v 1.5 2009/06/12 19:53:35 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -202,11 +202,6 @@ src_unpack() {
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 
-	# allow on board sensors to work with lm_sensors
-	if use kernel_linux; then
-		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
-	fi
-
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see
 		sed -i \
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild
index f413352ea133..818fa416f38a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild,v 1.2 2009/05/06 16:30:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.18.ebuild,v 1.3 2009/06/12 19:53:35 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -202,11 +202,6 @@ src_unpack() {
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 
-	# allow on board sensors to work with lm_sensors
-	if use kernel_linux; then
-		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
-	fi
-
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see
 		sed -i \
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild
index e487649ff599..0a14e5819680 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild,v 1.4 2009/06/12 19:40:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-180.29.ebuild,v 1.5 2009/06/12 19:53:35 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -204,11 +204,6 @@ src_unpack() {
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 
-	# allow on board sensors to work with lm_sensors
-	if use kernel_linux; then
-		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
-	fi
-
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see
 		sed -i \
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild
index fd5a067e3f83..b10f08691102 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild,v 1.2 2009/06/12 19:40:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-180.60.ebuild,v 1.3 2009/06/12 19:53:35 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -248,11 +248,6 @@ src_unpack() {
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
 
-	# allow on board sensors to work with lm_sensors
-	if use kernel_linux; then
-		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
-	fi
-
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see
 		sed -i \
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild
index 9222c7883d03..f1260896da78 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild,v 1.7 2009/05/06 16:30:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.09.ebuild,v 1.8 2009/06/12 19:53:35 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -197,10 +197,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
-	# allow on board sensors to work with lm_sensors
-	if ! use x86-fbsd; then
-		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
-	fi
 
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild
index e583b1b6e730..2520d89ee767 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild,v 1.2 2009/05/06 16:30:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-96.43.11.ebuild,v 1.3 2009/06/12 19:53:35 cardoe Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -197,10 +197,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
 	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
-	# allow on board sensors to work with lm_sensors
-	if ! use x86-fbsd; then
-		epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch
-	fi
 
 	if use kernel_linux; then
 		# Quiet down warnings the user does not need to see