Updated the NVIDIA_kernel-2.6.19.patch and closing bug #156978.

Package-Manager: portage-2.1.2_rc2-r2

3 files changed, 44 insertions, 43 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 748f1bb9051b..2329af3e359c 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # 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.32 2006/12/05 17:27:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.33 2006/12/05 17:32:37 wolf31o2 Exp $
+
+  05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/NVIDIA_kernel-2.6.19.patch:
+  Updated the NVIDIA_kernel-2.6.19.patch and closing bug #156978.
 
 *nvidia-drivers-1.0.9631 (05 Dec 2006)
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index d8e477ac7618..82b229f8b037 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -17,10 +17,10 @@ AUX NVIDIA_glx-makefile.patch 602 RMD160 6c92e177c7a551ee43dc9bb0a58790d18497fef
 MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/NVIDIA_glx-makefile.patch 602
 RMD160 6c92e177c7a551ee43dc9bb0a58790d18497fef4 files/NVIDIA_glx-makefile.patch 602
 SHA256 074d041899563641d65bf257b3835fe5aea9e7220af24830d96d1183cd18392e files/NVIDIA_glx-makefile.patch 602
-AUX NVIDIA_kernel-2.6.19.patch 1715 RMD160 10f7d3927bd87857c7bd51ffe4ee4891fd8a1a02 SHA1 c6422409a7f8fe43b60986eb71836961993cb516 SHA256 2b3c6d0af62dbb18ca3698c7fa4d49812f3df67aa27e4110431b6039ec51e145
-MD5 f0e570320df1a1bab7866c5259eefd7e files/NVIDIA_kernel-2.6.19.patch 1715
-RMD160 10f7d3927bd87857c7bd51ffe4ee4891fd8a1a02 files/NVIDIA_kernel-2.6.19.patch 1715
-SHA256 2b3c6d0af62dbb18ca3698c7fa4d49812f3df67aa27e4110431b6039ec51e145 files/NVIDIA_kernel-2.6.19.patch 1715
+AUX NVIDIA_kernel-2.6.19.patch 1854 RMD160 d30945a61dc53e7d0b4fff7d5c620792bd46beb4 SHA1 615ce9ee703a19fae7ce6475c7fd1eaae6740cd0 SHA256 4fafa8f07403a27d4804e1a1be47381a7bc30e4466172eccf881d46c95803d50
+MD5 4670c3b33e096dc22a89b8a63e856ef1 files/NVIDIA_kernel-2.6.19.patch 1854
+RMD160 d30945a61dc53e7d0b4fff7d5c620792bd46beb4 files/NVIDIA_kernel-2.6.19.patch 1854
+SHA256 4fafa8f07403a27d4804e1a1be47381a7bc30e4466172eccf881d46c95803d50 files/NVIDIA_kernel-2.6.19.patch 1854
 AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b
 MD5 ca48410a5f23b1fa3c5895201a7161e6 files/libGL.la-r2 733
 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 files/libGL.la-r2 733
@@ -64,10 +64,10 @@ EBUILD nvidia-drivers-1.0.9742.ebuild 12633 RMD160 e7312e8aafe2409b19f8894fa6539
 MD5 7667fc55e5acedf5c3a69ab919c488b1 nvidia-drivers-1.0.9742.ebuild 12633
 RMD160 e7312e8aafe2409b19f8894fa653962641e62778 nvidia-drivers-1.0.9742.ebuild 12633
 SHA256 ee82467254386b49fad9266fc8dbf49170562b87cd5abbc5f6a1e2bf8b716da6 nvidia-drivers-1.0.9742.ebuild 12633
