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

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

9 files changed, 25 insertions, 63 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/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 32cb8742d438..a599599e76d0 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -4,7 +4,6 @@ Hash: SHA1
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da
 AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf
-AUX NVIDIA_i2c-hwmon.patch 669 RMD160 812e7081d8f31116031edb0d8eb9c570b09caf89 SHA1 b0f132851cb1a7d8bdd9f205b4f187fcaf9e87d8 SHA256 0aaa05e1167bd722e00fcb90bd9853413ceb4ce3b00b308c314330f47c82f21a
 AUX eblits/donvidia.eblit 695 RMD160 e83869944dfce52a62423412e6c22b4e4468bc3c SHA1 0c877bbe4402c2845f8f4353c9f2d8086d364fbc SHA256 d404dd7e5657d83ccf3687720fb978030a3716e47957fb8bb80dea3ed57b3672
 AUX eblits/mtrr_check.eblit 629 RMD160 a7f9090f419faa17e74b81346c4bb019a7700138 SHA1 edb9ba38de929a9a0406408701a454f514fe78ed SHA256 ae1b8fb37985fc3e42a4a776779b3fe3d70be2c826df5c3f99d03ba7209ca0b1
 AUX eblits/paravirt_check.eblit 667 RMD160 1f139facd25c4bdd75287c0f3097dd776e55da38 SHA1 9bc4f49678d8d53986f6e5264220e18c0b4b1457 SHA256 af909ba17ac471afbc900e42fd97b29892f5549993ff05bba6010fb7fd76c840
@@ -34,20 +33,20 @@ DIST NVIDIA-Linux-x86_64-71.86.07-pkg2.run 8380439 RMD160 5ba261e0f5f25868236ca4
 DIST NVIDIA-Linux-x86_64-71.86.09-pkg2.run 8388126 RMD160 c8f5252db6f22149164156e62e4a151334adc869 SHA1 8df93e50e5fc182290838db5f762763c0582bc9c SHA256 f6d2d949baac3ea00132bb76df2a982f4fefdf2b9acfc7968668d317ed1010df
 DIST NVIDIA-Linux-x86_64-96.43.09-pkg2.run 10940888 RMD160 9dfb6264fdd932cb8dd45a6738207593080e67a8 SHA1 6e3061afa0d8424c86a4ebd86e0505233fd4c3a6 SHA256 e5fc926178231a2c4677dc007358e79ebcbdb2ce0def4ec4cc9d5732f3000d54
 DIST NVIDIA-Linux-x86_64-96.43.11-pkg2.run 11586549 RMD160 80fb00aa2e21d720750a590b521d88fd54d70f7e SHA1 3a3103319b184af04341da877049584f4db52130 SHA256 67e67dba8d307c951e5060df68a25bf71b20e77d7b48a9ff1be060258004ac21
-EBUILD nvidia-drivers-173.14.15.ebuild 15102 RMD160 d627ee36dda8893147865ba86e5745d0a513dc2b SHA1 a4f1bc386fe034fa7d3bcb379766c58312d01f2d SHA256 90cb74e0b24dcab665c0ca775ef0d66e77b1c47d1bf90914849f380fb094ed7b
-EBUILD nvidia-drivers-173.14.18.ebuild 15116 RMD160 ac13160995e1cbb13477da036c520c8f57bb5480 SHA1 63910421fd93778f66caae0437665e9bf1211289 SHA256 da6051554874214cfee0f93cd168e8867888e32a598a8fc3ed3f54f957ac851a
-EBUILD nvidia-drivers-180.29.ebuild 15459 RMD160 97e4e87e1e6272663142a2dabc315236c7c82ca0 SHA1 9b6232698c06abea26aed99caf8d2593769d18fb SHA256 6ea1ad5c3f69554c6df697b037e9cba8de261a0007ca69f1466dd6f3474e8025
-EBUILD nvidia-drivers-180.60.ebuild 17141 RMD160 fba50b46cf04fe195fc94869a847aee961ed971e SHA1 7e5fe2d0534562902a28bed52218994b8c651074 SHA256 b2599e5508ec30bdc8dc0d9f23192bf944abbebcd15e4fcd050dff817fcc5b18
+EBUILD nvidia-drivers-173.14.15.ebuild 14974 RMD160 3cf0d9202efa62ffbebcfa9f1be4b7309bdb9bd8 SHA1 850f85548989d33ee3070ed6a3fea99b8f5d4311 SHA256 634f44e53daef08e20df726d224983bcd2eea1600c96dd0f8350d23d9785606a
+EBUILD nvidia-drivers-173.14.18.ebuild 14988 RMD160 41a80a8b285e900504d3e1aa5fd8f1817b967cd6 SHA1 2f4b67adb5dc38a1b0ab40b43856ed5c382ad250 SHA256 70fd08021860d50de1716acecf0df892dfdaec6ddc17a3b5e206891834c996d7
+EBUILD nvidia-drivers-180.29.ebuild 15331 RMD160 5d6a2518d67dbbd4a4b7603e447dcbd4f4a013c6 SHA1 c1ee41ac2f21634246e783f4ac49d0a4b18b1ed6 SHA256 3b822a625088c4c037bec59e30789f46b4baeea0c6046fb9b83f5a743ee9c036
+EBUILD nvidia-drivers-180.60.ebuild 17013 RMD160 ef9e38e6a5507d3b08848a313f813de9adf1fe66 SHA1 c6e24c6101f4a19d093bfbac2d76003c4dde0f03 SHA256 191f92c4a244690b54f705419cc520c770ccda4c0f72d71860a4a7a6a0069fd4
 EBUILD nvidia-drivers-71.86.07.ebuild 14198 RMD160 e3ba3bdd490291cacff3d2a1fcb9e62c6a572db2 SHA1 f026562b2b333a93e7e9ba8f7b1332e4c4a13481 SHA256 2da638549a5c754f135fc1860c370f77001716b5c12ee8dc23fb16c239d16202
 EBUILD nvidia-drivers-71.86.09.ebuild 14200 RMD160 3b61a81553961a0e5182e368ab655c9eca239676 SHA1 ebe634bf95349748207cd08f8d6707d8febea186 SHA256 e91f5d18ae97a060af46d70ccafb41028e973b7737d4b11c921d6434c48c4472
