Added patch from Zander to remove i2c functionality from the drivers until it is fixed upstream.

Package-Manager: portage-2.1.2_pre1-r2

4 files changed, 40 insertions, 13 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 80670149a7fe..e8de598ce33b 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.11 2006/09/25 14:12:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.12 2006/09/25 14:31:01 wolf31o2 Exp $
+
+  25 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/1.0.9625/NVIDIA-1.0.9625-i2c.diff, nvidia-drivers-1.0.9625.ebuild:
+  Added patch from Zander to remove i2c functionality from the drivers until
+  it is fixed upstream.
 
   25 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   nvidia-drivers-1.0.8178.ebuild, nvidia-drivers-1.0.8762.ebuild,
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 62f7a8df7732..ca7ae8014b28 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -9,6 +9,10 @@ AUX 1.0.8762/NVIDIA-1.0.8762-U062606.diff 6022 RMD160 a602b837e8a539652751696586
 MD5 1053576eef2e8e494c6d1ed501c792fd files/1.0.8762/NVIDIA-1.0.8762-U062606.diff 6022
 RMD160 a602b837e8a539652751696586660df65de34b28 files/1.0.8762/NVIDIA-1.0.8762-U062606.diff 6022
 SHA256 4f11f14fadddae2ddcc34b5f8e955c891a26406517265c5aa7dab2c810c76339 files/1.0.8762/NVIDIA-1.0.8762-U062606.diff 6022
+AUX 1.0.9625/NVIDIA-1.0.9625-i2c.diff 530 RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab SHA1 44e6e57bbf7a4cbcc9ee9056deaf15b74546ec55 SHA256 f1033187c3f92c555c991ab7ea1b93e643df9358ef0e97492da0b79c96b8f1c6
+MD5 63fdbaa357289ab2db41aabe79cd0aba files/1.0.9625/NVIDIA-1.0.9625-i2c.diff 530
+RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab files/1.0.9625/NVIDIA-1.0.9625-i2c.diff 530
+SHA256 f1033187c3f92c555c991ab7ea1b93e643df9358ef0e97492da0b79c96b8f1c6 files/1.0.9625/NVIDIA-1.0.9625-i2c.diff 530
 AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/NVIDIA_glx-defines.patch 437
 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c files/NVIDIA_glx-defines.patch 437
@@ -57,14 +61,14 @@ EBUILD nvidia-drivers-1.0.8774.ebuild 11205 RMD160 fc5a6e1b483153d23abd5bcea2aa0
 MD5 edbbdf00edc6b536aeed1ee9311fcea7 nvidia-drivers-1.0.8774.ebuild 11205
 RMD160 fc5a6e1b483153d23abd5bcea2aa0a301e57b55d nvidia-drivers-1.0.8774.ebuild 11205
 SHA256 9133cad6c7e54ad2ecdcd00418d53e7101c09222e8eeb8869187f47e38c1272e nvidia-drivers-1.0.8774.ebuild 11205