-MISC ChangeLog 7547 RMD160 bdfb08bec921fff2a642d271d2167ee18edd00f0 SHA1 6da4d76c98917729949a67adde7ed22236d52c58 SHA256 6d7998e6d68951bc51d64ef5309078fde0619f3b4cacc16830a899dea40e4b85
-MD5 b3a1e8d1a1823e1d3595b83dbb556fb8 ChangeLog 7547
-RMD160 bdfb08bec921fff2a642d271d2167ee18edd00f0 ChangeLog 7547
-SHA256 6d7998e6d68951bc51d64ef5309078fde0619f3b4cacc16830a899dea40e4b85 ChangeLog 7547
+MISC ChangeLog 7704 RMD160 e9a8a73a4236211ad4421b102a6d33498452eb34 SHA1 491bcc5b84374cfab71464e217bf53f999b52f0b SHA256 ee2cb86de92c41bba8e708a6f69fae3fca662fe3d67898285298a743591d6ae6
+MD5 90c3bc1429635dbdc86e4f9506887dee ChangeLog 7704
+RMD160 e9a8a73a4236211ad4421b102a6d33498452eb34 ChangeLog 7704
+SHA256 ee2cb86de92c41bba8e708a6f69fae3fca662fe3d67898285298a743591d6ae6 ChangeLog 7704
 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f
 MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302
 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302
@@ -90,7 +90,7 @@ SHA256 8dd84c7a6735999dd6c18040ed7dce2e29c6a5e6eef94ae145ecee72fee71c77 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFdawVkT4lNIS36YERAhTlAJ9h52YoB8BewRaj/ccU0IP1fiIuyACfQZxd
-hZWc5NqcckngZJr5wjdl22g=
-=ZNdt
+iD8DBQFFda0/kT4lNIS36YERAjsKAJ9P2wGag4sUcjO3x0m5PEmpGla49ACgkU3q
+C3j/QK6KuY75OYTi8hxywmY=
+=lWQ4
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch
index 9d56d428e155..004cbd8ae224 100644
--- a/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch
+++ b/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch
@@ -1,47 +1,44 @@
-Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h
-===================================================================
---- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv-linux.h
-+++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h
-@@ -14,10 +14,11 @@
- 
- #include "nv.h"
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/utsname.h>
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
-+#include <linux/config.h>
-+#endif
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7)
- #  error This driver does not support 2.4 kernels older than 2.4.7!
-Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c
-===================================================================
---- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv.c
-+++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c
-@@ -288,7 +288,11 @@ int           nv_kern_ioctl(struct inode
+diff -Naur NVIDIA.orig/usr/src/nv/nv.c NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv.c
+--- NVIDIA.orig/usr/src/nv/nv.c	2006-10-17 01:31:37.000000000 -0400
++++ NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv.c	2006-11-29 21:58:20.000000000 -0500
+@@ -252,7 +252,7 @@
  long          nv_kern_unlocked_ioctl(struct file *, unsigned int, unsigned long);
  long          nv_kern_compat_ioctl(struct file *, unsigned int, unsigned long);
  void          nv_kern_isr_bh(unsigned long);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
- irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
-+#else
+-irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
 +irqreturn_t   nv_kern_isr(int, void *);
-+#endif
  void          nv_kern_rc_timer(unsigned long);
  #if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
  static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
-@@ -2595,8 +2599,10 @@ long nv_kern_compat_ioctl(
+@@ -2561,8 +2561,7 @@
   */
  irqreturn_t nv_kern_isr(
      int   irq,
 -    void *arg,
 -    struct pt_regs *regs
 +    void *arg
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
-+	, struct pt_regs *regs
-+#endif
  )
  {
      nv_linux_state_t *nvl = (void *) arg;
+diff -Naur NVIDIA.orig/usr/src/nv/nv-i2c.c NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-i2c.c
+--- NVIDIA.orig/usr/src/nv/nv-i2c.c	2006-10-17 01:31:37.000000000 -0400
++++ NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-i2c.c	2006-11-29 21:57:36.000000000 -0500
+@@ -23,8 +23,6 @@
+ static struct i2c_algorithm nv_i2c_algo = {
+     .master_xfer      = nv_i2c_algo_xfer,
+     .smbus_xfer       = NULL,
+-    .slave_send       = NULL,
+-    .slave_recv       = NULL,
+     .algo_control     = nv_i2c_algo_control,
+     .functionality    = nv_i2c_algo_functionality,
+ };
+diff -Naur NVIDIA.orig/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-linux.h
+--- NVIDIA.orig/usr/src/nv/nv-linux.h	2006-10-17 01:31:37.000000000 -0400
++++ NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-linux.h	2006-11-29 21:57:48.000000000 -0500
+@@ -14,7 +14,6 @@
+ 
+ #include "nv.h"
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/utsname.h>