-EBUILD nvidia-drivers-96.43.09.ebuild 14650 RMD160 35f9e9b20374aa2f3e685dc6e8dfabb374260416 SHA1 11d7dce8a1ce84ce918af625e5d34735b7f0cd9c SHA256 83d5a53bbae0289e17fecd36928d2e12a58d198af69653ca87ad29d82c6f4f49
-EBUILD nvidia-drivers-96.43.11.ebuild 14652 RMD160 c41f196fd706413eab2e816603a2109dc11d8229 SHA1 4ecb38456606eaa665a685700d25c1913747226b SHA256 a50fda91a5899b2b756b4e5e04138d85a13bdd2e145b63adf6adab0d9c85cb17
-MISC ChangeLog 34272 RMD160 9c34bbc1cab784140b55472c58c89cc82e915458 SHA1 d2897a15640f704f418aacc9276186f7a7897d27 SHA256 575dca7d95a796e72d9bf7c77e216a5eb26d7edb0206a8c86b4996af29151bad
+EBUILD nvidia-drivers-96.43.09.ebuild 14525 RMD160 4b99d2295e5f00081c8298a1dbf2838167d23510 SHA1 f50696adc9dd29bd9ea5baa3c4aa6f3252e1c43d SHA256 a16ddbacb31c494ab08ca5f98504c8e1aec7c513da0c0d4e3d0308a2c56237ca
+EBUILD nvidia-drivers-96.43.11.ebuild 14527 RMD160 e37ccc1b64becfbce31af3b1bedb266a068e303b SHA1 063248ee4ee397ecc74e3acbb1193d9da9602bd3 SHA256 50dcc0c9a7d331ae5e1fb189fd05990fc4dff893c1f84b1e78d49af9ff910c85
+MISC ChangeLog 34654 RMD160 1a0c3feed22073f3f0196b9d15771420f06d3fab SHA1 33057d163b3ff48a6f1603d63e29852549ac4e3f SHA256 72d6716b4fa286b295ad9ed440f22d1851f63f82e904f038ef1becfecbdd5767
 MISC metadata.xml 351 RMD160 9a2f8ace5189665008eac04219b424984b6af8fe SHA1 5b8a1d9bdb3d322c2128d3871f4ffc379e58cd96 SHA256 5629f3b578b84d76ef9199df2dbeefaf4f04f966738e4bd35d56183fd3b81618
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoysPwACgkQoeSe8B0zEfxqKQCeJcqyozK2vPekGZEIPY4jrn4K
-SqEAnR4KPS8uhidDRoZwcLHZkDKjja2s
-=Lxhx
+iEYEARECAAYFAkoyskcACgkQoeSe8B0zEfw9LwCfWNqMOO44lLINx7jwbjdcGaLv
+0rYAnR/L1cEhY7J3FYeZjqzpveRtAJlC
+=xN3y
 -----END PGP SIGNATURE-----
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