-EBUILD nvidia-drivers-1.0.9625.ebuild 11205 RMD160 212c4aae2effd5114412886ca284d77c4e5579d4 SHA1 238d8a30c4a377bdcbb231bb018cf38bfd97b089 SHA256 c43d0bb39160aeae0a61d2d0e8ddf5d35e8c2840da23270ebd582b5a599250fd
-MD5 fdad90ff64cf45e820d7343c91209b81 nvidia-drivers-1.0.9625.ebuild 11205
-RMD160 212c4aae2effd5114412886ca284d77c4e5579d4 nvidia-drivers-1.0.9625.ebuild 11205
-SHA256 c43d0bb39160aeae0a61d2d0e8ddf5d35e8c2840da23270ebd582b5a599250fd nvidia-drivers-1.0.9625.ebuild 11205
-MISC ChangeLog 2436 RMD160 5c4131dd95c7cd9c19b10cb35aa4afc6ab8d917b SHA1 260441bbdb763f3e0c1a84ec12b57d9636aa1c9f SHA256 c9cdd6e66ee61e1584a08a00232fce030905ccdc65797344093e02f49953cdee
-MD5 9897b47524e58f72a77886b8659ee2b3 ChangeLog 2436
-RMD160 5c4131dd95c7cd9c19b10cb35aa4afc6ab8d917b ChangeLog 2436
-SHA256 c9cdd6e66ee61e1584a08a00232fce030905ccdc65797344093e02f49953cdee ChangeLog 2436
+EBUILD nvidia-drivers-1.0.9625.ebuild 11263 RMD160 051fc3896be0514ddcdfc486c725fa251165317b SHA1 4b312d2eee2f3d8577df24f7aabb39da7203a3d5 SHA256 664fa0d3599ce156c1aef428a021f6b92d2e4060e60640304e67b4885e714c4e
+MD5 ed01749e8720d77c66f0d5ddf41ea8e3 nvidia-drivers-1.0.9625.ebuild 11263
+RMD160 051fc3896be0514ddcdfc486c725fa251165317b nvidia-drivers-1.0.9625.ebuild 11263
+SHA256 664fa0d3599ce156c1aef428a021f6b92d2e4060e60640304e67b4885e714c4e nvidia-drivers-1.0.9625.ebuild 11263
+MISC ChangeLog 2668 RMD160 fa4db85ae1a1cc245a67c3eb04debc9f8fbd42f4 SHA1 c95a148721fbd4c57b0b6fd3c6aed6224f8732c1 SHA256 4a555b9d5903758c8de0a0ff09a0a05307fcaff9483f2f437cad0f8348ba5835
+MD5 40e335e54d671cfcf6bee474a3118bba ChangeLog 2668
+RMD160 fa4db85ae1a1cc245a67c3eb04debc9f8fbd42f4 ChangeLog 2668
+SHA256 4a555b9d5903758c8de0a0ff09a0a05307fcaff9483f2f437cad0f8348ba5835 ChangeLog 2668
 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f
 MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302
 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302
@@ -87,7 +91,7 @@ SHA256 2b535b61b24af630d83d6617b3c809833616a867164d466812d56b87d8447709 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFF+PVkT4lNIS36YERAmJ8AKCe7JSkOEcsvuqQKheytayXGv1AKgCePgSx
-KFW6aLbgWyrRH5JACzUVcr8=
-=0BqA
+iD8DBQFFF+g4kT4lNIS36YERAspfAJ0UjaPSR6Hf4Kylm5tIPqtwgZH19QCguL7y
+ZW6sb7LIgfPS+BcxgB9keb4=
+=IfmC
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/1.0.9625/NVIDIA-1.0.9625-i2c.diff b/x11-drivers/nvidia-drivers/files/1.0.9625/NVIDIA-1.0.9625-i2c.diff
new file mode 100644
index 000000000000..cae4581af6bf
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/1.0.9625/NVIDIA-1.0.9625-i2c.diff
@@ -0,0 +1,16 @@
+diff -ru usr/src/nv/nv-i2c.c usr/src/nv.NOSMBUS/nv-i2c.c
+--- usr/src/nv/nv-i2c.c	2006-09-15 01:10:17.000000000 +0200
++++ usr/src/nv.NOSMBUS/nv-i2c.c	2006-09-22 21:56:17.259789750 +0200
+@@ -138,11 +138,7 @@
+ 
+ static u32 nv_i2c_algo_functionality(struct i2c_adapter *adap)
+ {
+-    return (I2C_FUNC_I2C |
+-            I2C_FUNC_SMBUS_QUICK |
+-            I2C_FUNC_SMBUS_BYTE |
+-            I2C_FUNC_SMBUS_BYTE_DATA |
+-            I2C_FUNC_SMBUS_WORD_DATA);
++    return I2C_FUNC_I2C;
+ }
+ 
+ static struct i2c_algorithm nv_i2c_algo = {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
index e0e3044414db..f11dbe012674 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild,v 1.2 2006/09/25 14:12:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9625.ebuild,v 1.3 2006/09/25 14:31:01 wolf31o2 Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -118,6 +118,8 @@ src_unpack() {
 	if ! use x86-fbsd; then
 		# Zander kernel patches
 		# None yet.
+		# Zander i2c patch
+		epatch ${NV_PATCH_PREFIX}-i2c.diff
 
 		# Quiet down warnings the user do not need to see
 		sed -i \