Removing media-video/nvidia-kernel in favor of x11-drivers/nvidia-drivers. Let the complaining begin!

89 files changed, 0 insertions, 10476 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
deleted file mode 100644
index 2440d47274ae..000000000000
--- a/media-video/nvidia-kernel/ChangeLog
+++ /dev/null
@@ -1,876 +0,0 @@
-# ChangeLog for media-video/nvidia-kernel
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.140 2006/07/06 20:58:56 augustus Exp $
-
-*nvidia-kernel-1.0.8762-r1 (06 Jul 2006)
-*nvidia-kernel-1.0.8756-r1 (06 Jul 2006)
-*nvidia-kernel-1.0.8178-r4 (06 Jul 2006)
-*nvidia-kernel-1.0.8174-r2 (06 Jul 2006)
-*nvidia-kernel-1.0.7676-r2 (06 Jul 2006)
-*nvidia-kernel-1.0.7667-r1 (06 Jul 2006)
-*nvidia-kernel-1.0.7174-r3 (06 Jul 2006)
-*nvidia-kernel-1.0.7167-r2 (06 Jul 2006)
-*nvidia-kernel-1.0.6629-r6 (06 Jul 2006)
-*nvidia-kernel-1.0.6111-r4 (06 Jul 2006)
-
-  06 Jul 2006; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-kernel-1.0.6111-r4.ebuild, +nvidia-kernel-1.0.6629-r6.ebuild,
-  +nvidia-kernel-1.0.7167-r2.ebuild, +nvidia-kernel-1.0.7174-r3.ebuild,
-  +nvidia-kernel-1.0.7667-r1.ebuild, +nvidia-kernel-1.0.7676-r2.ebuild,
-  +nvidia-kernel-1.0.8174-r2.ebuild, +nvidia-kernel-1.0.8178-r4.ebuild,
-  +nvidia-kernel-1.0.8756-r1.ebuild, +nvidia-kernel-1.0.8762-r1.ebuild:
-  Bumped kernel ebuilds to include blocking of new x11-drivers/nvidia-* ebuilds
-  and message about upgrading to the new ebuilds.
-
-  27 Jun 2006; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.8762.ebuild:
-  Fix building on post 2.6.17 kernels.
-
-*nvidia-kernel-1.0.8762 (23 May 2006)
-
-  23 May 2006; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-kernel-1.0.8762.ebuild:
-  Bug #134110: Add new nvidia version 1.0.8762 ebuild.
-
-  02 May 2006; Kristopher Kersey <augustus@gentoo.org>
-  -files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch,
-  -files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id
-  .patch, nvidia-kernel-1.0.6629-r5.ebuild,
-  nvidia-kernel-1.0.7167-r1.ebuild, nvidia-kernel-1.0.7174-r2.ebuild,
-  nvidia-kernel-1.0.7667.ebuild, nvidia-kernel-1.0.7676-r1.ebuild,
-  nvidia-kernel-1.0.8174-r1.ebuild, nvidia-kernel-1.0.8178-r3.ebuild,
-  nvidia-kernel-1.0.8756.ebuild:
-  Removed disable-preempt from all ebuilds and the patches themselves from CVS.
-  Bug #125368.  Also made some general cleanups of the ebuilds.
-
-*nvidia-kernel-1.0.8756 (08 Apr 2006)
-
-  08 Apr 2006; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-kernel-1.0.8756.ebuild:
-  Version bump to 8756.  Bug #129153.
-
-  24 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org> files/nvidia:
-  Added note about NVreg_Mobile.  This closes bug #122295.
-
-  24 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
-  -nvidia-kernel-1.0.6629-r4.ebuild, -nvidia-kernel-1.0.7174.ebuild,
-  -nvidia-kernel-1.0.7174-r1.ebuild, -nvidia-kernel-1.0.7676.ebuild,
-  -nvidia-kernel-1.0.8174.ebuild, -nvidia-kernel-1.0.8178.ebuild,
-  -nvidia-kernel-1.0.8178-r1.ebuild, -nvidia-kernel-1.0.8178-r2.ebuild:
-  Removing old revisions.
-
-  24 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-kernel-1.0.8178-r3.ebuild:
-  Stable amd64.
-
-*nvidia-kernel-1.0.7174-r2 (24 Jan 2006)
-
-  24 Jan 2006; Kristopher Kersey <augustus@gentoo.org>
-  +files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff,
-  +nvidia-kernel-1.0.7174-r2.ebuild:
-  New patch added to 7174 to fix build problems. Bumped revision to -r2.
-
-*nvidia-kernel-1.0.8178-r3 (22 Jan 2006)
-
-  22 Jan 2006; Kristopher Kersey <augustus@gentoo.org>
-  +files/1.0.8178/NVIDIA_kernel-1.0-8178-U012206.diff,
-  +nvidia-kernel-1.0.8178-r3.ebuild:
-  Latest patch by Zander added to 8178.
-
-*nvidia-kernel-1.0.7174-r1 (22 Jan 2006)
-
-  22 Jan 2006; Kristopher Kersey <augustus@gentoo.org>
-  +files/1.0.7174/NVIDIA_kernel-1.0-7174-1258475.diff,
-  +files/1.0.7174/NVIDIA_kernel-1.0-7174-1296092.diff,
-  +files/1.0.7174/NVIDIA_kernel-1.0-7174-1321905.diff,
-  +files/1.0.7174/NVIDIA_kernel-1.0-7174-1361053.diff,
-  +files/1.0.7174/NVIDIA_kernel-1.0-7174-1386866.diff,
-  +nvidia-kernel-1.0.7174-r1.ebuild:
-  Added all 1.0.7174 provided by Zander for people still using 7174.  Bug
-  #118835.
-
-*nvidia-kernel-1.0.8178-r2 (12 Jan 2006)
-
-  12 Jan 2006; Kristopher Kersey <augustus@gentoo.org>
-  +files/1.0.8178/NVIDIA_kernel-1.0-8178-U011106.diff,
-  +nvidia-kernel-1.0.8178-r2.ebuild:
-  New patch from Zander to fix bugs in 8178 release.  Closes bug #118252 and bug
-  #116543.
-
-*nvidia-kernel-1.0.8178-r1 (10 Jan 2006)
-*nvidia-kernel-1.0.6629-r5 (10 Jan 2006)
-
-  10 Jan 2006; Kristopher Kersey <augustus@gentoo.org>
-  +files/1.0.6629/NVIDIA_kernel-1.0-7174-1296092.diff,
-  +files/1.0.8178/NVIDIA_kernel-1.0-8178-U122205.diff,
-  +nvidia-kernel-1.0.6629-r5.ebuild, +nvidia-kernel-1.0.8178-r1.ebuild:
-  New ebuild nvidia-kernel-1.0.6629-r5 to fix Bug #113466.
-  New ebuild nvidia-kernel-1.0.8178-r1 to fix Bug #115417 and Bug #117996.
-
-*nvidia-kernel-1.0.8178 (23 Dec 2005)
-
-  23 Dec 2005; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-kernel-1.0.8178.ebuild:
-  Version bump to 8178.  A few cleanups.  Bug 116400.
-
-*nvidia-kernel-1.0.8174-r1 (07 Dec 2005)
-
-  07 Dec 2005; Kristopher Kersey <augustus@gentoo.org>
-  +files/1.0.8174/NVIDIA_kernel-1.0-8174-1423627.diff,
-  +nvidia-kernel-1.0.8174-r1.ebuild:
-  Added Zander's power management patch as requested in bug #114640.
-  Added documentation as requested in bug #114659.
-
-*nvidia-kernel-1.0.8174 (05 Dec 2005)
-
-  05 Dec 2005; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-kernel-1.0.8174.ebuild:
-  Added version 1.0-8174 of the NVIDIA drivers.
-
-  28 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-kernel-1.0.6111-r3.ebuild, nvidia-kernel-1.0.6629-r4.ebuild,
-  nvidia-kernel-1.0.7167-r1.ebuild, nvidia-kernel-1.0.7174.ebuild,
-  nvidia-kernel-1.0.7667.ebuild, nvidia-kernel-1.0.7676.ebuild,
-  nvidia-kernel-1.0.7676-r1.ebuild:
-  Added RDEPEND on virtual/modutils for bug #84969.
-
-*nvidia-kernel-1.0.7676-r1 (28 Oct 2005)
-
-  28 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff,
-  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff,
-  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff,
-  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff,
-  +files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff,
-  +nvidia-kernel-1.0.7676-r1.ebuild:
-  Patches for some amd64 issues from upstream.
-
-*nvidia-kernel-1.0.7676 (15 Aug 2005)
-
-  15 Aug 2005; <augustus@gentoo.org> +nvidia-kernel-1.0.7676.ebuild:
-  NVIDIA version bump.
-
-  20 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -nvidia-kernel-1.0.6629-r1.ebuild, -nvidia-kernel-1.0.7664.ebuild:
-  Removing old versions.
-
-  16 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch,
-  nvidia-kernel-1.0.7667.ebuild:
-  Add support for latest kernels that no longer define KERNEL_VERSION in
-  version.h. Cleanup warnings users do not need to see.
-
-*nvidia-kernel-1.0.7667 (07 Jul 2005)
-
-  07 Jul 2005; <augustus@gentoo.org> nvidia-kernel-1.0.7664.ebuild,
-  +nvidia-kernel-1.0.7667.ebuild:
-  Fixes for the following bugs: bug #91101, bug #96514, bug #96885, bug #97768.
-  The fixes to these have been added to version 1.0.7664 and 1.0.7667 of the
-  driver.
-
-*nvidia-kernel-1.0.7664 (03 Jun 2005)
-
-  03 Jun 2005; <augustus@gentoo.org> +nvidia-kernel-1.0.7664.ebuild:
-  Initial checkin of NVIDIA 7664 release.  Not complete but this should work for
-  those on the bleeding edge.
-
-  01 Jun 2005; Daniel Drake <dsd@gentoo.org> nvidia-kernel-1.0.7174.ebuild:
-  Work with portage-cvs
-
-  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
-  Update maintainer to x11-drivers.
-
-  07 Apr 2005; Simon Stelling <blubb@gentoo.org>
-  nvidia-kernel-1.0.6629-r4.ebuild:
-  stable on amd64
-
-  04 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.6629-r4.ebuild:
-  Stable x86.
-
-*nvidia-kernel-1.0.7174 (01 Apr 2005)
-
-  01 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-kernel-1.0.7174.ebuild:
-  Update version.
-
-*nvidia-kernel-1.0.7167-r1 (12 Mar 2005)
-
-  12 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch,
-  +files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch,
-  +nvidia-kernel-1.0.7167-r1.ebuild:
-  Add latest patches from Zander (thanks Chris Gianelloni for spotting them,
-  bug #84896).
-
-*nvidia-kernel-1.0.7167 (11 Mar 2005)
-
-  11 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch,
-  +files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch,
-  +files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id
-  .patch, +files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch,
-  +nvidia-kernel-1.0.7167.ebuild:
-  Update version.
-
-*nvidia-kernel-1.0.6629-r4 (05 Mar 2005)
-
-  05 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch,
-  +nvidia-kernel-1.0.6629-r4.ebuild:
-  Add support for multi-agp with newer -mm kernels.
-
-*nvidia-kernel-1.0.6629-r3 (25 Jan 2005)
-
-  25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff,
-  +nvidia-kernel-1.0.6629-r3.ebuild:
-  Revbump to fix bug #77994.  Now works with 2.6.11 kernel rcs.
-
-*nvidia-kernel-1.0.6629-r2 (17 Jan 2005)
-
-  17 Jan 2005; Andrew Bevitt <cyfred@gentoo.org>
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch,
-  nvidia-kernel-1.0.6629-r1.ebuild, +nvidia-kernel-1.0.6629-r2.ebuild:
-  Marking 6629 stable across archs
-
-  27 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
-  files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch,
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch,
-  -files/1.0.6629/nv-disable-preempt-on-smp_processor_id-2.patch,
-  files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch,
-  nvidia-kernel-1.0.6629-r1.ebuild, -nvidia-kernel-1.0.6629.ebuild:
-  Some more patches from Zander
-
-  21 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
-  nvidia-kernel-1.0.6629-r1.ebuild:
-  Removing use of nv-disable-preempt-on-smp_processor_id-2.patch, reverting to
-  old version, see bug #74950
-
-*nvidia-kernel-1.0.6629-r1 (19 Dec 2004)
-
-  19 Dec 2004; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch,
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch,
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch,
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch,
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch,
-  +files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch,
-  +files/1.0.6629/nv-disable-preempt-on-smp_processor_id-2.patch,
-  +nvidia-kernel-1.0.6629-r1.ebuild:
-  Update with patches from Zander (http://www.minion.de/files/1.0-6629/)
-
-  30 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> +files/nvidia,
-  -files/nvidia-1.1, nvidia-kernel-1.0.6111-r3.ebuild,
-  nvidia-kernel-1.0.6629.ebuild:
-  Porting 6111 to use linux-* eclasses, fixing bug #71833 (apply 2.6 patches
-  on 2.6 only), change to install the proper README file.
-
-  30 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
-  -files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff,
-  -files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20030905.diff,
-  -files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20031026.diff,
-  -files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-pci_name-20030905.diff,
-  -files/1.0.4499/NVIDIA_kernel-1.0-4499-2.6-20031014.diff,
-  -files/1.0.5328/NVIDIA_kernel-1.0-5328-2.4-via-chipset-fix.patch,
-  -files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20031226.diff,
-  -files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20040105.diff,
-  -files/1.0.5332/NVIDIA-Linux-x86_64-1.0-5332-2.6.diff,
-  -files/1.0.5336/Makefile,
-  -files/1.0.5336/NVIDIA_kernel-1.0-5336-2.6-20040521.patch,
-  -files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support-v2.patch,
-  -files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch,
-  -files/1.0.5336/NVIDIA_kernel-1.0-5336-fix-makefile-for-2.6.patch,
-  -files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch,
-  -files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch,
-  -nvidia-kernel-1.0.4363-r3.ebuild, -nvidia-kernel-1.0.4496-r3.ebuild,
-  -nvidia-kernel-1.0.4499.ebuild, -nvidia-kernel-1.0.5328-r1.ebuild,
-  -nvidia-kernel-1.0.5332-r1.ebuild, -nvidia-kernel-1.0.5336-r4.ebuild,
-  -nvidia-kernel-1.0.6106-r1.ebuild, -nvidia-kernel-1.0.6111-r2.ebuild:
-  Removing all the masked (deprecated) versions.
-
-  28 Nov 2004; John Mylchreest <johnm@gentoo.org> :
-  Forgot to update this so doing so now. after adding support for
-  KBUILD_OUTPUT into the eclass, I updated the nvidia-kernel ebuild to also
-  honour this
-
-  26 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
-  +files/1.0.6629/nv-fix-memory-limit.patch, nvidia-kernel-1.0.6629.ebuild:
-  Fixing bug #71684 which relates to video memory limits
-
-  26 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
-  nvidia-kernel-1.0.6629.ebuild:
-  Changes to use the new linux-* eclasses, doing this in ~arch for now just to
-  make sure of the eclasses functionality being totally correct :).
-
-  14 Nov 2004; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.0.6629/nv-pgprot-speedup.patch,
-  +files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch,
-  nvidia-kernel-1.0.6629.ebuild:
-  Add two patches from http://www.nvnews.net/vbulletin/showthread.php?t=40106.
-
-  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/1.0.6629/nv-amd64-shutup-warnings.patch,
-  nvidia-kernel-1.0.6629.ebuild:
-  Fixed installation on amd64.
-
-  09 Nov 2004; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch,
-  +files/1.0.6629/nv-pgd_offset.patch,
-  +files/1.0.6629/nv-shutup-warnings.patch:
-  Update to work with 2.6.10-rc1-mm3+ (basically add support for the new pml4
-  stuff from Andi Kleen ... with a bit of help from him). Fix 'using
-  smp_processor_id() in preemptible code' traces. Remove -Wpointer-arith to
-  quiet down build (should really be a flag that they enable for internal
-  debugging).  Note that the 2.6.10-rc1-mm3+ support is only valid if you fixed
-  the EXPORT_SYMBOL_GPL() issue ...
-
-  08 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
-  nvidia-kernel-1.0.6111-r3.ebuild, nvidia-kernel-1.0.6629.ebuild:
-  Changing to unset ARCH irrespective of kernel version.
-
-  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
-  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
-  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
-  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r4.ebuild,
-  nvidia-kernel-1.0.6106-r1.ebuild, -nvidia-kernel-1.0.6111-r1.ebuild,
-  -nvidia-kernel-1.0.6111.ebuild, nvidia-kernel-1.0.6111-r2:
-  Keywords masking as driver/glx being deprecated.
-
-*nvidia-kernel-1.0.6111-r3 (07 Nov 2004)
-
-  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
-  +files/1.0.6111/conftest_koutput_includes.patch,
-  +files/1.0.6629/conftest_koutput_includes.patch,
-  +nvidia-kernel-1.0.6111-r3.ebuild, +nvidia-kernel-1.0.6629.ebuild:
-  New version 1.0.6629! Also marking 1.0.6111 stable in -r3 (others to be
-  keyword masked in following commit).
-
-  06 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  files/1.0.6111/power-suspend-2.6.9-changes.patch:
-  Adding fixes for STANDBY power state to 6111 power suspend patch
-
-*nvidia-kernel-1.0.6111-r2 (04 Oct 2004)
-
-  04 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  files/1.0.6111/nv-pci_find_class.patch,
-  +files/1.0.6111/nv-remap-range.patch, +files/1.0.6111/vmalloc-reserve.patch,
-  +nvidia-kernel-1.0.6111-r2.ebuild:
-  Multiple patch updates. Namely those for __VMALLOC_RESERVE, pci_get_class()
-  and remap_pfn_range()
-
-  21 Sep 2004; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.6111-r1.ebuild:
-  Ok, so we need a 2.6.9 or later kernel for nv-pci_find_class.patch. Reported
-  by Markus Layr <tuxian@yahoo.de>.
-
-*nvidia-kernel-1.0.6111-r1 (20 Sep 2004)
-
-  20 Sep 2004; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.0.6111/nv-pci_find_class.patch, +nvidia-kernel-1.0.6111-r1.ebuild:
-  Latest -mm kernels removed pci_find_class; replace this with pci_get_class. It
-  should work fine on earlier kernels, but I have not tested this ...
-
-  05 Sep 2004; Travis Tilley <lv@gentoo.org> nvidia-kernel-1.0.6111.ebuild:
-  stable on amd64
-
-  30 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +files/1.0.6111/nv_enable_pci.patch, nvidia-kernel-1.0.6111.ebuild:
-  Updating patch to work with the new irqroutes changes in kernels 2.6.8 and on
-
-  28 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +files/1.0.6111/power-suspend-2.6.9-changes.patch,
-  nvidia-kernel-1.0.6111.ebuild:
-  Patching to provide support for PM_SUSPEND in 2.6.9 kernels over PM_SAVE_STATE.
-
-  16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-kernel-1.0.5328-r1.ebuild, nvidia-kernel-1.0.5336-r4.ebuild:
-  Marking up to and including 5336 stable for newer cards, eg FX5700
-
-*nvidia-kernel-1.0.6111 (06 Aug 2004)
-
-  06 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +nvidia-kernel-1.0.6111.ebuild:
-  NEW Version 6111; This version has koutput support working properly so not
-  bringing the patch over.
-
-  02 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-kernel-1.0.6106-r1.ebuild, -nvidia-kernel-1.0.6106.ebuild:
-  Fixing bug #59072 and removing 6106 from tree.
-
-  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
-  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
-  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
-  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r2.ebuild,
-  nvidia-kernel-1.0.5336-r3.ebuild:
-  /usr/src/linux needs ${ROOT}. Also bring back digest-nvidia-kernel-1.0.6106,
-  as the ebuild's still in the tree.
-
-*nvidia-kernel-1.0.6106-r1 (26 Jul 2004)
-
-  26 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch,
-  +nvidia-kernel-1.0.6106-r1.ebuild:
-  Thanks very much goes to Georgi for providing a solution to the udev + nvidia
-  thing on bug #58294 .. udev will now correctly create the devices for the
-  module.
-
-  13 Jul 2004; Travis Tilley <lv@gentoo.org> nvidia-kernel-1.0.6106.ebuild:
-  the previous amd64 nvidia drivers arent exactly what i would call stable, but
-  this release seems to be rock solid. marking stable on amd64
-
-*nvidia-kernel-1.0.6106 (02 Jul 2004)
-
-  02 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; metadata.xml,
-  +files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch,
-  +nvidia-kernel-1.0.6106.ebuild:
-  Commiting 6106 to CVS. Thanks to Kris Kersey (augustus) for getting this
-  version off the ground, and thanks to all the testers from bug #55714. This
-  version has 4K stacks support, includes SYSFS support and has the kernel
-  module and glx combined into one package.
-
-  30 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch,
-  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
-  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
-  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r2.ebuild,
-  nvidia-kernel-1.0.5336-r3.ebuild, nvidia-kernel-1.0.5336-r4.ebuild:
-  Adding IUSE to ebuilds; Introducing
-  NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch for 5336-r4, which allows
-  koutput based kernels to work properly with nVidias' Makefile.kbuild
-
-*nvidia-kernel-1.0.5336-r4 (15 Jun 2004)
-
-  15 Jun 2004; Martin Schlemmer <azarah@gentoo.org>
-  +files/1.0.5336/NVIDIA_kernel-1.0-5336-2.6-20040521.patch,
-  +files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support-v2.patch,
-  +files/1.0.5336/NVIDIA_kernel-1.0-5336-fix-makefile-for-2.6.patch,
-  +nvidia-kernel-1.0.5336-r4.ebuild:
-  Add latest patch from minion.de (-2.6-20040521.patch) - should fix issues with
-  gcc-3.4 and kill some warnings for gcc-3.3.x, bug #50820. Update my sysfs
-  patch to actually work. The problem was that for the conftest.sh test we
-  needed to also add $(SYSSRC)/include/asm/mach-generic to KERNEL_HEADERS, else
-  the tests silently failed. This should close bug #51715. Also add a third
-  patch (-fix-makefile-for-2.6.patch) that should handle later 2.6 kernels
-  transparently, and allows us to add some nice cleanups to the ebuild.
-
-  16 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-kernel-1.0.5336-r3.ebuild:
-  Adding message to stop userpriv bugs
-
-*nvidia-kernel-1.0.5336-r3 (11 May 2004)
-
-  11 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +nvidia-kernel-1.0.5336-r3.ebuild:
-  Changing ebuild style to use the new kmod.eclass and fix the problem of the
-  __this-modpost.patch being incorporated into the new 2.6.6 kernel tree. This
-  has a trade off that all kernels <2.6.6_rc1 will have to use addwrite to
-  /usr/src/linux for the time being, nvidia should fix this for the next
-  release. Also adding warning about 4K Stacks to stem bug reports.
-
-  01 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
-  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
-  nvidia-kernel-1.0.5332-r1.ebuild:
-  Fixing all the cruft that got messed up with some recent commits. Also
-  standardised the use of is_kernel() in all of the ebuilds.
-
-*nvidia-kernel-1.0.4363-r3 (30 Apr 2004)
-
-  30 Apr 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +nvidia-kernel-1.0.4363-r3.ebuild:
-  Putting 4363 back in the tree, 4496 doesnt work for everyone so we need
-  another x86 one for now.
-
-  29 Apr 2004; <coxj@gentoo.org> nvidia-kernel-1.0.4496-r3.ebuild,
-  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild:
-  Fix is_kernel syntax bugs
-
-  28 Apr 2004; <coxj@gentoo.org> nvidia-kernel-1.0.4363-r3.ebuild,
-  nvidia-kernel-1.0.4496-r3.ebuild, nvidia-kernel-1.0.4499.ebuild:
-  Fix is_kernel thing.
-
-  16 Apr 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild:
-  Adding support for .ko modules to 4363 and 4496 see bug #45560
-
-*nvidia-kernel-1.0.5336-r2 (13 May 2004)
-
-  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-kernel-1.0.5336-r2.ebuild:
-  Fixing bug #45469
-
-  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-kernel-1.0.2880-r1.ebuild, nvidia-kernel-1.0.2960-r1.ebuild,
-  nvidia-kernel-1.0.3123-r2.ebuild, nvidia-kernel-1.0.4180.ebuild,
-  nvidia-kernel-1.0.4191-r2.ebuild, nvidia-kernel-1.0.4349-r2.ebuild,
-  nvidia-kernel-1.0.4496-r4.ebuild, nvidia-kernel-1.0.5328.ebuild,
-  nvidia-kernel-1.0.5332.ebuild, nvidia-kernel-1.0.5336-r1.ebuild,
-  nvidia-kernel-1.0.5336.ebuild, files/NVIDIA_kernel-1.0-3123-2.5-module.diff,
-  files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff,
-  files/NVIDIA_kernel-1.0-3123-2.5-tl.diff,
-  files/NVIDIA_kernel-1.0-3123-2.5.54.diff,
-  files/NVIDIA_kernel-1.0-3123-pa.diff,
-  files/NVIDIA_kernel-1.0-4191-2.5-tl.diff,
-  files/NVIDIA_kernel-1.0-4191-2.5.54.diff,
-  files/NVIDIA_kernel-1.0-4191-2.5.63.diff:
-  Removing many of the old nvidia-kernel ebuilds, have left two from each
-  profile which appear to still be used by some people.
-
-*nvidia-kernel-1.0.5332-r1 (07 May 2004)
-
-  07 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r2.ebuild:
-  Updated ebuilds to stop devices being created if using udev on top of devfsd
-
-  07 Feb 2004; Brad House <brad_mssw@gentoo.org>
-  nvidia-kernel-1.0.5332.ebuild:
-  people apparently don't know how to use ~amd64 ebuilds, setting this stable as
-  this is the #1 asked for ebuild
-
-  06 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.5336-r1.ebuild, files/1.0.5336/Makefile,
-  files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch:
-  Fix class_simple patch to actually not compile in sysfs support if
-  class_simple support is missing, bug #40107. Add sed to fix version of module
-  build. Fix Makefile to actually honour KERNDIR.
-
-  01 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>;
-  nvidia-kernel-1.0.5336-r1.ebuild:
-  Fix for bug #40050. Doing make module for 2.4 Makefile and make nvidia.o for
-  2.6 Makefile.
-
-*nvidia-kernel-1.0.5336-r1 (01 Feb 2004)
-
-  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.5336-r1.ebuild,
-  files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch,
-  files/1.0.5336/Makefile:
-  Add basic sysfs support for 2.6 and udev.  Patch donated by myself.
-
-*nvidia-kernel-1.0.5336 (01 Feb 2004)
-
-  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.5336.ebuild:
-  Update version.
-
-*nvidia-kernel-1.0.5332 (23 Jan 2004)
-
-  23 Jan 2004; <augustus@gentoo.org> nvidia-kernel-1.0.5332.ebuild,
-  files/1.0.5332/NVIDIA-Linux-x86_64-1.0-5332-2.6.diff:
-  New NVIDIA driver 5332 released to public. See NVIDIA's page for full details:
-  http://www.nvidia.com/object/linux_display_amd64_1.0-5332.html
-
-  10 Jan 2004; Martin Holzer <mholzer@gentoo.org>
-  nvidia-kernel-1.0.3123-r2.ebuild, nvidia-kernel-1.0.4180.ebuild,
-  nvidia-kernel-1.0.4191-r2.ebuild, nvidia-kernel-1.0.4349-r2.ebuild,
-  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
-  nvidia-kernel-1.0.4496-r4.ebuild, nvidia-kernel-1.0.4499.ebuild,
-  nvidia-kernel-1.0.5328-r1.ebuild, nvidia-kernel-1.0.5328.ebuild:
-  fixing typo
-
-*nvidia-kernel-1.0.5328-r1 (05 Jan 2004)
-
-  05 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>;
-  nvidia-kernel-1.0.5328-r1.ebuild,
-  files/1.0.5328/NVIDIA_kernel-1.0-5328-2.4-via-chipset-fix.patch,
-  files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20040105.diff:
-  Fix for bug #36551, applying via chipset bugfix. Updating minion.de patch to
-  20040105 also.
-
-  26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
-  Adding metadata.xml.
-
-*nvidia-kernel-1.0.5328 (26 Dec 2003)
-
-  26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
-  nvidia-kernel-1.0.5328.ebuild,
-  files/1.0.5328/NVIDIA_kernel-1.0-5328-2.6-20031226.diff:
-  Version bump.
-
-  08 Dec 2003; <spider@gentoo.org> nvidia-kernel-1.0.2880-r1.ebuild,
-  nvidia-kernel-1.0.2960-r1.ebuild, nvidia-kernel-1.0.3123-r2.ebuild,
-  nvidia-kernel-1.0.4180.ebuild, nvidia-kernel-1.0.4191-r2.ebuild,
-  nvidia-kernel-1.0.4349-r2.ebuild, nvidia-kernel-1.0.4363-r3.ebuild,
-  nvidia-kernel-1.0.4496-r3.ebuild, nvidia-kernel-1.0.4496-r4.ebuild,
-  nvidia-kernel-1.0.4499.ebuild:
-  exporting _POSIX2_VERSION in the ebuilds to work around weird scripts that use
-  chown foo.foo instead of foo:foo.
-
-  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4496-r4.ebuild:
-  Add PKG_V to make sure updating the package used will not break things again.
-
-  02 Nov 2003; Martin Holzer <mholzer@gentoo.org>
-  nvidia-kernel-1.0.4496-r4.ebuild:
-  minor fix. Closes #32534
-
-*nvidia-kernel-1.0.4496-r4 (02 Nov 2003)
-
-  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4496-r4.ebuild,
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20031026.diff:
-  Update nVidia package to latest (pkg2), bug #32430. Also update patch from
-  http://www.minion.de/.
-
-*nvidia-kernel-1.0.4499 (15 Oct 2003)
-
-  15 Oct 2003; Daniel Robbins <drobbins@gentoo.org>:
-  nvidia-kernel-1.0.4499.ebuild: New version of the ebuild for AMD64 systems.
-  Thanks to Kris Kersey, James Jones and others for working on this. See bug
-  #30799. This ebuild does need some testing; adding it so that it can be
-  tested.
-
-20 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4496-r3.ebuild:
-  Mark stable (bug #28330).
-
-*nvidia-kernel-1.0.4496-r3 (07 Sep 2003)
-
-  07 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4496-r3.ebuild,
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20030905.diff,
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-pci_name-20030905.diff:
-  Update patches to 20030905 (bug #28061).
-
-*nvidia-kernel-1.0.4496-r2 (07 Sep 2003)
-
-  07 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4496-r2.ebuild,
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-bk8.diff:
-  Add a patch to support kdev_t changes in 2.6.0-test4-bk8 and later.
-
-*nvidia-kernel-1.0.4496-r1 (21 Aug 2003)
-
-  21 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4496-r1.ebuild,
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.5-20030818.diff,
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.6-20030818.diff:
-  Add update patches from minion.de, as well as add patch for pci changes in
-  latest 2.6.  I did a small change to last mentioned patch to try and make
-  it more generic.
-
-  04 Aug 2003; Martin Schlemmer <azarah@gentoo.org>
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-Makefile.diff:
-  Fix NVIDIA_kernel-1.0-4496-Makefile.diff to not revert the tail fixes for
-  coreutils.
-
-*nvidia-kernel-1.0.4496 (29 Jul 2003)
-
-  29 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4496.ebuild,
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-2.5-20030728.diff,
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-Makefile.diff,
-  files/1.0.4496/NVIDIA_kernel-1.0-4496-tail.diff:
-  New version.
-
-*nvidia-kernel-1.0.4180 (18 Jul 2003)
-
-  18 Jul 2003; Olivier Crete <tester@gentoo.org>
-  nvidia-kernel-1.0.4180.ebuild:
-  Added amd64 version of the driver
-
-  14 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4363-r3.ebuild,
-  files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030714.diff:
-  Update 2.5 patch once again for 2.6.0 kernel.
-
-*nvidia-kernel-1.0.4363-r3 (14 Jul 2003)
-
-  14 Jul 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r3.ebuild,
-  files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030713.diff,
-  files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd-20030713.diff:
-  Update the 2.5 patch.  Fixup highpmd stuff, as it could be a problem in the
-  way the patch does it (according to AKPM);  currently it maps an offset,
-  copy the struct over, then unmap it again, and then try to use it ?!?!
-
-  12 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
-  files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff:
-  Cleanup patch a bit more, and fix a type-o that caused the driver to fail
-  initializing DMA.
-
-  23 Jun 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4363-r2.ebuild:
-  Do not write a symlink that is invalid over Makefile for 2.4 kernel.
-  Bug #23304.
-
-  22 Jun 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r2.ebuild,
-  files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5-20030614.diff:
-  Update 2.5 patch from minion.de. Some cleanups for the kernel version stuff.
-  Mark stable for x86.
-
-*nvidia-kernel-1.0.4363-r2 (26 May 2003)
-
-  08 Jul 2003; ,,, <root@gentoo.org> nvidia-kernel-1.0.4363-r2.ebuild,
-  files/1.0.4363/NVIDIA_kernel-1.0-4363-highpmd.diff:
-  Add patch for 2.5.74-mm2, original patch thanks to Thomas Schlichter
-  <schlicht@uni-mannheim.de> and some fixups thanks to Andrew Morton
-  <akpm@osdl.org>.
-
-  26 May 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-kernel-1.0.4363-r2.ebuild,
-  files/1.0.4363/NVIDIA_kernel-1.0-4363-2.5.69-agp.diff:
-  Another patch for 2.5 kernels.
-
-*nvidia-kernel-1.0.4363-r1 (13 May 2003)
-
-  13 May 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363-r1.ebuild,
-  NVIDIA_kernel-1.0-4363-2.5.69.diff :
-  Get it to compile with latest devfs changes in linux-2.5.69-bk8 or later.
-
-*nvidia-kernel-1.0.4363 (26 Apr 2003)
-
-  26 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4363.ebuild :
-  New version; updated patches for this version; fix kernel version checking code
-  to actually check the version of the kernel in /usr/src/linux, and NOT that of
-  the running one ...
-
-  23 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4349-r2.ebuild :
-  Fix the 2.5.68 patch to only apply if 'irqreturn_t' is defined in
-  linux/interrupt.h.
-
-*nvidia-kernel-1.0.4349-r2 (22 Apr 2003)
-
-  22 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4349-r2.ebuild :
-  - Add a patch from myself to handle devfs/irq changes in 2.5.68+.  It works for
-    me at least ....
-  - Update the 2.5 patch to fix a memory leak.
-
-*nvidia-kernel-1.0.4349-r1 (21 Apr 2003)
-
-  21 Apr 2003; Jay Pfeifer <pfeifer@gentoo.org> nvidia-kernel-1.0.4349-r1.ebuild :
-  Moved from ~x86 to stable.
-  
-  01 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4349-r1.ebuild :
-  Update 2.5 patch to resolve issues with 2.5.66? and up.
-
-*nvidia-kernel-1.0.4349 (30 Mar 2003)
-
-  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4349.ebuild :
-  New version, closing bug #18541.
-
-  04 Mar 2003; Jay Pfeifer <pfeifer@gentoo.org> nvidia-kernel-1.0.4191-r2.ebuild :
-
-  New ebuild to help solve rmap issue in bug #15722.
-
-  17 Feb 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191-r1.ebuild :
-
-  Patch to handle changed include location in 2.5.61+, bug #15846.
-
-  20 Jan 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.3123-r2.ebuild :
-
-  Update modules for kernel 2.5.54 or later, closing bug #13915.
-
-  19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191-r1.ebuild :
-
-  Add a patch for kernel 2.5.54 or later's module loader not handling common
-  sections.
-
-  12 Jan 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191-r1.ebuild :
-
-  Fix it for 2.5.53 or later kernel, and 2.5 in general.
-
-  23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191-r1.ebuild :
-
-  Add tasklet patch for 2.5 kernels in again.
-
-*nvidia-kernel-1.0.4191-r2 (16 Mar 2003)
- 
-  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Added missing changelog entry.
-
-*nvidia-kernel-1.0.4191-1 (18 Dec 2002)
-
-  16 Feb 2003; Spider <spider@gentoo.org> :
-  Fixed a typo in chiset  / chipset
-
-  18 Dec 2002; Joachim Blaabjerg <styx@gentoo.org>
-  nvidia-kernel-1.0.4191-1.ebuild :
-
-  Adding ${FILESDIR}/${NV_PACKAGE}-rmap.diff, so it works with rmap kernels as
-  well. It's all #ifdef'ed, so it shouldn't interfere with other AA kernels.
-  Bumping anyway, per vapier's instructions ;)
-
-  14 Dec 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191.ebuild :
-  As it seems this version need MTRR support for most chipsets, die if its not
-  detected with a suited message ...  This should close bug #12015.
-
-  11 Dec 2002; Martin Schlemmer <azarah@gentoo.org>:
-  Just move $FILESDIR/nvidia-$PV to nvidia-1.1 for easier maintaining.
-  Add a ewarn in pkg_postinst() about the driver name changing.  Add
-  '-alpha' to KEYWORDS.
-
-*nvidia-kernel-1.0.4191 (11 Dec 2002)
-
-  13 Mar 2003; Martin Holzer <mholzer@gentoo.org>
-  nvidia-kernel-1.0.4191-r2.ebuild, nvidia-kernel-1.0.4191.ebuild:
-  fixed typo in pkg_setup.
-
-  11 Dec 2002; Brandon Low <lostlogic@gentoo.org>:
-  Update to latest version, the patches that we'd been applying are
-  no longer needed as they should now be in the mainstream of the 
-  package from nvidia.  Update the modules.d file for new module
-  name.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org>:
-  Changed sparc ~sparc keywords
- 
-*nvidia-kernel-1.0.3123-r2 (8 Dec 2002)
-
-  8 Dec 2002; Martin Schlemmer <azarah@gentoo.org>:
-  Update kernel 2.5 patches, closing bugs #11191 and #11701.
-
-*nvidia-kernel-1.0.3123-r1 (3 Nov 2002)
-
-  3 Nov 2002; Martin Schlemmer <azarah@gentoo.org>:
-  Add page_alloc and linux-2.5 kernel patches.  Closes bug #9704.
-
-  14 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
-  Remove ftp in SRC_URI, as it seems to give some people problems.
-
-*nvidia-kernel-1.0.3123 (12 Sep 2002)
-
-  12 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
-  Update version.
-
-*nvidia-kernel-1.0.2960-r1 (16 Aug 2002)
-
-  17 Aug 2002; Gustavo Felisberto <gustavo@felisberto.net>: Changed a small
-  line in the ebuild so that the kernel module gets installed in
-  /lib/modules/${KV}/video this way a "make modules_install" in /usr/src/linux
-  will not erase the nvidia module. (added by drobbins) This closes bug #5572.
-  
-  16 Aug 2002; Daniel Robbins <drobbins@gentoo.org>: set SLOT to $KV, removed
-  module removal and modprobing from pkg_postinst(). The module stuff had to be
-  removed because NVdriver compiles for the kernel in /usr/src/linux, not
-  necessarily the currently-running kernel. It's also a violation of Gentoo
-  Linux policy to automatically mess with someone's modules. SLOT being set to
-  $KV allows multiple sets of NVdriver modules to be installed for differing
-  kernel versions. Doesn't work 100% yet because we don't yet support differing
-  SLOTs for the exact same version of a package, but will soon.
-  
-  16 Aug 2002; Daniel Robbins <drobbins@gentoo.org>: Added the
-  IGNORE_CC_MISMATCH make flag; in some cases, the NVIDIA build process tries
-  to be too smart and intentionally aborts when it shouldn't. This is a
-  build-related change, so no version bump (still 1.0.2960)
-
-*nvidia-kernel-1.0.2960 (26 May 2002)
-
-*nvidia-kernel-1.0.2880-r1 (29 Apr 2002)
-
-  08 May 2002; Jon Nelson <jnelson@gentoo.org> nvidia-kernel-1.0.2880-r1.ebuild:
-  Make sure to usr KERNDIR=/usr/src/linux /usr/src/linux should be a symlink
-  pointing to the real sources, which may lie outside /usr/src.  KV is set
-  appropriately in any case by more recent versions of portage.
-
-  03 May 2002; Arcady Genkin <agenkin@thpoon.com>
-  nvidia-kernel-1.0.2800-r1.ebuild: Make sure that Portage *does* set KV to
-  something; bail out otherwise. ;^)
-	
-  29 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: Changed NV_KV to KV and
-  added a Portage dependency to ensure that KV is available.  Should fix some
-  build problems.
-
-*nvidia-kernel-1.0.2880 (7 Apr 2002)
-
-  7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.2880.ebuild
-  Fixed all the spaces.
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
deleted file mode 100644
index 4e1f750481e1..000000000000
--- a/media-video/nvidia-kernel/Manifest
+++ /dev/null
@@ -1,352 +0,0 @@
-AUX 1.0.6111/conftest_koutput_includes.patch 1082 RMD160 09bf3184fdc476eee84a1d8d259d6077c3f23aa2 SHA1 507d4bc1fcc53195bf7e2c0b5b378eff62199152 SHA256 c1be1a0776d5597452229a7a35e3db16752b4df2fd0591e9bdcc81583f7ed602
-MD5 b5b7f947ffb9e6c19f7457ff7c14d0db files/1.0.6111/conftest_koutput_includes.patch 1082
-RMD160 09bf3184fdc476eee84a1d8d259d6077c3f23aa2 files/1.0.6111/conftest_koutput_includes.patch 1082
-SHA256 c1be1a0776d5597452229a7a35e3db16752b4df2fd0591e9bdcc81583f7ed602 files/1.0.6111/conftest_koutput_includes.patch 1082
-AUX 1.0.6111/nv-pci_find_class.patch 2903 RMD160 518e5b1c6089646fef24ee13bac8eee9b0cee61d SHA1 cd2d19a71479360975a96b2c0fc3067bbcb8a956 SHA256 6a978cddb08550a401f9ba7d8b56e9f6fee35cdbcab9561807da1bf79f750ca0
-MD5 762e6f6e16aa6dd5b2469e99fe8decd3 files/1.0.6111/nv-pci_find_class.patch 2903
-RMD160 518e5b1c6089646fef24ee13bac8eee9b0cee61d files/1.0.6111/nv-pci_find_class.patch 2903
-SHA256 6a978cddb08550a401f9ba7d8b56e9f6fee35cdbcab9561807da1bf79f750ca0 files/1.0.6111/nv-pci_find_class.patch 2903
-AUX 1.0.6111/nv-remap-range.patch 5715 RMD160 31c39569d31bde247eabc959146ee5a0ec224ced SHA1 a8a58d831542de2ab23ab57ea7026b2cefb389f7 SHA256 9978f95f8711ec02dc564594160f43b759d13639778777ec59b942cedd4bb063
-MD5 c2b155f40d7b904f07550e8e326969c2 files/1.0.6111/nv-remap-range.patch 5715
-RMD160 31c39569d31bde247eabc959146ee5a0ec224ced files/1.0.6111/nv-remap-range.patch 5715
-SHA256 9978f95f8711ec02dc564594160f43b759d13639778777ec59b942cedd4bb063 files/1.0.6111/nv-remap-range.patch 5715
-AUX 1.0.6111/nv_enable_pci.patch 3640 RMD160 57fcf7225e5831128fc155ad3702f968f544f648 SHA1 930e5ffce00ffe5c51e91e8f0eb31c069362311e SHA256 ef921877bbc9b914cf0a67b10e1081a7ca0f3b0ba424464fd06fa87eb9207f61
-MD5 29eafcaf7ab5d59dd90d3d3243bf57c3 files/1.0.6111/nv_enable_pci.patch 3640
-RMD160 57fcf7225e5831128fc155ad3702f968f544f648 files/1.0.6111/nv_enable_pci.patch 3640
-SHA256 ef921877bbc9b914cf0a67b10e1081a7ca0f3b0ba424464fd06fa87eb9207f61 files/1.0.6111/nv_enable_pci.patch 3640
-AUX 1.0.6111/power-suspend-2.6.9-changes.patch 856 RMD160 89630824a926d4609bb48db027da88674719feda SHA1 98db1c66d400dfe8ab7b5e60a3ad98717ab9f0c1 SHA256 9408012ac455056a577dec7353d38202399acc38a250dfdb658567b4cfec3289
-MD5 14924b09123b075f910c73316baff848 files/1.0.6111/power-suspend-2.6.9-changes.patch 856
-RMD160 89630824a926d4609bb48db027da88674719feda files/1.0.6111/power-suspend-2.6.9-changes.patch 856
-SHA256 9408012ac455056a577dec7353d38202399acc38a250dfdb658567b4cfec3289 files/1.0.6111/power-suspend-2.6.9-changes.patch 856
-AUX 1.0.6111/vmalloc-reserve.patch 542 RMD160 ae6d78d7bb29a12929d892c7e3bcbf11be45eb4b SHA1 de7fb286289c1b8b76426e5d5fd88c0620b7a7aa SHA256 420e33483df8190f119faa201f4ca3aa1ed05b12b688c5296b88f54085fc11c2
-MD5 5177339888e44bb5f4b6124fa5830e7f files/1.0.6111/vmalloc-reserve.patch 542
-RMD160 ae6d78d7bb29a12929d892c7e3bcbf11be45eb4b files/1.0.6111/vmalloc-reserve.patch 542
-SHA256 420e33483df8190f119faa201f4ca3aa1ed05b12b688c5296b88f54085fc11c2 files/1.0.6111/vmalloc-reserve.patch 542
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch 1518 RMD160 a3816bcf91b83135cd3ed3bc47d07a387c148c07 SHA1 0c27665a44773fc87841854d90237be10b61b6d1 SHA256 214b951f1cef4afd0f07873f781c112cd30c5bb702fcfd59b1ea9d6410e17639
-MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch 1518
-RMD160 a3816bcf91b83135cd3ed3bc47d07a387c148c07 files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch 1518
-SHA256 214b951f1cef4afd0f07873f781c112cd30c5bb702fcfd59b1ea9d6410e17639 files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch 1518
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch 18398 RMD160 447f86cf6a17f7564a45db2d4294d3a909c26b1f SHA1 a8b364ccf95d98eff75ce39846c564f9278df420 SHA256 27bc7f162391b25b6ec9f591c1854cf5f8419430d13066eab1eebd77d69525da
-MD5 ddeae194df6bb2112d7de723df8d84c2 files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch 18398
-RMD160 447f86cf6a17f7564a45db2d4294d3a909c26b1f files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch 18398
-SHA256 27bc7f162391b25b6ec9f591c1854cf5f8419430d13066eab1eebd77d69525da files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch 18398
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch 9417 RMD160 6347af097f5562974ca51f046958f12fcf27a8ed SHA1 d5273283b28ae9cf63ba5208232d916995194961 SHA256 5c9d91d0e2d4763bf0bd71f9ec44cef74b7ff240190e1e689ad049b547518604
-MD5 5a17c3fa427b4d0ff8e38f82e57cd817 files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch 9417
-RMD160 6347af097f5562974ca51f046958f12fcf27a8ed files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch 9417
-SHA256 5c9d91d0e2d4763bf0bd71f9ec44cef74b7ff240190e1e689ad049b547518604 files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch 9417
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch 581 RMD160 6498e597344b342bd14472ccd096a7671f7f8fa1 SHA1 ed96805ff85554982d1dcfb90710b2c2c9c2fcd7 SHA256 bbfe1117803b071e7ac93fe7c4cc89baaab43b2c4153d2ba7fbb7ba13caa740f
-MD5 ada7d22def202e56c01c1e72c8000d45 files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch 581
-RMD160 6498e597344b342bd14472ccd096a7671f7f8fa1 files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch 581
-SHA256 bbfe1117803b071e7ac93fe7c4cc89baaab43b2c4153d2ba7fbb7ba13caa740f files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch 581
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch 2160 RMD160 7eea93c6a8aadc678e6833aaca1ea3033b306b28 SHA1 e018a87d2a45c8163f4848ac083276fe353dfa22 SHA256 e10f6b789f0bbffc448c7d5d6d46db82a138726084080a247773d7b70384b36b
-MD5 f1a5a01593ef996b38fe70bc93fa7440 files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch 2160
-RMD160 7eea93c6a8aadc678e6833aaca1ea3033b306b28 files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch 2160
-SHA256 e10f6b789f0bbffc448c7d5d6d46db82a138726084080a247773d7b70384b36b files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch 2160
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch 1877 RMD160 defafb2bc732943143a4febe43f3c20ada45e8da SHA1 99341c0c14668fbc5840162268c5d571fa561ff5 SHA256 c8fde8648f76c90f6563fc92351d304018792d21a6230729a07db3a7c7f74a3f
-MD5 59c5fa8340585303cd18362bbeb0086f files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch 1877
-RMD160 defafb2bc732943143a4febe43f3c20ada45e8da files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch 1877
-SHA256 c8fde8648f76c90f6563fc92351d304018792d21a6230729a07db3a7c7f74a3f files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch 1877
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch 2608 RMD160 753537c76dd0f7913504c7a474bfa7953c3e6480 SHA1 855441f09fd6d0b50574538506c24a19f4bcdccb SHA256 11c9921d53d6a833231030ae825eb8250887ea4bc1c40c70755e8ef1b674bcca
-MD5 d4e8ffdb0cc67c56884e6055d2045e51 files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch 2608
-RMD160 753537c76dd0f7913504c7a474bfa7953c3e6480 files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch 2608
-SHA256 11c9921d53d6a833231030ae825eb8250887ea4bc1c40c70755e8ef1b674bcca files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch 2608
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch 8072 RMD160 50033f77c043922ac8acb1244092a53b847c70af SHA1 29e9e51112aebf93d900ea47b43b3774913ce81c SHA256 a7114e713d7fc04a62c68ec446c21a45aa6ac38a1014d7b59dbc844aaaf980ea
-MD5 e210d99cae87c3f60120ea474b97fca7 files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch 8072
-RMD160 50033f77c043922ac8acb1244092a53b847c70af files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch 8072
-SHA256 a7114e713d7fc04a62c68ec446c21a45aa6ac38a1014d7b59dbc844aaaf980ea files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch 8072
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff 9445 RMD160 eafde4415b675c30cc199d036e120714832f74e2 SHA1 4fa617fc6c8e40313fd634cbd51c8e959f8af56f SHA256 662dc8a82209db77be1ff130c4690ce230b1b444b180df2cb4693950b6156a86
-MD5 da7644fcc801d40c26fb22b570a88835 files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff 9445
-RMD160 eafde4415b675c30cc199d036e120714832f74e2 files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff 9445
-SHA256 662dc8a82209db77be1ff130c4690ce230b1b444b180df2cb4693950b6156a86 files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff 9445
-AUX 1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch 7860 RMD160 79de0ab82a11e0fb3b1ff5a1f348fd97f15c83b2 SHA1 a853b5e2c96dd7031cdc54b40ec880628213adf0 SHA256 b82be8df6f8bd40fe2992fe19d5363817a977e3eef88c65300b02111673ac584
-MD5 bca6ad85efa6071a949bdcb24fce1733 files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch 7860
-RMD160 79de0ab82a11e0fb3b1ff5a1f348fd97f15c83b2 files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch 7860
-SHA256 b82be8df6f8bd40fe2992fe19d5363817a977e3eef88c65300b02111673ac584 files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch 7860
-AUX 1.0.6629/NVIDIA_kernel-1.0-7174-1296092.diff 3663 RMD160 5e09099630336c023ed24bf177f6cd3fd8813f6a SHA1 dc7cbad6f86fe628eafc8c2dc727b423fac520a7 SHA256 3c32d8d46dd0c0af66e5ad20d8b80095a32baa24cf2deaca896d13e7d5752e2a
-MD5 0983a2cbdacbaa3ae1a9ac1759a37706 files/1.0.6629/NVIDIA_kernel-1.0-7174-1296092.diff 3663
-RMD160 5e09099630336c023ed24bf177f6cd3fd8813f6a files/1.0.6629/NVIDIA_kernel-1.0-7174-1296092.diff 3663
-SHA256 3c32d8d46dd0c0af66e5ad20d8b80095a32baa24cf2deaca896d13e7d5752e2a files/1.0.6629/NVIDIA_kernel-1.0-7174-1296092.diff 3663
-AUX 1.0.6629/conftest_koutput_includes.patch 1082 RMD160 8a9109c9418b0004f0efb03f11bbef84f4feefa9 SHA1 af415aea08a916b1b154f08ad92306bec32db179 SHA256 e380665b02ddebbcf34f313f58c7dd6eb5d83ae9736097be02e0e72547916b0b
-MD5 dbf80a2cbaf69a10521429e1b2a7e10c files/1.0.6629/conftest_koutput_includes.patch 1082
-RMD160 8a9109c9418b0004f0efb03f11bbef84f4feefa9 files/1.0.6629/conftest_koutput_includes.patch 1082
-SHA256 e380665b02ddebbcf34f313f58c7dd6eb5d83ae9736097be02e0e72547916b0b files/1.0.6629/conftest_koutput_includes.patch 1082
-AUX 1.0.6629/nv-amd64-shutup-warnings.patch 902 RMD160 811d62ff87944bc08f9b35def38971722080d925 SHA1 72c29a6d242f4182fdd01cf60df4a42109617a3a SHA256 32c61b4ed45a7425ff4e2282b409032adc1c1f9ba13a72663cdefd774636e625
-MD5 5aef5c6a394896bbb8392816f6795147 files/1.0.6629/nv-amd64-shutup-warnings.patch 902
-RMD160 811d62ff87944bc08f9b35def38971722080d925 files/1.0.6629/nv-amd64-shutup-warnings.patch 902
-SHA256 32c61b4ed45a7425ff4e2282b409032adc1c1f9ba13a72663cdefd774636e625 files/1.0.6629/nv-amd64-shutup-warnings.patch 902
-AUX 1.0.6629/nv-fix-memory-limit.patch 18398 RMD160 447f86cf6a17f7564a45db2d4294d3a909c26b1f SHA1 a8b364ccf95d98eff75ce39846c564f9278df420 SHA256 27bc7f162391b25b6ec9f591c1854cf5f8419430d13066eab1eebd77d69525da
-MD5 ddeae194df6bb2112d7de723df8d84c2 files/1.0.6629/nv-fix-memory-limit.patch 18398
-RMD160 447f86cf6a17f7564a45db2d4294d3a909c26b1f files/1.0.6629/nv-fix-memory-limit.patch 18398
-SHA256 27bc7f162391b25b6ec9f591c1854cf5f8419430d13066eab1eebd77d69525da files/1.0.6629/nv-fix-memory-limit.patch 18398
-AUX 1.0.6629/nv-pgd_offset.patch 3139 RMD160 126588eb550614e274b5e7bc93d8dd609198b23f SHA1 a026f1c43da9ce843bd54760a76d7286299a9668 SHA256 f9d92135c0f429e761c201c7ff1f11e78b6eb354919191b2f44081bdd01a9dd5
-MD5 e70739410861defb6bf3d40f2706d554 files/1.0.6629/nv-pgd_offset.patch 3139
-RMD160 126588eb550614e274b5e7bc93d8dd609198b23f files/1.0.6629/nv-pgd_offset.patch 3139
-SHA256 f9d92135c0f429e761c201c7ff1f11e78b6eb354919191b2f44081bdd01a9dd5 files/1.0.6629/nv-pgd_offset.patch 3139
-AUX 1.0.6629/nv-pgprot-speedup.patch 1518 RMD160 a3816bcf91b83135cd3ed3bc47d07a387c148c07 SHA1 0c27665a44773fc87841854d90237be10b61b6d1 SHA256 214b951f1cef4afd0f07873f781c112cd30c5bb702fcfd59b1ea9d6410e17639
-MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/nv-pgprot-speedup.patch 1518
-RMD160 a3816bcf91b83135cd3ed3bc47d07a387c148c07 files/1.0.6629/nv-pgprot-speedup.patch 1518
-SHA256 214b951f1cef4afd0f07873f781c112cd30c5bb702fcfd59b1ea9d6410e17639 files/1.0.6629/nv-pgprot-speedup.patch 1518
-AUX 1.0.6629/nv-shutup-warnings.patch 712 RMD160 0a3bd36a6e18e9782d8d313152d95631eb23c9eb SHA1 979534cb03b5fe62a2842b69ebf816b0e7617ff5 SHA256 e6482dd58dd96752fd81ccc1f23128d439156f580734c135d23b5b638c7e01fe
-MD5 64d76075a90dedc83f1dc971389c910e files/1.0.6629/nv-shutup-warnings.patch 712
-RMD160 0a3bd36a6e18e9782d8d313152d95631eb23c9eb files/1.0.6629/nv-shutup-warnings.patch 712
-SHA256 e6482dd58dd96752fd81ccc1f23128d439156f580734c135d23b5b638c7e01fe files/1.0.6629/nv-shutup-warnings.patch 712
-AUX 1.0.6629/nv-vm_flags-no-VM_LOCKED.patch 677 RMD160 b1d8b04aba8b9a4d37fd8e5cc327add52943cff7 SHA1 33f43a60cde81146e61a67739ff7c5e8b67740f7 SHA256 c85ac34a2ab66e7475c873ff8cb37b78f2de7389e7a128c0e933ace3a44b18a7
-MD5 7c9db721d244f6ca709e2b8003ce4e0d files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch 677
-RMD160 b1d8b04aba8b9a4d37fd8e5cc327add52943cff7 files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch 677
-SHA256 c85ac34a2ab66e7475c873ff8cb37b78f2de7389e7a128c0e933ace3a44b18a7 files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch 677
-AUX 1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch 490 RMD160 ec47a01610d2545b900785c53d01e52ce4aae73d SHA1 874ed8b3f0887918ad9efe21edb823c59ea4a729 SHA256 5c73260241a3034b8cd4503b73ca2e1f67a975ac20152e57e4cb2a131f8c240e
-MD5 70bb10b2da2423a6be2a4c2bce38d807 files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch 490
-RMD160 ec47a01610d2545b900785c53d01e52ce4aae73d files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch 490
-SHA256 5c73260241a3034b8cd4503b73ca2e1f67a975ac20152e57e4cb2a131f8c240e files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch 490
-AUX 1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch 1100 RMD160 21b8fe708fdc34053e5df5600b490df64182d73d SHA1 f96f56d3735c247e1e9ba2305b34dcf9030e1b9b SHA256 01f8ce7bc19294f97d8b0d0aeb5d5a04269e680f6adaf04f5c2f204a25c835bd
-MD5 e2625e9e0a6679c38783b5d8985fdaf6 files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch 1100
-RMD160 21b8fe708fdc34053e5df5600b490df64182d73d files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch 1100
-SHA256 01f8ce7bc19294f97d8b0d0aeb5d5a04269e680f6adaf04f5c2f204a25c835bd files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch 1100
-AUX 1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch 770 RMD160 ce9f930d0be083a5edc8978e64b2e7df5b08e6fe SHA1 e0443cd02df0bb3b0306a5064ea040c54741967c SHA256 cdfb845c3dcae165f99d08e0f7af55928bd1fffc957f9be147b40a682ef81a72
-MD5 82d99e72fddbc1b0447708afd84dc8c5 files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch 770
-RMD160 ce9f930d0be083a5edc8978e64b2e7df5b08e6fe files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch 770
-SHA256 cdfb845c3dcae165f99d08e0f7af55928bd1fffc957f9be147b40a682ef81a72 files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch 770
-AUX 1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch 1082 RMD160 1e5628db6f7adfd2f8ac3a933e84af702ae90297 SHA1 919eb9fa38d321d1a84ca9d636fc71e23b874024 SHA256 cb593bbd2f41c167a10dd1dee10fe3fe3c0c0f47a78ceeef37578c450c10d1b4
-MD5 7ae487fba8a81fb91d53f35b9066512f files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch 1082
-RMD160 1e5628db6f7adfd2f8ac3a933e84af702ae90297 files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch 1082
-SHA256 cb593bbd2f41c167a10dd1dee10fe3fe3c0c0f47a78ceeef37578c450c10d1b4 files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch 1082
-AUX 1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch 742 RMD160 5ef23b2e96874b3f3b1cea7506be99d7c7693b6c SHA1 07acdf23919db2fd0c863b9f1ce2c76950a74d35 SHA256 95ea3b3e11b593ceb48f940a99679003535059efb9ee06eb675e58058337a1d9
-MD5 6c6bd7d2e4589cf3f4725082bb413a43 files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch 742
-RMD160 5ef23b2e96874b3f3b1cea7506be99d7c7693b6c files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch 742
-SHA256 95ea3b3e11b593ceb48f940a99679003535059efb9ee06eb675e58058337a1d9 files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch 742
-AUX 1.0.7174/NVIDIA_kernel-1.0-7174-1258475.diff 3971 RMD160 aee4f70b17ab60adfadbc7be3d79447207381397 SHA1 145e613e72675a8d1a1ffd55b49c5fc294ced576 SHA256 84f0e60c3c28f3164996748baa1d852aaa191dfd3a67f7d9dd8714f6d1f63b9a
-MD5 fea578e529e3261412ebbf622e05531a files/1.0.7174/NVIDIA_kernel-1.0-7174-1258475.diff 3971
-RMD160 aee4f70b17ab60adfadbc7be3d79447207381397 files/1.0.7174/NVIDIA_kernel-1.0-7174-1258475.diff 3971
-SHA256 84f0e60c3c28f3164996748baa1d852aaa191dfd3a67f7d9dd8714f6d1f63b9a files/1.0.7174/NVIDIA_kernel-1.0-7174-1258475.diff 3971
-AUX 1.0.7174/NVIDIA_kernel-1.0-7174-1296092.diff 3663 RMD160 5e09099630336c023ed24bf177f6cd3fd8813f6a SHA1 dc7cbad6f86fe628eafc8c2dc727b423fac520a7 SHA256 3c32d8d46dd0c0af66e5ad20d8b80095a32baa24cf2deaca896d13e7d5752e2a
-MD5 0983a2cbdacbaa3ae1a9ac1759a37706 files/1.0.7174/NVIDIA_kernel-1.0-7174-1296092.diff 3663
-RMD160 5e09099630336c023ed24bf177f6cd3fd8813f6a files/1.0.7174/NVIDIA_kernel-1.0-7174-1296092.diff 3663
-SHA256 3c32d8d46dd0c0af66e5ad20d8b80095a32baa24cf2deaca896d13e7d5752e2a files/1.0.7174/NVIDIA_kernel-1.0-7174-1296092.diff 3663
-AUX 1.0.7174/NVIDIA_kernel-1.0-7174-1321905.diff 1047 RMD160 630cead9c613f09cd5efb23e314c31f925b1bc24 SHA1 13059604ccbd254c57347e5b8815100918c983fc SHA256 37f70cc009d1dad27bb9af465c27003095c8810de5e150764a691d502656e536
-MD5 74e4852ca3a04b90ce5a5993e99a6e2d files/1.0.7174/NVIDIA_kernel-1.0-7174-1321905.diff 1047
-RMD160 630cead9c613f09cd5efb23e314c31f925b1bc24 files/1.0.7174/NVIDIA_kernel-1.0-7174-1321905.diff 1047
-SHA256 37f70cc009d1dad27bb9af465c27003095c8810de5e150764a691d502656e536 files/1.0.7174/NVIDIA_kernel-1.0-7174-1321905.diff 1047
-AUX 1.0.7174/NVIDIA_kernel-1.0-7174-1361053.diff 3049 RMD160 d793b3a6c92b5c1c700bb6958159e099e07a7c25 SHA1 6ddfafd276515b355509030cafc116ee0359a27d SHA256 53ddd4baa59699e2a0100a2cb2332284d83b9b9eeeb7b2a34247776f6d1f0df6
-MD5 4861c4a22bbe788d544560996cd5d190 files/1.0.7174/NVIDIA_kernel-1.0-7174-1361053.diff 3049
-RMD160 d793b3a6c92b5c1c700bb6958159e099e07a7c25 files/1.0.7174/NVIDIA_kernel-1.0-7174-1361053.diff 3049
-SHA256 53ddd4baa59699e2a0100a2cb2332284d83b9b9eeeb7b2a34247776f6d1f0df6 files/1.0.7174/NVIDIA_kernel-1.0-7174-1361053.diff 3049
-AUX 1.0.7174/NVIDIA_kernel-1.0-7174-1386866.diff 2491 RMD160 96ec63b13082a287710443d57126090bbf743961 SHA1 ffbd77f690bcd51bfea549c75498184c83007f58 SHA256 cc64918aff37a2241e59922fd4d51a3012af3f66bf6ac05c93f612c1d8d90963
-MD5 d02cf5097f4ca4f1cd2e0209f0338b0e files/1.0.7174/NVIDIA_kernel-1.0-7174-1386866.diff 2491
-RMD160 96ec63b13082a287710443d57126090bbf743961 files/1.0.7174/NVIDIA_kernel-1.0-7174-1386866.diff 2491
-SHA256 cc64918aff37a2241e59922fd4d51a3012af3f66bf6ac05c93f612c1d8d90963 files/1.0.7174/NVIDIA_kernel-1.0-7174-1386866.diff 2491
-AUX 1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch 1764 RMD160 c4962f258e21dd841ee38ef9813630aed01da587 SHA1 37e58b5a9b2a337a5119ad3b55ef4153ef9fc1f5 SHA256 120c0ae9702f979a35b9907b3f2d28b390dd6d5f923c50f507a577abc822ebab
-MD5 e1718c0414288a04c27b70a124947613 files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch 1764
-RMD160 c4962f258e21dd841ee38ef9813630aed01da587 files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch 1764
-SHA256 120c0ae9702f979a35b9907b3f2d28b390dd6d5f923c50f507a577abc822ebab files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch 1764
-AUX 1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff 1047 RMD160 9e1312489f7613e3826815ff4cdf8438ed216b95 SHA1 acc40e101e025b0ad0629c66359a1d2487c2ecbd SHA256 9325558ceea389c7e42073b0a59429ec8ef5e3ee862ceee345a594d0a6af0ade
-MD5 99b630e5a1d4b732e930781f25187194 files/1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff 1047
-RMD160 9e1312489f7613e3826815ff4cdf8438ed216b95 files/1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff 1047
-SHA256 9325558ceea389c7e42073b0a59429ec8ef5e3ee862ceee345a594d0a6af0ade files/1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff 1047
-AUX 1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff 3294 RMD160 695b85d9e36df1b69d63be81489ad9f1c86f5540 SHA1 a943884cd5dff7842ec2fe7727b686e8f0506eb0 SHA256 c1caab5a82b225ec38dfcec95637f8247d1852f1b4cbe7a3c2c49ffb3cfaedf7
-MD5 c0495ec827a938afcb807dd618e03945 files/1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff 3294
-RMD160 695b85d9e36df1b69d63be81489ad9f1c86f5540 files/1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff 3294
-SHA256 c1caab5a82b225ec38dfcec95637f8247d1852f1b4cbe7a3c2c49ffb3cfaedf7 files/1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff 3294
-AUX 1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff 2989 RMD160 d5d2bb3001a57bfdb9af0e4d1cadd92996981191 SHA1 68c86f95ff7c814d8de952a4cf80317221a614d8 SHA256 ebf63d39a139dd3a67cfa869ac22c04eec246449a6f412b555150464bdae5bc6
-MD5 5125c6d55ae72122144771ef1697db53 files/1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff 2989
-RMD160 d5d2bb3001a57bfdb9af0e4d1cadd92996981191 files/1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff 2989
-SHA256 ebf63d39a139dd3a67cfa869ac22c04eec246449a6f412b555150464bdae5bc6 files/1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff 2989
-AUX 1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff 2491 RMD160 bb2827c51ad125abb5622c19468825cb33446150 SHA1 81eb27d8cb5f81aef81cebe12eee5d188cb5e3b8 SHA256 d523c2840183559c9221fd33385f0e57debe967eea52b8acdcbb051d924ebc02
-MD5 196649a84a2396a6588f27457a39d1fa files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff 2491
-RMD160 bb2827c51ad125abb5622c19468825cb33446150 files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff 2491
-SHA256 d523c2840183559c9221fd33385f0e57debe967eea52b8acdcbb051d924ebc02 files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff 2491
-AUX 1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff 2359 RMD160 0972618ffb7fd2be352aa4cad749bb709403c640 SHA1 8cb020c1d9f1fb231837e3a0c19e4dde2f7e49b8 SHA256 65d3d1b71ccb777a8b6c4804f2cb934eed8a047967b1dd6e7dcd12b77bf543d9
-MD5 5eaf8c4597d2f0b2670caa1303b2a4bc files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff 2359
-RMD160 0972618ffb7fd2be352aa4cad749bb709403c640 files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff 2359
-SHA256 65d3d1b71ccb777a8b6c4804f2cb934eed8a047967b1dd6e7dcd12b77bf543d9 files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff 2359
-AUX 1.0.8174/NVIDIA_kernel-1.0-8174-1423627.diff 11631 RMD160 05bc5648ae086ee3aea6b212d11039ca59a87e3e SHA1 620a4655d3cab9327e178edc666287a3117a833e SHA256 aa33b50fe5c60a1ea8a6a30cbf3c5da4688d9eedb812bcfdf42402182e6fe8b1
-MD5 1cac21325aacb18a199949ee20979165 files/1.0.8174/NVIDIA_kernel-1.0-8174-1423627.diff 11631
-RMD160 05bc5648ae086ee3aea6b212d11039ca59a87e3e files/1.0.8174/NVIDIA_kernel-1.0-8174-1423627.diff 11631
-SHA256 aa33b50fe5c60a1ea8a6a30cbf3c5da4688d9eedb812bcfdf42402182e6fe8b1 files/1.0.8174/NVIDIA_kernel-1.0-8174-1423627.diff 11631
-AUX 1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff 397 RMD160 b3226af4113495f4dfd59bb9fe3f9008090af844 SHA1 b84e6479e59f543d40ee9ae77d4bf6e96a530424 SHA256 5a01fb256e916f844d31e1e5999395dcf90d66ed2e8bac95eb89db7ddb4f9c12
-MD5 36d3b1bbd86b11dd8f4ab3339ec0cac8 files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff 397
-RMD160 b3226af4113495f4dfd59bb9fe3f9008090af844 files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff 397
-SHA256 5a01fb256e916f844d31e1e5999395dcf90d66ed2e8bac95eb89db7ddb4f9c12 files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff 397
-AUX 1.0.8178/NVIDIA_kernel-1.0-8178-U011106.diff 16515 RMD160 3647a4b670fe53d61e2205fd60efce1d1337a893 SHA1 441769614c72c25be54036737f0d822c35f53a5a SHA256 d90fcc4263f0e6319fac87271ab39da921f9d6ba2f2a5c221711049eca4bd68b
-MD5 44d01e81815beb8fae5b10442dc7e78b files/1.0.8178/NVIDIA_kernel-1.0-8178-U011106.diff 16515
-RMD160 3647a4b670fe53d61e2205fd60efce1d1337a893 files/1.0.8178/NVIDIA_kernel-1.0-8178-U011106.diff 16515
-SHA256 d90fcc4263f0e6319fac87271ab39da921f9d6ba2f2a5c221711049eca4bd68b files/1.0.8178/NVIDIA_kernel-1.0-8178-U011106.diff 16515
-AUX 1.0.8178/NVIDIA_kernel-1.0-8178-U012206.diff 24637 RMD160 f5401a1c4011ca0850b92d93e867e23c10393d6a SHA1 037b6d701fd694b0abe6c31f7f23a14302a1864f SHA256 0308a8a68ddc1295d6b5bfe1e839ae246bfb109a1ae3262436739d69862e1d9e
-MD5 804a9ea8bf5164aa3248c89ab2f6792e files/1.0.8178/NVIDIA_kernel-1.0-8178-U012206.diff 24637
-RMD160 f5401a1c4011ca0850b92d93e867e23c10393d6a files/1.0.8178/NVIDIA_kernel-1.0-8178-U012206.diff 24637
-SHA256 0308a8a68ddc1295d6b5bfe1e839ae246bfb109a1ae3262436739d69862e1d9e files/1.0.8178/NVIDIA_kernel-1.0-8178-U012206.diff 24637
-AUX 1.0.8178/NVIDIA_kernel-1.0-8178-U122205.diff 16010 RMD160 84ed9c3ebfe88e269614a9b991a52e1ff8f0bc23 SHA1 a4edc62fc233743778587797894cb5fc8da3cf84 SHA256 8ae6be2ea5e6643e11737117cbed410896896174629d8939c248417a30233a86
-MD5 3b5a2525633e88b9d78c4721190542e6 files/1.0.8178/NVIDIA_kernel-1.0-8178-U122205.diff 16010
-RMD160 84ed9c3ebfe88e269614a9b991a52e1ff8f0bc23 files/1.0.8178/NVIDIA_kernel-1.0-8178-U122205.diff 16010
-SHA256 8ae6be2ea5e6643e11737117cbed410896896174629d8939c248417a30233a86 files/1.0.8178/NVIDIA_kernel-1.0-8178-U122205.diff 16010
-AUX nvidia 704 RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e SHA1 f57628e6cd4d5ea5bf1b22a55dd81a55166f7c55 SHA256 6ac22481314de823ec31e60663521f318c7eceec75162c11cb97260db6ee0fe2
-MD5 e8166a48172ea0f32a3b73e2d44f30a3 files/nvidia 704
-RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e files/nvidia 704
-SHA256 6ac22481314de823ec31e60663521f318c7eceec75162c11cb97260db6ee0fe2 files/nvidia 704
-DIST NVIDIA-Linux-x86-1.0-6111-pkg1.run 8167999
-DIST NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221 RMD160 c6d17cd1b0e101acbd31cd991595c1b52f294c1c SHA1 33dc817aedbe51a5dc411824452a376723e63c3d SHA256 63b735881a05462e8e9e8ef0863cdfec038c0419c728bd7fad1fdb84d9792c0b
-DIST NVIDIA-Linux-x86-1.0-7167-pkg1.run 9427444
-DIST NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644 RMD160 705d3991d2ba25365c97e1530d1f26b7b54efb12 SHA1 55c0e4f2231e6ab2eef34bfe881c5da603ed8f06 SHA256 daf76e25bcc9dc96f5e12d9f478e18136324e37b0d2e07babf18656e632e630e
-DIST NVIDIA-Linux-x86-1.0-7667-pkg0.run 5629423
-DIST NVIDIA-Linux-x86-1.0-7676-pkg0.run 5631274
-DIST NVIDIA-Linux-x86-1.0-8174-pkg1.run 11998227 RMD160 bfb99ba894ecc9616adc63847d024e98a27f06b3 SHA1 a95a7968580571ff68bbb7a4714f2db5b0bd9640 SHA256 1082fe6d7269924221ec9a9f34d3fb7b395a62f1284676b4a1df8a4de788bc6d
-DIST NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641 RMD160 4075969c4229dd75467113b8eb22ab9645893385 SHA1 443cf4f3f608ddacc1023614f6e1b9c7f81a7ee8 SHA256 dd71799636db5a48d0f602663032dc12fdd9473841cd005b082ba812c34dc6e9
-DIST NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804 RMD160 e33aad0b2cf948e54b9bd245f5ad865dd2c46abe SHA1 f4c2e41e7aa5f7a9d93b58c3464ad33107f9a937 SHA256 eb8cdd5acc14044e35f8462e00a6626dbf498804aca4ec8e4cd421a8e0898dd6
-DIST NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 RMD160 1e887de23c5d0b9eb3a581b2d91989c1b9c45514 SHA1 bf83c71cc04117cfa4c81e38e2df07fa4dc3e8be SHA256 b38ce2853195175a2b7380fe95968d52a707a08dbe9fcb6ae423c9b9b0a47eee
-DIST NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486 RMD160 b90d9dbac560f55ffa737450f073e1188e0acd23 SHA1 04ade141d08b3f0807177f0abaec2b76a0527e01 SHA256 797006376a017fee57f04ff006dcee5931122c4dbfc0bf9c9e3b5fb8a0d61296
-DIST NVIDIA-Linux-x86_64-1.0-6629-pkg2.run 7777882 RMD160 029a82b0003d0481860d54a3fc8bf203c94a6b20 SHA1 21a33f3cd4a88d648aa16b9e5747e1225c4766e2 SHA256 9fa8cb2d4e9a05a07f24c0beddc1fcc0046218027ebcc28c397f56f019fcefbb
-DIST NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382 RMD160 54e9ac9c7f845ce1bf75ecb5ac2404a59a6b4eb3 SHA1 fcdc22d54332aa4dbe53b07fa140c70e3f4962d3 SHA256 db60506ed3b06c2b693e1abeae3152b14ed7974f7d4d570a477ca2eb0907e7f3
-DIST NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038 RMD160 593a3ca26e7ef480ac51a4fded29f19a9081d8f8 SHA1 f784f185b445eff8499c430636ae0dbf3e61b5a8 SHA256 95acbd320f09526e95b7920cb0f9031486a7730356b1b11adc316852846a3eb9
-DIST NVIDIA-Linux-x86_64-1.0-7667-pkg2.run 8819702 RMD160 da9fae439627f6de15ab17d34b16a8530dd313e7 SHA1 c797d1f144ce9b993dcb408b41ff637c45e0d1ae SHA256 ec65e6dfc5dd5304a76e57b3de2d6ada86c8620a1a1d9377c3950b9f56dea1c4
-DIST NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402 RMD160 4f48ef2d5146c182a936d8711b4a5a3e62d6ac46 SHA1 9bb7dc568235649b7eb444bacd4f221ce1cce0c1 SHA256 7e5eb3e549717c1b44b21a12358fa99476666a66d723f8a7bb936419d09052cd
-DIST NVIDIA-Linux-x86_64-1.0-8174-pkg2.run 9559334 RMD160 799acae44b40ec3356dbd1a34bf4c73b1b76e66c SHA1 7435003e797252ea8f80a05c0d157d4acfb619bc SHA256 2af40ab752f6bc5dd51cde622ce5dd19375d7640a65fa507404b318451911898
-DIST NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594 RMD160 ee9b91f58d30d9d4800891760e24748795d07b5c SHA1 121f7c214370f832512f62a3b803833560af7de6 SHA256 bc59ded88f0d60a662a911766e923e397b8c7902cef8b293adfb1acc0669d097
-DIST NVIDIA-Linux-x86_64-1.0-8756-pkg2.run 9950572 RMD160 ae6d8496607798bd9de3a9211c02d4fcb08bd088 SHA1 287a3b51cb3eac36e5ec1cfa632f69417b916633 SHA256 31c5e7be79d4e5dfb5cf878b2d4dacf0e0ff88e4661f301bee6cf1eece59191e
-DIST NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 RMD160 55f0ca9d35f7be6e3b65de2ed1c121e9c39c23a9 SHA1 7f2a73a2e96a94e5d44336db6a3d663cf68ad7f8 SHA256 84fb9bf70684943cc12b3e9be19de0aadbbfaa9d2118e6bef5525ac45fb0462c
-EBUILD nvidia-kernel-1.0.6111-r3.ebuild 4523 RMD160 10779ec7aeca08738b94c7ebbca02d05b2266e4a SHA1 0f2055d072ea3ec2d774056f74c0cafb362c8f45 SHA256 ba450e23c9dd446ab9cd2aa05eb620b1a717c944d3ff95ae6b51f81ee823141a
-MD5 6912838fee04de491aa184c309e274a9 nvidia-kernel-1.0.6111-r3.ebuild 4523
-RMD160 10779ec7aeca08738b94c7ebbca02d05b2266e4a nvidia-kernel-1.0.6111-r3.ebuild 4523
-SHA256 ba450e23c9dd446ab9cd2aa05eb620b1a717c944d3ff95ae6b51f81ee823141a nvidia-kernel-1.0.6111-r3.ebuild 4523
-EBUILD nvidia-kernel-1.0.6111-r4.ebuild 5674 RMD160 4200beeed57548a193e014a8e9d1c13dce7ec036 SHA1 0ad64db43871869a0bddb0108de6fe575ecf6e44 SHA256 8106e380f7f3437406a32dc26840a1f5ee01f9c453b1cf9497a8015ad742678e
-MD5 d207dd21943c6300868b173a9348329f nvidia-kernel-1.0.6111-r4.ebuild 5674
-RMD160 4200beeed57548a193e014a8e9d1c13dce7ec036 nvidia-kernel-1.0.6111-r4.ebuild 5674
-SHA256 8106e380f7f3437406a32dc26840a1f5ee01f9c453b1cf9497a8015ad742678e nvidia-kernel-1.0.6111-r4.ebuild 5674
-EBUILD nvidia-kernel-1.0.6629-r5.ebuild 4638 RMD160 5198642c65684b1643aba3abc2ec7b7805a125ee SHA1 6b86a328e70cb943a6b87394ef6c398578e533dc SHA256 418cb414ba24233738f536c8831d8bd62e7f0db670d6357f07af21167501c4b0
-MD5 557e54984d4962461637258173d7a6c9 nvidia-kernel-1.0.6629-r5.ebuild 4638
-RMD160 5198642c65684b1643aba3abc2ec7b7805a125ee nvidia-kernel-1.0.6629-r5.ebuild 4638
-SHA256 418cb414ba24233738f536c8831d8bd62e7f0db670d6357f07af21167501c4b0 nvidia-kernel-1.0.6629-r5.ebuild 4638
-EBUILD nvidia-kernel-1.0.6629-r6.ebuild 5793 RMD160 d6ac0a8ed8d082c52339205591b1eb7bb9d82c1b SHA1 e35a6333c0ebd22226702bd2a25dd34d3c02fd45 SHA256 f45118b85895cd5a5b792ce0fa95c40f187334033ae100f2e0e3cb9b9f8986dc
-MD5 dffdb5e0402013eb0fb09eea69a79d4f nvidia-kernel-1.0.6629-r6.ebuild 5793
-RMD160 d6ac0a8ed8d082c52339205591b1eb7bb9d82c1b nvidia-kernel-1.0.6629-r6.ebuild 5793
-SHA256 f45118b85895cd5a5b792ce0fa95c40f187334033ae100f2e0e3cb9b9f8986dc nvidia-kernel-1.0.6629-r6.ebuild 5793
-EBUILD nvidia-kernel-1.0.7167-r1.ebuild 3848 RMD160 a8eacd14ae6906f1d00427ea9f4d9693b5f4432b SHA1 1c961f1e8b30ba3bf097fed3bc36c7ecf8bfc10e SHA256 1a498d86efe238f3368992fdf27c9bbd816d1e8150eb203243b2b736645f8fa1
-MD5 d4d132844f9e210d5f052e9256a27e16 nvidia-kernel-1.0.7167-r1.ebuild 3848
-RMD160 a8eacd14ae6906f1d00427ea9f4d9693b5f4432b nvidia-kernel-1.0.7167-r1.ebuild 3848
-SHA256 1a498d86efe238f3368992fdf27c9bbd816d1e8150eb203243b2b736645f8fa1 nvidia-kernel-1.0.7167-r1.ebuild 3848
-EBUILD nvidia-kernel-1.0.7167-r2.ebuild 5003 RMD160 2c3094459094370b8700592523dd6128e195769b SHA1 7d288e8cd971c92749cf42b77ac4dd8710c3ab6d SHA256 11f1a4c6068c932224073c2bdbae0b23ad42c29da6145cf78a11939a36d1c5f2
-MD5 7c4231d99fe5315537acd73ce842bc3c nvidia-kernel-1.0.7167-r2.ebuild 5003
-RMD160 2c3094459094370b8700592523dd6128e195769b nvidia-kernel-1.0.7167-r2.ebuild 5003
-SHA256 11f1a4c6068c932224073c2bdbae0b23ad42c29da6145cf78a11939a36d1c5f2 nvidia-kernel-1.0.7167-r2.ebuild 5003
-EBUILD nvidia-kernel-1.0.7174-r2.ebuild 4134 RMD160 279e59a838d3877054f0c942752ed71363746950 SHA1 222c30b71e5f85db7675f6db5915fb8148b1e476 SHA256 d9f9d47df889174b7338db355b526dce8bb79fb5f9d7023758d009c73ac8ee42
-MD5 6c12d93038f7f38b56390b9633fbfab3 nvidia-kernel-1.0.7174-r2.ebuild 4134
-RMD160 279e59a838d3877054f0c942752ed71363746950 nvidia-kernel-1.0.7174-r2.ebuild 4134
-SHA256 d9f9d47df889174b7338db355b526dce8bb79fb5f9d7023758d009c73ac8ee42 nvidia-kernel-1.0.7174-r2.ebuild 4134
-EBUILD nvidia-kernel-1.0.7174-r3.ebuild 5289 RMD160 f8d1b2e0b70f92f9cb2ef61c3e0d16bab87c2fd5 SHA1 49abda9bc2cc202d5b5c84d3cb1c1caf7f7036e4 SHA256 051ae7d379a04d18afd5063e8d52ce79a16c721b1797ddf0a2b4616749190fd8
-MD5 b12e6b907528dd295e4ba464371b21c9 nvidia-kernel-1.0.7174-r3.ebuild 5289
-RMD160 f8d1b2e0b70f92f9cb2ef61c3e0d16bab87c2fd5 nvidia-kernel-1.0.7174-r3.ebuild 5289
-SHA256 051ae7d379a04d18afd5063e8d52ce79a16c721b1797ddf0a2b4616749190fd8 nvidia-kernel-1.0.7174-r3.ebuild 5289
-EBUILD nvidia-kernel-1.0.7667-r1.ebuild 5402 RMD160 dd957378c608777eac2db15e03b4f592fce886e1 SHA1 4b7a4a50510a1a5cd7fa928cb736cf2a870071c9 SHA256 c040da9e918c304dd39a3299d076f324a1b893b52f8afa15f151d8e75feb1d96
-MD5 3ab7f52d49d2922e9d9cc842a2be0ee4 nvidia-kernel-1.0.7667-r1.ebuild 5402
-RMD160 dd957378c608777eac2db15e03b4f592fce886e1 nvidia-kernel-1.0.7667-r1.ebuild 5402
-SHA256 c040da9e918c304dd39a3299d076f324a1b893b52f8afa15f151d8e75feb1d96 nvidia-kernel-1.0.7667-r1.ebuild 5402
-EBUILD nvidia-kernel-1.0.7667.ebuild 4244 RMD160 9c726acb3b31a4a973dab7abe1a912c82d117f91 SHA1 e51600768937d3db373278cc67f8fe04169b65a7 SHA256 6c9ff3bd9f1e56543aad1081a8b997c01fb281ee9422dcd5267ed127e8a07fb1
-MD5 ebc93800cf6f68b9de5d8355271ef54a nvidia-kernel-1.0.7667.ebuild 4244
-RMD160 9c726acb3b31a4a973dab7abe1a912c82d117f91 nvidia-kernel-1.0.7667.ebuild 4244
-SHA256 6c9ff3bd9f1e56543aad1081a8b997c01fb281ee9422dcd5267ed127e8a07fb1 nvidia-kernel-1.0.7667.ebuild 4244
-EBUILD nvidia-kernel-1.0.7676-r1.ebuild 4375 RMD160 d6fe01e04c86c768f87a6b0326860f18986111d9 SHA1 2c1ce5f147c611190d35b3a855cf381ec9bec348 SHA256 c5e3fee5bd1039306fba77d77838e52c5a3b68720c7bde9dd1842d94b3ae4a16
-MD5 01e38fcf18a98124cc9aac853efa0a66 nvidia-kernel-1.0.7676-r1.ebuild 4375
-RMD160 d6fe01e04c86c768f87a6b0326860f18986111d9 nvidia-kernel-1.0.7676-r1.ebuild 4375
-SHA256 c5e3fee5bd1039306fba77d77838e52c5a3b68720c7bde9dd1842d94b3ae4a16 nvidia-kernel-1.0.7676-r1.ebuild 4375
-EBUILD nvidia-kernel-1.0.7676-r2.ebuild 5530 RMD160 2f035ec48b24caf2dfde595dee5966544b8b4efa SHA1 b0c91abdfaa1776cd9740ac5036a6d0b5b959d58 SHA256 93b641b9bd50ad866274a8319a3dc85683037d21111b3dd7c1183a5b721411f0
-MD5 6ec90415d67916c3f7aa80f59dbc4d15 nvidia-kernel-1.0.7676-r2.ebuild 5530
-RMD160 2f035ec48b24caf2dfde595dee5966544b8b4efa nvidia-kernel-1.0.7676-r2.ebuild 5530
-SHA256 93b641b9bd50ad866274a8319a3dc85683037d21111b3dd7c1183a5b721411f0 nvidia-kernel-1.0.7676-r2.ebuild 5530
-EBUILD nvidia-kernel-1.0.8174-r1.ebuild 3444 RMD160 5dd068dab2168daec7325ea4fcf4171d0176cb06 SHA1 7e26f2fe7236b32b228de1415ec056ccf0423a6e SHA256 986a30c69023b2be7fa715b05c99572f609259a3cdb8515181ad4532f2ca2b09
-MD5 b6be3113db4b61207136cab301b206b5 nvidia-kernel-1.0.8174-r1.ebuild 3444
-RMD160 5dd068dab2168daec7325ea4fcf4171d0176cb06 nvidia-kernel-1.0.8174-r1.ebuild 3444
-SHA256 986a30c69023b2be7fa715b05c99572f609259a3cdb8515181ad4532f2ca2b09 nvidia-kernel-1.0.8174-r1.ebuild 3444
-EBUILD nvidia-kernel-1.0.8174-r2.ebuild 4599 RMD160 fe16062dfa4be3591eae31780f576fd0338637a6 SHA1 d797ff7c788df6434396343b51d1e380bea86d15 SHA256 1dc10f2ba066b8b0f8407e8947206509b8f827a74d2d3b0eceb25511b520e8da
-MD5 ed65e1cd81c936caede9902fd635d301 nvidia-kernel-1.0.8174-r2.ebuild 4599
-RMD160 fe16062dfa4be3591eae31780f576fd0338637a6 nvidia-kernel-1.0.8174-r2.ebuild 4599
-SHA256 1dc10f2ba066b8b0f8407e8947206509b8f827a74d2d3b0eceb25511b520e8da nvidia-kernel-1.0.8174-r2.ebuild 4599
-EBUILD nvidia-kernel-1.0.8178-r3.ebuild 3443 RMD160 ec9e3a8e2e847b782aa91aac2c43ae56a8eefe46 SHA1 edfb9655601e5e4a0e428418dd8a95891f4325dc SHA256 6a3c6f9723813f90063178592b49e40475e5473bc22fd5c0a3102f5fc7555646
-MD5 b12c62391db2b0b760f16be9da1a304a nvidia-kernel-1.0.8178-r3.ebuild 3443
-RMD160 ec9e3a8e2e847b782aa91aac2c43ae56a8eefe46 nvidia-kernel-1.0.8178-r3.ebuild 3443
-SHA256 6a3c6f9723813f90063178592b49e40475e5473bc22fd5c0a3102f5fc7555646 nvidia-kernel-1.0.8178-r3.ebuild 3443
-EBUILD nvidia-kernel-1.0.8178-r4.ebuild 4597 RMD160 9d0bc55a65ae1ba62f0bd30502743b9c18d6de28 SHA1 477ccbf0e39d51a8a204f8e7b60828b346af4060 SHA256 a305bedade619b9f901b36de51ed60a8f4e0b45ee48bb9f2f8954b133e0f1ed4
-MD5 3a62bdb8e607cfb605b904eedf4fc463 nvidia-kernel-1.0.8178-r4.ebuild 4597
-RMD160 9d0bc55a65ae1ba62f0bd30502743b9c18d6de28 nvidia-kernel-1.0.8178-r4.ebuild 4597
-SHA256 a305bedade619b9f901b36de51ed60a8f4e0b45ee48bb9f2f8954b133e0f1ed4 nvidia-kernel-1.0.8178-r4.ebuild 4597
-EBUILD nvidia-kernel-1.0.8756-r1.ebuild 4558 RMD160 9d546886d449404f14d3971ce755d3fe0fbb3da4 SHA1 72aa04d7dfffefcf8d2a0468225429204d91ce4a SHA256 328ef2234a5c03c76f1d8f166a6345dbade7a32351b053b02d65ba345e1286a4
-MD5 dd1e5d27dcca33066bb645644223d2cd nvidia-kernel-1.0.8756-r1.ebuild 4558
-RMD160 9d546886d449404f14d3971ce755d3fe0fbb3da4 nvidia-kernel-1.0.8756-r1.ebuild 4558
-SHA256 328ef2234a5c03c76f1d8f166a6345dbade7a32351b053b02d65ba345e1286a4 nvidia-kernel-1.0.8756-r1.ebuild 4558
-EBUILD nvidia-kernel-1.0.8756.ebuild 3400 RMD160 6025d3218d9dff05f14173422d07f231ce6e579f SHA1 0ea17afca880a6562d19e836c17a8be28673b1ee SHA256 153300d1350d8c51725d3f4861da9f0673d7778a557773d29fedae2b6c400cda
-MD5 2d39d569bfb801449908bc2ce76d4fe5 nvidia-kernel-1.0.8756.ebuild 3400
-RMD160 6025d3218d9dff05f14173422d07f231ce6e579f nvidia-kernel-1.0.8756.ebuild 3400
-SHA256 153300d1350d8c51725d3f4861da9f0673d7778a557773d29fedae2b6c400cda nvidia-kernel-1.0.8756.ebuild 3400
-EBUILD nvidia-kernel-1.0.8762-r1.ebuild 4901 RMD160 79734604e67df7600ba146c853eb31ac7174e331 SHA1 93f2b5f2394cd073587ee8ccc46032ad9b459a1c SHA256 f4feee3c09274c9785b1664c000b92c8c08650cfd9424560fc57a9466308f625
-MD5 a777897e56b28e32ca38d080b4f042ad nvidia-kernel-1.0.8762-r1.ebuild 4901
-RMD160 79734604e67df7600ba146c853eb31ac7174e331 nvidia-kernel-1.0.8762-r1.ebuild 4901
-SHA256 f4feee3c09274c9785b1664c000b92c8c08650cfd9424560fc57a9466308f625 nvidia-kernel-1.0.8762-r1.ebuild 4901
-EBUILD nvidia-kernel-1.0.8762.ebuild 3741 RMD160 f065217a269b9c5391f5ecf8028edc40e3f3f253 SHA1 8b34ece42dc5575e85297256203cde75870c2cf2 SHA256 e09877b4614e2b4726490ddc3a11780ccb6a3f19cd1bf2fc5100efcf3c5299f4
-MD5 fc88c6b39111c6d340cd4620917ede78 nvidia-kernel-1.0.8762.ebuild 3741
-RMD160 f065217a269b9c5391f5ecf8028edc40e3f3f253 nvidia-kernel-1.0.8762.ebuild 3741
-SHA256 e09877b4614e2b4726490ddc3a11780ccb6a3f19cd1bf2fc5100efcf3c5299f4 nvidia-kernel-1.0.8762.ebuild 3741
-MISC ChangeLog 36939 RMD160 940e432b04781627fc82bf6c45ac49da76722e66 SHA1 116aaae9bcaa0bffb91e8378ee0b8c79a70d6d99 SHA256 5c2e7154d0bf41deef856588c90a3a3bebd5fd586e70e4e722a1f5c568eed5f9
-MD5 5f48874660a469be94f0bf9cddce469a ChangeLog 36939
-RMD160 940e432b04781627fc82bf6c45ac49da76722e66 ChangeLog 36939
-SHA256 5c2e7154d0bf41deef856588c90a3a3bebd5fd586e70e4e722a1f5c568eed5f9 ChangeLog 36939
-MISC metadata.xml 313 RMD160 417b2ced4cba92a007cc92b38487c12c4694a5af SHA1 ed7dcac820db8b3a3bc1462d43dcc452cabe5d72 SHA256 e387e047c40c29e347e4a7052356d33d694c51e58b23376c9c520ff3b53743eb
-MD5 075fe48a4f1fc90d2c3814e7bcd1d1ab metadata.xml 313
-RMD160 417b2ced4cba92a007cc92b38487c12c4694a5af metadata.xml 313
-SHA256 e387e047c40c29e347e4a7052356d33d694c51e58b23376c9c520ff3b53743eb metadata.xml 313
-MD5 4104739392fdf9576f56ed6dba7e784f files/digest-nvidia-kernel-1.0.6111-r3 375
-RMD160 5c678f85bbba2c0f2d3823a9e5f874a8e722063b files/digest-nvidia-kernel-1.0.6111-r3 375
-SHA256 e5013c2200b257b680de25265ffc3dd9de3b254c13085fa91b54ee7bd2f2f03c files/digest-nvidia-kernel-1.0.6111-r3 375
-MD5 4104739392fdf9576f56ed6dba7e784f files/digest-nvidia-kernel-1.0.6111-r4 375
-RMD160 5c678f85bbba2c0f2d3823a9e5f874a8e722063b files/digest-nvidia-kernel-1.0.6111-r4 375
-SHA256 e5013c2200b257b680de25265ffc3dd9de3b254c13085fa91b54ee7bd2f2f03c files/digest-nvidia-kernel-1.0.6111-r4 375
-MD5 0c77af92d2e6f97949813fb8da7e4743 files/digest-nvidia-kernel-1.0.6629-r5 581
-RMD160 a180c936752eb61f0fa1935006150b4f34672a61 files/digest-nvidia-kernel-1.0.6629-r5 581
-SHA256 02da1b36b26383cf2aace326c83a6d2e6bfd1146a2946ad3dfef8355efaf745f files/digest-nvidia-kernel-1.0.6629-r5 581
-MD5 0c77af92d2e6f97949813fb8da7e4743 files/digest-nvidia-kernel-1.0.6629-r6 581
-RMD160 a180c936752eb61f0fa1935006150b4f34672a61 files/digest-nvidia-kernel-1.0.6629-r6 581
-SHA256 02da1b36b26383cf2aace326c83a6d2e6bfd1146a2946ad3dfef8355efaf745f files/digest-nvidia-kernel-1.0.6629-r6 581
-MD5 ab683059ad0c8111021800f8a624cbe3 files/digest-nvidia-kernel-1.0.7167-r1 375
-RMD160 40a02ba3cf31af7cb61ec534ac97d260c3354b2f files/digest-nvidia-kernel-1.0.7167-r1 375
-SHA256 bc5592b9c3ab85e61beee02444007bb892ef2bf7966006f606be67b22299036a files/digest-nvidia-kernel-1.0.7167-r1 375
-MD5 ab683059ad0c8111021800f8a624cbe3 files/digest-nvidia-kernel-1.0.7167-r2 375
-RMD160 40a02ba3cf31af7cb61ec534ac97d260c3354b2f files/digest-nvidia-kernel-1.0.7167-r2 375
-SHA256 bc5592b9c3ab85e61beee02444007bb892ef2bf7966006f606be67b22299036a files/digest-nvidia-kernel-1.0.7167-r2 375
-MD5 d4451389bab892873623cb6cb6f58225 files/digest-nvidia-kernel-1.0.7174-r2 581
-RMD160 e4c4c93c990c54c852ab6854b2fed52966e86245 files/digest-nvidia-kernel-1.0.7174-r2 581
-SHA256 ae391dae16e5b27216ad00f313d0a0441f41c6512bd743875ba6ecf400ae6df3 files/digest-nvidia-kernel-1.0.7174-r2 581
-MD5 d4451389bab892873623cb6cb6f58225 files/digest-nvidia-kernel-1.0.7174-r3 581
-RMD160 e4c4c93c990c54c852ab6854b2fed52966e86245 files/digest-nvidia-kernel-1.0.7174-r3 581
-SHA256 ae391dae16e5b27216ad00f313d0a0441f41c6512bd743875ba6ecf400ae6df3 files/digest-nvidia-kernel-1.0.7174-r3 581
-MD5 be7e9ecb669e214c221b7f161373cb3e files/digest-nvidia-kernel-1.0.7667 375
-RMD160 e77dd302bfb908758f5b33c84c8a831a8388e189 files/digest-nvidia-kernel-1.0.7667 375
-SHA256 8073a047656911a3470a00fe1e7fb507819d28d5fd1cd02762cc97c77d141a85 files/digest-nvidia-kernel-1.0.7667 375
-MD5 be7e9ecb669e214c221b7f161373cb3e files/digest-nvidia-kernel-1.0.7667-r1 375
-RMD160 e77dd302bfb908758f5b33c84c8a831a8388e189 files/digest-nvidia-kernel-1.0.7667-r1 375
-SHA256 8073a047656911a3470a00fe1e7fb507819d28d5fd1cd02762cc97c77d141a85 files/digest-nvidia-kernel-1.0.7667-r1 375
-MD5 0d781f06b6463d8eda3e6b257b196a0d files/digest-nvidia-kernel-1.0.7676-r1 375
-RMD160 e2b3ec994f7f070554c6bfcc4a1e44a9734cc19e files/digest-nvidia-kernel-1.0.7676-r1 375
-SHA256 9537ff37574260765a671e0c1c737c0e1649a5421634529a9c6c85c06241f09a files/digest-nvidia-kernel-1.0.7676-r1 375
-MD5 0d781f06b6463d8eda3e6b257b196a0d files/digest-nvidia-kernel-1.0.7676-r2 375
-RMD160 e2b3ec994f7f070554c6bfcc4a1e44a9734cc19e files/digest-nvidia-kernel-1.0.7676-r2 375
-SHA256 9537ff37574260765a671e0c1c737c0e1649a5421634529a9c6c85c06241f09a files/digest-nvidia-kernel-1.0.7676-r2 375
-MD5 1a1465bd0435ddf0f8379a41416141e0 files/digest-nvidia-kernel-1.0.8174-r1 584
-RMD160 75fa4c8c78683af7a2a0d0c59855cc115afa656c files/digest-nvidia-kernel-1.0.8174-r1 584
-SHA256 1c2099ddc5b6106a6b8d0902f4c04d3b225f067b524c05b33e92677b4d57ca2f files/digest-nvidia-kernel-1.0.8174-r1 584
-MD5 1a1465bd0435ddf0f8379a41416141e0 files/digest-nvidia-kernel-1.0.8174-r2 584
-RMD160 75fa4c8c78683af7a2a0d0c59855cc115afa656c files/digest-nvidia-kernel-1.0.8174-r2 584
-SHA256 1c2099ddc5b6106a6b8d0902f4c04d3b225f067b524c05b33e92677b4d57ca2f files/digest-nvidia-kernel-1.0.8174-r2 584
-MD5 29d2b457cfca3e777d8a5d08df28d999 files/digest-nvidia-kernel-1.0.8178-r3 584
-RMD160 ae48ce45e2827ec23edebdde27dc10268c6716cf files/digest-nvidia-kernel-1.0.8178-r3 584
-SHA256 08338dfb321934b6c23320587b85e43be3809347b20bdb485a768c7b051b8d5d files/digest-nvidia-kernel-1.0.8178-r3 584
-MD5 29d2b457cfca3e777d8a5d08df28d999 files/digest-nvidia-kernel-1.0.8178-r4 584
-RMD160 ae48ce45e2827ec23edebdde27dc10268c6716cf files/digest-nvidia-kernel-1.0.8178-r4 584
-SHA256 08338dfb321934b6c23320587b85e43be3809347b20bdb485a768c7b051b8d5d files/digest-nvidia-kernel-1.0.8178-r4 584
-MD5 05cf3fdba28c8340826a15e5c61c9fbe files/digest-nvidia-kernel-1.0.8756 584
-RMD160 0b03fed142033a300ae218a2f47b910a5b0abef0 files/digest-nvidia-kernel-1.0.8756 584
-SHA256 67c9715799691ee3782422f45c95692e97302d73b9b5d4e567387f95a3c838d7 files/digest-nvidia-kernel-1.0.8756 584
-MD5 05cf3fdba28c8340826a15e5c61c9fbe files/digest-nvidia-kernel-1.0.8756-r1 584
-RMD160 0b03fed142033a300ae218a2f47b910a5b0abef0 files/digest-nvidia-kernel-1.0.8756-r1 584
-SHA256 67c9715799691ee3782422f45c95692e97302d73b9b5d4e567387f95a3c838d7 files/digest-nvidia-kernel-1.0.8756-r1 584
-MD5 3543fcc5c64520e4b0d03373af32741a files/digest-nvidia-kernel-1.0.8762 584
-RMD160 5e028571116dcca973c29100875771982ead6293 files/digest-nvidia-kernel-1.0.8762 584
-SHA256 274f2c212e94f3103cf2b75512baab9e85c080bb6cc98736f290ff64479149e4 files/digest-nvidia-kernel-1.0.8762 584
-MD5 3543fcc5c64520e4b0d03373af32741a files/digest-nvidia-kernel-1.0.8762-r1 584
-RMD160 5e028571116dcca973c29100875771982ead6293 files/digest-nvidia-kernel-1.0.8762-r1 584
-SHA256 274f2c212e94f3103cf2b75512baab9e85c080bb6cc98736f290ff64479149e4 files/digest-nvidia-kernel-1.0.8762-r1 584
diff --git a/media-video/nvidia-kernel/files/1.0.6111/conftest_koutput_includes.patch b/media-video/nvidia-kernel/files/1.0.6111/conftest_koutput_includes.patch
deleted file mode 100644
index c1991cccccd5..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6111/conftest_koutput_includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- conftest.sh.old	2004-11-07 12:24:54.733276104 +1100
-+++ conftest.sh	2004-11-07 12:25:56.672859856 +1100
-@@ -17,7 +17,7 @@
- 
- if [ "$OUTPUT" != "$SOURCES" ]; then
-     CFLAGS="$CFLAGS -I$OUTPUT/include2 -I$OUTPUT/include \
---I$HEADERS -I$HEADERS/asm/mach-default"
-+-I$HEADERS -I$OUTPUT/include2/asm/mach-default"
- else
-     CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/asm/mach-default"
- fi
-@@ -257,8 +257,8 @@
-             echo "installed on your system. If you specified a separate";
-             echo "output directory using either the \"KBUILD_OUTPUT\" or";
-             echo "the \"O\" KBUILD parameter, make sure to specify this";
--            echo "directory with the SYSOUT environment variable or with";
--            echo "the appropriate nvidia-installer command line option.";
-+            echo "directorys _PARENT_ with the KBUILD_OUTPUT_PREFIX";
-+            echo "environment variable, (or see /etc/env.d/05kernel)";
-             echo "";
-             if [ "$VERBOSE" = "full_output" ]; then
-                 echo "*** Unable to determine the target kernel version. ***";
diff --git a/media-video/nvidia-kernel/files/1.0.6111/nv-pci_find_class.patch b/media-video/nvidia-kernel/files/1.0.6111/nv-pci_find_class.patch
deleted file mode 100644
index b76a1231b461..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6111/nv-pci_find_class.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- conftest.sh.old	2004-09-15 10:57:44.000000000 +1000
-+++ conftest.sh	2004-09-15 11:48:52.561314384 +1000
-@@ -23,6 +23,30 @@
- fi
- 
- case "$4" in
-+    check_pci_class)
-+        #
-+        # Determine if the current kernel uses pci_find_class or pci_get_class
-+        #
-+
-+        echo "#include <linux/pci.h>
-+        int do_test_pci_class(void) {
-+          struct pci_dev *get_dev;
-+          get_dev = pci_get_class(0,NULL);
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+          echo "get"
-+          rm -f conftest$$.o
-+          exit 0
-+        else
-+          echo "find"
-+          exit 0
-+        fi
-+    ;;
-+
-     remap_page_range)
-         #
-         # Determine the number of arguments expected by remap_page_range.
---- nv.c.old	2004-09-15 11:40:05.079503808 +1000
-+++ nv.c	2004-09-15 11:47:40.042338944 +1000
-@@ -639,7 +639,11 @@
-     u8     cap_ptr;
-     int    func, slot;
- 
-+#ifdef HAVE_PCI_GET_CLASS
-+    dev = pci_get_class(class << 8, NULL);
-+#else
-     dev = pci_find_class(class << 8, NULL);
-+#endif
-     do {
-         for (func = 0; func < 8; func++) {
-             slot = PCI_SLOT(dev->devfn);
-@@ -650,7 +654,11 @@
-             if (cap_ptr)
-                 return fn;
-         }
-+#ifdef HAVE_PCI_GET_CLASS
-+        dev = pci_get_class(class << 8, dev);
-+#else
-         dev = pci_find_class(class << 8, dev);
-+#endif
-     } while (dev);
- 
-     return NULL;
-@@ -3484,12 +3492,20 @@
-     struct pci_dev *dev = NULL;
-     int count = 0;
- 
-+#ifdef HAVE_PCI_GET_CLASS
-+    dev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
-+#else
-     dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
-+#endif
-     while (dev)
-     {
-         if ((dev->vendor == 0x10de) && (dev->device >= 0x20))
-             count++;
-+#ifdef HAVE_PCI_GET_CLASS
-+        dev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
-+#else
-         dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, dev);
-+#endif
-     }
-     return count;
- }
---- Makefile.kbuild.old	2004-09-15 10:57:52.000000000 +1000
-+++ Makefile.kbuild	2004-09-15 11:39:30.153813320 +1000
-@@ -185,6 +185,12 @@
-   endif
- endif
- 
-+ifeq ($(shell $(CONFTEST) check_pci_class), get)
-+  EXTRA_CFLAGS += -DHAVE_PCI_GET_CLASS
-+else
-+  EXTRA_CFLAGS += -DHAVE_PCI_FIND_CLASS
-+endif
-+
- #
- # Miscellaneous NVIDIA kernel module build support targets. They are needed
- # to satisfy KBUILD requirements and to support NVIDIA specifics.
---- Makefile.nvidia.old	2004-09-15 11:44:30.980080776 +1000
-+++ Makefile.nvidia	2004-09-15 11:45:37.209012448 +1000
-@@ -73,6 +73,12 @@
-   DEFINES += -DNV_CHANGE_PAGE_ATTR_PRESENT
- endif
- 
-+ifeq ($(shell $(CONFTEST) check_pci_class), get)
-+  DEFINES += -DHAVE_PCI_GET_CLASS
-+else
-+  DEFINES += -DHAVE_PCI_FIND_CLASS
-+endif
-+
- DEFINES+=$(EXTRA_DEFINES)
- 
- # allow build parameters to be passed in through the environment
diff --git a/media-video/nvidia-kernel/files/1.0.6111/nv-remap-range.patch b/media-video/nvidia-kernel/files/1.0.6111/nv-remap-range.patch
deleted file mode 100644
index 243cd8eb9cab..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6111/nv-remap-range.patch
+++ /dev/null
@@ -1,161 +0,0 @@
---- Makefile.kbuild.orig	2004-10-04 19:57:29.364110664 +1000
-+++ Makefile.kbuild	2004-10-04 20:01:23.803470464 +1000
-@@ -133,7 +133,7 @@
- endif
- 
- #
--# NVIDIA specific CFLAGS and #define's. The remap_page_range check has become
-+# NVIDIA specific CFLAGS and #define's. The remap_range check has become
- # necessary with the introduction of the five argument version to Linux 2.4
- # distribution kernels; this conflicting change cannot be detected at compile
- # time.
-@@ -160,13 +160,15 @@
- endif
- 
--ifeq ($(PATCHLEVEL), 4)
--  REMAP_PAGE_RANGE := $(shell $(CONFTEST) remap_page_range)
-+  REMAP_RANGE := $(shell $(CONFTEST) remap_range)
- 
--  ifeq ($(REMAP_PAGE_RANGE), 5)
-+  ifeq ($(REMAP_RANGE), PFN)
-+    EXTRA_CFLAGS += -DREMAP_PFN_RANGE
-+  endif
-+  
-+  ifeq ($(REMAP_RANGE), 5)
-     EXTRA_CFLAGS += -DREMAP_PAGE_RANGE_5
-   endif
- 
--  ifeq ($(REMAP_PAGE_RANGE), 4)
-+  ifeq ($(REMAP_RANGE), 4)
-     EXTRA_CFLAGS += -DREMAP_PAGE_RANGE_4
-   endif
--endif
---- Makefile.nvidia.orig	2004-10-04 19:57:36.572014896 +1000
-+++ Makefile.nvidia	2004-10-04 20:01:13.459043056 +1000
-@@ -60,12 +60,15 @@
- INSTALL=$(shell which install)
- INCLUDES += -I$(KERNEL_HEADERS)
- 
--REMAP_PAGE_RANGE := $(shell $(CONFTEST) remap_page_range)
-+REMAP_RANGE := $(shell $(CONFTEST) remap_range)
- 
--ifeq ($(REMAP_PAGE_RANGE), 5)
-+ifeq ($(REMAP_RANGE), PFN)
-+  DEFINES += -DREMAP_PFN_RANGE
-+endif
-+ifeq ($(REMAP_RANGE), 5)
-   DEFINES += -DREMAP_PAGE_RANGE_5
- endif
--ifeq ($(REMAP_PAGE_RANGE), 4)
-+ifeq ($(REMAP_RANGE), 4)
-   DEFINES += -DREMAP_PAGE_RANGE_4
- endif
- 
---- conftest.sh.orig	2004-10-04 19:38:34.819587648 +1000
-+++ conftest.sh	2004-10-04 19:56:28.547356216 +1000
-@@ -47,11 +47,27 @@
-         fi
-     ;;
- 
--    remap_page_range)
-+    remap_range)
-         #
-         # Determine the number of arguments expected by remap_page_range.
-+        # Extended to determine if should use remap_pfn_range() aswell
-         #
- 
-+	echo "#include <linux/mm.h>
-+        int do_test_remap_page_range(void) {
-+          pgprot_t pgprot;
-+          remap_pfn_range(NULL, 0L, 0L, 0L, pgprot);
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+          echo "PFN"
-+          rm -f conftest$$.o;
-+          exit 0
-+        fi
-+
-         echo "#include <linux/mm.h>
-         int do_test_remap_page_range(void) {
-            pgprot_t pgprot;
---- nv-linux.h.orig	2004-10-04 19:25:54.819125280 +1000
-+++ nv-linux.h	2004-10-04 19:38:26.043921752 +1000
-@@ -567,13 +567,15 @@
-  * relevant releases to date use it. This version was backported to 2.4 
-  * without means to identify the change, hence this hack.
-  */
--#if defined(KERNEL_2_6) || defined(REMAP_PAGE_RANGE_5)
--#define NV_REMAP_PAGE_RANGE(x...)    remap_page_range(vma, x)
-+#if defined(REMAP_PFN_RANGE)
-+#define NV_REMAP_RANGE(from, offset, x...)    remap_pfn_range(vma, from, ((offset)) >> PAGE_SHIFT, x)
-+#elif defined(KERNEL_2_6) || defined(REMAP_PAGE_RANGE_5)
-+#define NV_REMAP_RANGE(x...)                  remap_page_range(vma, x)
- #elif defined(REMAP_PAGE_RANGE_4)
--#define NV_REMAP_PAGE_RANGE(x...)    remap_page_range(x)
-+#define NV_REMAP_RANGE(x...)                  remap_page_range(x)
- #else
- #warning "conftest.sh failed, assuming old Linux 2.4 remap_page_range(4)!"
--#define NV_REMAP_PAGE_RANGE(x...)    remap_page_range(x)
-+#define NV_REMAP_RANGE(x...)                  remap_page_range(x)
- #endif
- 
- #if defined(pmd_offset_map)
---- nv.c.orig	2004-10-04 19:25:49.387950944 +1000
-+++ nv.c	2004-10-04 19:31:56.270176368 +1000
-@@ -1775,7 +1775,7 @@
-             pages = nv->regs->size / PAGE_SIZE;
- 
-         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
--        if (NV_REMAP_PAGE_RANGE(vma->vm_start,
-+        if (NV_REMAP_RANGE(vma->vm_start,
-                              NV_VMA_OFFSET(vma),
-                              vma->vm_end - vma->vm_start,
-                              vma->vm_page_prot))
-@@ -1794,7 +1794,7 @@
-             pages = nv->fb->size / PAGE_SIZE;
- 
-         vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
--        if (NV_REMAP_PAGE_RANGE(vma->vm_start,
-+        if (NV_REMAP_RANGE(vma->vm_start,
-                              NV_VMA_OFFSET(vma),
-                              vma->vm_end - vma->vm_start,
-                              vma->vm_page_prot))
-@@ -1912,7 +1912,7 @@
-         while (pages--)
-         {
-             page = (unsigned long) at->page_table[i++].phys_addr;
--            if (NV_REMAP_PAGE_RANGE(start, page, PAGE_SIZE, vma->vm_page_prot))
-+            if (NV_REMAP_RANGE(start, page, PAGE_SIZE, vma->vm_page_prot))
-                 return -EAGAIN;
-             start += PAGE_SIZE;
-             pos += PAGE_SIZE;
---- os-agp.c.orig	2004-10-04 19:26:06.363370288 +1000
-+++ os-agp.c	2004-10-04 19:32:06.228662448 +1000
-@@ -331,10 +331,10 @@
-     agp_addr = agpinfo.aper_base + (agp_data->offset << PAGE_SHIFT);
- 
- #if defined(NVCPU_IA64)
--    err = NV_REMAP_PAGE_RANGE(vma->vm_start, (size_t) agp_addr, 
-+    err = NV_REMAP_RANGE(vma->vm_start, (size_t) agp_addr, 
-                        agp_data->num_pages << PAGE_SHIFT, vma->vm_page_prot);
- #else
--    err = NV_REMAP_PAGE_RANGE(vma->vm_start, (size_t) agp_addr, 
-+    err = NV_REMAP_RANGE(vma->vm_start, (size_t) agp_addr, 
-                        agp_data->num_pages << PAGE_SHIFT, PAGE_SHARED);
- #endif
-         
---- os-interface.c.orig	2004-10-04 19:26:14.267168728 +1000
-+++ os-interface.c	2004-10-04 19:32:12.958639336 +1000
-@@ -1087,7 +1087,7 @@
- 
-     vma = (struct vm_area_struct *) *priv;
- 
--    if (NV_REMAP_PAGE_RANGE(vma->vm_start,
-+    if (NV_REMAP_RANGE(vma->vm_start,
-                 start & PAGE_MASK, size_bytes, PAGE_SHARED))
-         return NULL;
- 
diff --git a/media-video/nvidia-kernel/files/1.0.6111/nv_enable_pci.patch b/media-video/nvidia-kernel/files/1.0.6111/nv_enable_pci.patch
deleted file mode 100644
index 5433fdbb2145..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6111/nv_enable_pci.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- nv/nv.c	2004-08-23 13:58:15.000000000 -0500
-+++ nv.new/nv.c	2004-08-23 13:58:35.000000000 -0500
-@@ -1225,6 +1225,7 @@
-         {
-             nv_state_t *nv = NV_STATE_PTR(&nv_linux_devices[i]);
-             release_mem_region(nv->bar.regs.address, nv->bar.regs.size);
-+            pci_disable_device(nv_linux_devices[i].dev);
-         }
-     }
- 
-@@ -3516,6 +3517,28 @@
-         return -1;
-     }
- 
-+    // enable io, mem, and bus-mastering in pci config space
-+    if (pci_enable_device(dev) != 0)
-+    {
-+        nv_printf(NV_DBG_ERRORS,
-+            "NVRM: pci_enable_device failed, aborting\n");
-+        return -1;
-+    }
-+
-+    // request ownership of our bars
-+    // keeps other drivers from banging our registers.
-+    // only do this for registers, as vesafb requests our framebuffer and will
-+    // keep us from working properly
-+    if (!request_mem_region(dev->resource[0].start,
-+                            dev->resource[0].end - dev->resource[0].start + 1,
-+                            "nvidia"))
-+    {
-+        nv_printf(NV_DBG_ERRORS,
-+            "NVRM: pci_request_regions failed, aborting\n");
-+        goto err_disable_dev;
-+    }
-+    pci_set_master(dev);
-+
-     /* initialize bus-dependent config state */
-     nvl = &nv_linux_devices[num_nv_devices];
-     nv  = NV_STATE_PTR(nvl);
-@@ -3545,7 +3568,7 @@
-         nv_printf(NV_DBG_ERRORS, "NVRM: Please check your BIOS settings.         \n");
-         nv_printf(NV_DBG_ERRORS, "NVRM: [Plug & Play OS   ] should be set to NO  \n");
-         nv_printf(NV_DBG_ERRORS, "NVRM: [Assign IRQ to VGA] should be set to YES \n");
--        return -1;
-+        goto err_zero_dev;
-     }
- 
-     /* sanity check the IO apertures */
-@@ -3569,39 +3592,9 @@
-                 nv->bar.fb.address, nv->bar.fb.size);
-         }
- 
--        /* Clear out the data */
--        os_mem_set(nvl, 0, sizeof(nv_linux_state_t));
--
--        return -1;
--    }
--
--    // request ownership of our bars
--    // keeps other drivers from banging our registers.
--    // only do this for registers, as vesafb requests our framebuffer and will
--    // keep us from working properly
--    if (!request_mem_region(nv->bar.regs.address, nv->bar.regs.size, "nvidia"))
--    {
--        nv_printf(NV_DBG_ERRORS,
--            "NVRM: pci_request_regions failed, aborting\n");
--
--        /* Clear out the data */
--        os_mem_set(nvl, 0, sizeof(nv_linux_state_t));
--
--        return -1;
-+        goto err_zero_dev;
-     }
- 
--    // enable io, mem, and bus-mastering in pci config space
--    if (pci_enable_device(dev) != 0)
--    {
--        nv_printf(NV_DBG_ERRORS,
--            "NVRM: pci_enable_device failed, aborting\n");
--
--        pci_release_regions(dev);
--        os_mem_set(nvl, 0, sizeof(nv_linux_state_t));
--
--        return -1;
--    }
--    pci_set_master(nvl->dev);
- 
- #if defined(NV_BUILD_NV_PAT_SUPPORT)
-     if (nvos_find_pci_express_capability(nvl->dev))
-@@ -3618,13 +3611,7 @@
-     if (nv->bar.regs.map == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: failed to map registers!!\n");
--
--        pci_release_regions(dev);
--
--        /* Clear out the data */
--        os_mem_set(nvl, 0, sizeof(nv_linux_state_t));
--
--        return -1;
-+        goto err_zero_dev;
-     }
-     nv->flags |= NV_FLAG_MAP_REGS_EARLY;
- #endif
-@@ -3641,6 +3628,15 @@
-     num_nv_devices++;
- 
-     return 0;
-+
-+err_zero_dev:
-+    os_mem_set(nvl, 0, sizeof(nv_linux_state_t));
-+    release_mem_region(dev->resource[0].start,
-+                       dev->resource[0].end - dev->resource[0].start + 1);
-+
-+err_disable_dev:
-+    pci_disable_device(dev);
-+    return -1;
- }
- 
- int NV_API_CALL nv_no_incoherent_mappings
diff --git a/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch b/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch
deleted file mode 100644
index ffdfaf0aae3f..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6111/power-suspend-2.6.9-changes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- usr/src/nv/nv.c.orig	2004-08-28 02:48:36.393223808 +1000
-+++ usr/src/nv/nv.c	2004-08-28 02:50:36.354986848 +1000
-@@ -3692,9 +3692,16 @@
-         return -1;
-     }
- 
-+    // Fix up problems with PM_SAVE_STATE being removed from 2.6.9
-+    #ifdef PM_SAVE_STATE
-+      #define PM_TMP PM_SAVE_STATE
-+    #else
-+      #define PM_TMP PM_SUSPEND
-+    #endif
-+    
-     switch (state)
-     {
--        case PM_SAVE_STATE:
-+        case PM_TMP:
-             nv_printf(NV_DBG_INFO, "NVRM: ACPI: received standby event\n");
-             status = rm_power_management(nv, 0, NV_PM_ACPI_STANDBY);
-             break;
---- usr/src/nv/nv.c.orig	2004-10-14 13:48:52.673241000 -0400
-+++ usr/src/nv/nv.c	2004-10-14 14:00:05.168006416 -0400
-@@ -3745,7 +3745,7 @@
-     u32 state
- )
- {
--    return nv_acpi_event(dev, state);
-+    return nv_acpi_event(dev, PM_TMP);
- }
- 
- int
-
diff --git a/media-video/nvidia-kernel/files/1.0.6111/vmalloc-reserve.patch b/media-video/nvidia-kernel/files/1.0.6111/vmalloc-reserve.patch
deleted file mode 100644
index fc7bfcb1d2b5..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6111/vmalloc-reserve.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNp --exclude='*.orig' --exclude='*.rej' --exclude='*.dmn' -r NVIDIA-Linux-x86-1.0-6111-pkg1/usr/src/nv/nv.c NVIDIA-Linux-x86-1.0-6111-pkg1-new/usr/src/nv/nv.c
---- NVIDIA-Linux-x86-1.0-6111-pkg1/usr/src/nv/nv.c	2004-08-31 22:52:17.000000000 +0100
-+++ NVIDIA-Linux-x86-1.0-6111-pkg1-new/usr/src/nv/nv.c	2004-09-20 02:49:42.399538232 +0100
-@@ -19,6 +19,10 @@
- MODULE_ALIAS_CHARDEV_MAJOR(NV_MAJOR_DEVICE_NUMBER);
- #endif
- 
-+#ifndef __VMALLOC_RESERVE
-+unsigned int __VMALLOC_RESERVE;
-+#endif
-+
- /*
-  * our global state; one per device
-  */
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch
deleted file mode 100644
index ee5707156598..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1155389.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1155389/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1155389/nv-linux.h	2004-11-04 11:47:05.000000000 +0100
-@@ -729,12 +729,21 @@
-         return order;
-     }
- 
-+/* mark memory UC-, rather than UC (don't use _PAGE_PWT) */
-+static inline pgprot_t pgprot_noncached_weak(pgprot_t old_prot)
-+    {
-+        pgprot_t new_prot = old_prot;
-+        if (boot_cpu_data.x86 > 3)
-+            new_prot = __pgprot(pgprot_val(old_prot) | _PAGE_PCD);
-+        return new_prot;
-+    }
-+
- #if !defined (pgprot_noncached)
- static inline pgprot_t pgprot_noncached(pgprot_t old_prot)
-     {
-         pgprot_t new_prot = old_prot;
-         if (boot_cpu_data.x86 > 3)
--            new_prot = __pgprot(pgprot_val(old_prot) | _PAGE_PCD);
-+            new_prot = __pgprot(pgprot_val(old_prot) | _PAGE_PCD | _PAGE_PWT);
-         return new_prot;
-     }
- #endif
-diff -ru usr/src/nv/nv.c usr/src/nv.1155389/nv.c
---- usr/src/nv/nv.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1155389/nv.c	2004-11-04 11:47:05.000000000 +0100
-@@ -1551,7 +1551,7 @@
-     /* NV fb space */
-     else if (IS_FB_OFFSET(nv, NV_VMA_OFFSET(vma), vma->vm_end - vma->vm_start))
-     {
--        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-+        vma->vm_page_prot = pgprot_noncached_weak(vma->vm_page_prot);
-         if (NV_REMAP_PAGE_RANGE(vma->vm_start,
-                              NV_VMA_OFFSET(vma),
-                              vma->vm_end - vma->vm_start,
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch
deleted file mode 100644
index 21c68a98aeb0..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1161283.patch
+++ /dev/null
@@ -1,548 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1161283/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1161283/nv-linux.h	2004-11-16 22:56:41.000000000 +0100
-@@ -429,6 +429,30 @@
-         free_pages(ptr, order); \
-     }
- 
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+    {                                                           \
-+        kmem_cache = kmem_cache_create(name, sizeof(type),      \
-+                        0, 0, NULL, NULL);                      \
-+    } 
-+
-+#define NV_KMEM_CACHE_DESTROY(kmem_cache)                       \
-+    {                                                           \
-+        kmem_cache_destroy(kmem_cache);                         \
-+        kmem_cache = NULL;                                      \
-+    } 
-+
-+#define NV_KMEM_CACHE_ALLOC(ptr, kmem_cache, type)              \
-+    {                                                           \
-+        (ptr) = kmem_cache_alloc(kmem_cache, GFP_KERNEL);       \
-+        KM_ALLOC_RECORD(ptr, sizeof(type), "km_cache_alloc");   \
-+    } 
-+
-+#define NV_KMEM_CACHE_FREE(ptr, type, kmem_cache)               \
-+    {                                                           \
-+        KM_FREE_RECORD(ptr, sizeof(type), "km_cache_free");     \
-+        kmem_cache_free(kmem_cache, ptr);                       \
-+    } 
-+
- #endif /* !defined NVWATCH */
- 
- 
-@@ -776,6 +800,9 @@
-     unsigned long   phys_addr;
-     unsigned long   virt_addr;
-     dma_addr_t      dma_addr;
-+#ifdef NV_SG_MAP_BUFFERS
-+    struct scatterlist sg_list;
-+#endif
- #ifdef CONFIG_SWIOTLB
-     unsigned long   orig_phys_addr;
-     unsigned long   orig_virt_addr;
-@@ -789,15 +816,11 @@
-     unsigned int   num_pages;
-     unsigned int   order;
-     unsigned int   size;
--    nv_pte_t      *page_table;          /* list of physical pages allocated */
-+    nv_pte_t     **page_table;          /* list of physical pages allocated */
-     void          *key_mapping;         /* mapping used as a key for finding this nv_alloc_t */
-                                         /*   may be the same as page_table                   */
-     unsigned int   class;
-     void          *priv_data;
--#if defined(NV_SG_MAP_BUFFERS)
--    struct pci_dev *dev;
--    struct scatterlist *sg_list;        /* list of physical pages allocated */
--#endif
- } nv_alloc_t;
- 
- 
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.1161283/nv-vm.c
---- usr/src/nv/nv-vm.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1161283/nv-vm.c	2004-11-16 22:56:41.000000000 +0100
-@@ -138,13 +138,18 @@
-  */
- 
- int nv_vm_malloc_pages(
--    nv_alloc_t       *at
-+    nv_state_t *nv,
-+    nv_alloc_t *at
- )
- {
-     /* point page_ptr at the start of the actual page list */
--    nv_pte_t *page_ptr = at->page_table;
-+    nv_pte_t *page_ptr = *at->page_table;
-     int i;
-     unsigned long virt_addr = 0, phys_addr;
-+#if defined(NV_SG_MAP_BUFFERS)
-+    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    struct pci_dev *dev = nvl->dev;
-+#endif
- 
-     nv_printf(NV_DBG_MEMINFO, "NVRM: VM: nv_vm_malloc_pages: %d pages\n",
-         at->num_pages);
-@@ -175,7 +180,7 @@
-         // for amd 64-bit platforms, remap pages to make them 32-bit addressable
-         // in this case, we need the final remapping to be contiguous, so we
-         // have to do the whole mapping at once, instead of page by page
--        if (nv_sg_map_buffer(at->dev, &at->sg_list[0],
-+        if (nv_sg_map_buffer(dev, &at->page_table[0]->sg_list,
-                              (void *) virt_addr, at->num_pages))
-         {
-             nv_printf(NV_DBG_ERRORS,
-@@ -224,7 +229,7 @@
-         /* lock the page for dma purposes */
-         SetPageReserved(NV_GET_PAGE_STRUCT(phys_addr));
- 
--        page_ptr = &at->page_table[i];
-+        page_ptr = at->page_table[i];
-         page_ptr->phys_addr = phys_addr;
-         page_ptr->virt_addr = virt_addr;
-         page_ptr->dma_addr = page_ptr->phys_addr;
-@@ -235,7 +240,7 @@
- #if defined(NV_SG_MAP_BUFFERS)
-         if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
-         {
--            if (nv_sg_map_buffer(at->dev, &at->sg_list[i], 
-+            if (nv_sg_map_buffer(dev, &at->page_table[i]->sg_list, 
-                                  __va(page_ptr->phys_addr), 1))
-             {
-                 nv_printf(NV_DBG_ERRORS,
-@@ -243,7 +248,7 @@
-                 goto failed;
-             }
-         }
--        nv_sg_load(&at->sg_list[i], page_ptr);
-+        nv_sg_load(&at->page_table[i]->sg_list, page_ptr);
- #endif
-         virt_addr += PAGE_SIZE;
-     }
-@@ -258,7 +263,7 @@
- 
-     for (; i >= 0; i--)
-     {
--        page_ptr = &at->page_table[i];
-+        page_ptr = at->page_table[i];
- 
-         // if we failed when allocating this page, skip over it
-         // but if we failed pci_map_sg, make sure to free this page
-@@ -267,7 +272,7 @@
-             NV_UNLOCK_PAGE(page_ptr);
- #if defined(NV_SG_MAP_BUFFERS)
-             if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
--                nv_sg_unmap_buffer(at->dev, &at->sg_list[i], page_ptr);
-+                nv_sg_unmap_buffer(dev, &at->page_table[i]->sg_list, page_ptr);
- #endif
-             if (!NV_ALLOC_MAPPING_CACHED(at->flags))
-                 NV_SET_PAGE_ATTRIB_CACHED(page_ptr);
-@@ -279,15 +284,15 @@
- 
-     if (NV_ALLOC_MAPPING_CONTIG(at->flags))
-     {
--        page_ptr = at->page_table;
-+        page_ptr = *at->page_table;
- #if defined(NV_SG_MAP_BUFFERS)
--        nv_sg_unmap_buffer(at->dev, &at->sg_list[0], page_ptr);
-+        nv_sg_unmap_buffer(dev, &at->page_table[0]->sg_list, page_ptr);
- #endif
-         NV_FREE_PAGES(page_ptr->virt_addr, at->order);
-     }
-     else if (NV_ALLOC_MAPPING_VMALLOC(at->flags))
-     {
--        page_ptr = at->page_table;
-+        page_ptr = *at->page_table;
-         NV_VFREE((void *) page_ptr->virt_addr, at->size);
-     }
- 
-@@ -296,7 +301,7 @@
- 
- // unlock the pages we've locked down for dma purposes
- void nv_vm_unlock_pages(
--    nv_alloc_t       *at
-+    nv_alloc_t *at
- )
- {
-     nv_pte_t *page_ptr;
-@@ -315,17 +320,22 @@
- 
-     for (i = 0; i < at->num_pages; i++)
-     {
--        page_ptr = &at->page_table[i];
-+        page_ptr = at->page_table[i];
-         NV_UNLOCK_PAGE(page_ptr);
-     }
- }
- 
- void nv_vm_free_pages(
--    nv_alloc_t       *at
-+    nv_state_t *nv,
-+    nv_alloc_t *at
- )
- {
-     nv_pte_t *page_ptr;
-     int i;
-+#if defined(NV_SG_MAP_BUFFERS)
-+    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    struct pci_dev *dev = nvl->dev;
-+#endif
- 
-     nv_printf(NV_DBG_MEMINFO, "NVRM: VM: nv_vm_free_pages: %d pages\n",
-         at->num_pages);
-@@ -339,10 +349,10 @@
- 
-     for (i = 0; i < at->num_pages; i++)
-     {
--        page_ptr = &at->page_table[i];
-+        page_ptr = at->page_table[i];
- #if defined(NV_SG_MAP_BUFFERS)
-         if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
--            nv_sg_unmap_buffer(at->dev, &at->sg_list[i], page_ptr);
-+            nv_sg_unmap_buffer(dev, &at->page_table[i]->sg_list, page_ptr);
- #endif
-         if (!NV_ALLOC_MAPPING_CACHED(at->flags))
-             NV_SET_PAGE_ATTRIB_CACHED(page_ptr);
-@@ -353,15 +363,15 @@
- 
-     if (NV_ALLOC_MAPPING_CONTIG(at->flags))
-     {
--        page_ptr = at->page_table;
-+        page_ptr = *at->page_table;
- #if defined(NV_SG_MAP_BUFFERS)
--        nv_sg_unmap_buffer(at->dev, &at->sg_list[0], page_ptr);
-+        nv_sg_unmap_buffer(dev, &at->page_table[0]->sg_list, page_ptr);
- #endif
-         NV_FREE_PAGES(page_ptr->virt_addr, at->order);
-     }
-     else if (NV_ALLOC_MAPPING_VMALLOC(at->flags))
-     {
--        page_ptr = at->page_table;
-+        page_ptr = *at->page_table;
-         NV_VFREE((void *) page_ptr->virt_addr, at->size);
-     }
- }
-diff -ru usr/src/nv/nv-vm.h usr/src/nv.1161283/nv-vm.h
---- usr/src/nv/nv-vm.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1161283/nv-vm.h	2004-11-16 22:56:41.000000000 +0100
-@@ -11,9 +11,9 @@
- #ifndef _NV_VM_H_
- #define _NV_VM_H_
- 
--int      nv_vm_malloc_pages(nv_alloc_t *);
-+int      nv_vm_malloc_pages(nv_state_t *, nv_alloc_t *);
- void     nv_vm_unlock_pages(nv_alloc_t *);
--void     nv_vm_free_pages(nv_alloc_t *);
-+void     nv_vm_free_pages(nv_state_t *, nv_alloc_t *);
- 
- #if defined(NV_DBG_MEM)
- void     nv_vm_list_page_count(nv_pte_t *, unsigned long);
-@@ -21,11 +21,12 @@
- #define  nv_vm_list_page_count(page_ptr, num_pages)
- #endif
- 
--#define nv_vm_unlock_and_free_pages(at_count, at) \
--    if (at->page_table) {                         \
--        if (at_count == 0)                        \
--            nv_vm_unlock_pages(at);               \
--        nv_vm_free_pages(at);                     \
-+#define NV_VM_UNLOCK_AND_FREE_PAGES(nv, at_count, at)   \
-+    if (at->page_table)                                 \
-+    {                                                   \
-+        if (at_count == 0)                              \
-+            nv_vm_unlock_pages(at);                     \
-+        nv_vm_free_pages(nv, at);                       \
-     }
- 
- #endif
-diff -ru usr/src/nv/nv.c usr/src/nv.1161283/nv.c
---- usr/src/nv/nv.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1161283/nv.c	2004-11-16 22:57:24.000000000 +0100
-@@ -63,6 +63,8 @@
- int nv_swiotlb = 0;
- #endif
- 
-+static kmem_cache_t *nv_pte_t_cache = NULL;
-+
- // allow an easy way to convert all debug printfs related to events
- // back and forth between 'info' and 'errors'
- #if defined(NV_DBG_EVENTS)
-@@ -266,42 +268,41 @@
- )
- {
-     nv_alloc_t *at;
--    int pt_size;
-+    unsigned int pt_size, i;
- 
-     NV_KMALLOC(at, sizeof(nv_alloc_t));
-     if (at == NULL)
-     {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to allocate alloc_t\n");
-+        nv_printf(NV_DBG_ERRORS, "NVRM: failed to allocate alloc info\n");
-         return NULL;
-     }
- 
-     memset(at, 0, sizeof(nv_alloc_t));
- 
--    pt_size = num_pages *  sizeof(nv_pte_t);
--    NV_KMALLOC(at->page_table, pt_size);
--    if (at->page_table == NULL)
-+    pt_size = num_pages *  sizeof(nv_pte_t *);
-+    if (os_alloc_mem((void **)&at->page_table, pt_size) != RM_OK)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: failed to allocate page table\n");
-         NV_KFREE(at, sizeof(nv_alloc_t));
-         return NULL;
-     }
-+
-     memset(at->page_table, 0, pt_size);
-     at->num_pages = num_pages;
-     NV_ATOMIC_SET(at->usage_count, 0);
- 
--#if defined(NV_SG_MAP_BUFFERS)
--    at->dev = dev;
--    pt_size = num_pages * sizeof(struct scatterlist);
--    NV_KMALLOC(at->sg_list, pt_size);
--    if (at->sg_list == NULL)
-+    for (i = 0; i < at->num_pages; i++)
-     {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to allocate scatter gather list\n");
--        NV_KFREE(at->page_table, pt_size);
--        NV_KFREE(at, sizeof(nv_alloc_t));
--        return NULL;
-+        NV_KMEM_CACHE_ALLOC(at->page_table[i], nv_pte_t_cache, nv_pte_t);
-+        if (at->page_table[i] == NULL)
-+        {
-+            nv_printf(NV_DBG_ERRORS,
-+                      "NVRM: failed to allocate page table entry\n");
-+            nvos_free_alloc(at);
-+            return NULL;
-+        }
-+        memset(at->page_table[i], 0, sizeof(nv_pte_t));
-     }
--    memset(at->sg_list, 0, pt_size);
--#endif
- 
-     return at;
- }
-@@ -311,6 +312,8 @@
-     nv_alloc_t *at
- )
- {
-+    unsigned int pt_size, i;
-+
-     if (at == NULL)
-         return -1;
- 
-@@ -320,13 +323,16 @@
-     // we keep the page_table around after freeing the pages
-     // for bookkeeping reasons. Free the page_table and assume
-     // the underlying pages are already unlocked and freed.
--    if (at->page_table)
--        NV_KFREE(at->page_table, at->num_pages * sizeof(nv_pte_t));
--
--#if defined(NV_SG_MAP_BUFFERS)
--    if (at->sg_list)
--        NV_KFREE(at->sg_list, at->num_pages * sizeof(struct scatterlist));
--#endif
-+    if (at->page_table != NULL)
-+    {
-+        for (i = 0; i < at->num_pages; i++)
-+        {
-+            if (at->page_table[i] != NULL)
-+                NV_KMEM_CACHE_FREE(at->page_table[i], nv_pte_t, nv_pte_t_cache);
-+        }
-+        pt_size = at->num_pages * sizeof(nv_pte_t *);
-+        os_free_mem(at->page_table);
-+    }
- 
-     NV_KFREE(at, sizeof(nv_alloc_t));
- 
-@@ -594,7 +600,7 @@
-             int i;
-             for (i = 0; i < at->num_pages; i++)
-             {
--                unsigned long offset = at->page_table[i].phys_addr;
-+                unsigned long offset = at->page_table[i]->phys_addr;
-                 if ((address >= offset) &&
-                     (address < (offset + PAGE_SIZE)))
-                     return at;
-@@ -931,6 +937,13 @@
-     }
- #endif
- 
-+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t);
-+    if (nv_pte_t_cache == NULL)
-+    {
-+        nv_printf(NV_DBG_ERRORS, "NVRM: pte cache allocation failed\n");
-+        goto failed;
-+    }
-+ 
-     // Init the resource manager
-     if (!rm_init_rm())
-     {
-@@ -972,6 +985,14 @@
-     return 0;
- 
- failed:
-+    if (nv_pte_t_cache != NULL)
-+        NV_KMEM_CACHE_DESTROY(nv_pte_t_cache);
-+
-+#if defined(NV_PM_SUPPORT_APM)
-+    for (i = 0; i < num_nv_devices; i++)
-+        if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
-+#endif
-+
- #ifdef CONFIG_DEVFS_FS
-     NV_DEVFS_REMOVE_CONTROL();
-     for (i = 0; i < num_nv_devices; i++)
-@@ -1101,6 +1122,8 @@
-     nv_printf(NV_DBG_ERRORS, "NVRM: final mem usage: vm 0x%x km 0x%x fp 0x%x\n",
-         vm_usage, km_usage, fp_usage);
- #endif
-+
-+    NV_KMEM_CACHE_DESTROY(nv_pte_t_cache);
- }
- 
- module_init(nvidia_init_module);
-@@ -1249,15 +1272,15 @@
-     index = (address - vma->vm_start)>>PAGE_SHIFT;
- 
-     // save that index into our page list (make sure it doesn't already exist)
--    if (at->page_table[index].phys_addr)
-+    if (at->page_table[index]->phys_addr)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: page slot already filled in nopage handler!\n");
-         os_dbg_breakpoint();
-     }
- 
--    at->page_table[index].phys_addr = (page_to_pfn(page_ptr) << PAGE_SHIFT);
--    at->page_table[index].dma_addr  = (page_to_pfn(page_ptr) << PAGE_SHIFT);
--    at->page_table[index].virt_addr = (unsigned long) __va(page_to_pfn(page_ptr) << PAGE_SHIFT);
-+    at->page_table[index]->phys_addr = (page_to_pfn(page_ptr) << PAGE_SHIFT);
-+    at->page_table[index]->dma_addr  = (page_to_pfn(page_ptr) << PAGE_SHIFT);
-+    at->page_table[index]->virt_addr = (unsigned long) __va(page_to_pfn(page_ptr) << PAGE_SHIFT);
- 
-     return page_ptr;
- #endif
-@@ -1670,7 +1693,7 @@
-         start = vma->vm_start;
-         while (pages--)
-         {
--            page = (unsigned long) at->page_table[i++].phys_addr;
-+            page = (unsigned long) at->page_table[i++]->phys_addr;
-             if (NV_REMAP_PAGE_RANGE(start, page, PAGE_SIZE, vma->vm_page_prot))
-                 return -EAGAIN;
-             start += PAGE_SIZE;
-@@ -2368,8 +2391,8 @@
- 
-         for (i = 0; i < at->num_pages; i++)
-         {
--            if (address == at->page_table[i].phys_addr)
--                return (void *)(at->page_table[i].virt_addr + offset);
-+            if (address == at->page_table[i]->phys_addr)
-+                return (void *)(at->page_table[i]->virt_addr + offset);
-         }
-     }
- 
-@@ -2400,8 +2423,8 @@
- 
-         for (i = 0; i < at->num_pages; i++)
-         {
--            if (address == at->page_table[i].phys_addr)
--                return (unsigned long)at->page_table[i].dma_addr + offset;
-+            if (address == at->page_table[i]->phys_addr)
-+                return (unsigned long)at->page_table[i]->dma_addr + offset;
-         }
-     }
- 
-@@ -2427,9 +2450,9 @@
-             unsigned long address = dma_address & PAGE_MASK;
-             for (i = 0; i < at->num_pages; i++)
-             {
--                if (address == at->page_table[i].dma_addr)
-+                if (address == at->page_table[i]->dma_addr)
-                 {
--                    return at->page_table[i].phys_addr + offset;
-+                    return at->page_table[i]->phys_addr + offset;
-                 }
-             }
-         }
-@@ -2466,7 +2489,7 @@
-         int i;
-         for (i = 0; i < at->num_pages; i++)
-         {
--            if (address == (unsigned long) at->page_table[i].dma_addr)
-+            if (address == (unsigned long) at->page_table[i]->dma_addr)
-             {
-                 return (void *)((unsigned long) at->key_mapping + 
-                     (i * PAGE_SIZE));
-@@ -2630,7 +2653,7 @@
-             nvl_add_alloc(nvl, at);
-         } else {
-             /* use nvidia's nvagp support */
--            if (nv_vm_malloc_pages(at))
-+            if (nv_vm_malloc_pages(nv, at))
-                 goto failed;
- 
-             at->class = class;
-@@ -2654,7 +2677,7 @@
-             if (rm_status)
-             {
-                 nvl_remove_alloc(nvl, at);
--                nv_vm_unlock_and_free_pages(NV_ATOMIC_READ(at->usage_count), at);
-+                NV_VM_UNLOCK_AND_FREE_PAGES(nv, NV_ATOMIC_READ(at->usage_count), at);
-                 goto failed;
-             }
-             at->priv_data = *priv_data;
-@@ -2666,12 +2689,12 @@
-     else 
-     {
- 
--        if (nv_vm_malloc_pages(at))
-+        if (nv_vm_malloc_pages(nv, at))
-             goto failed;
- 
-         if (kernel)
-         {
--            *pAddress = (void *) at->page_table[0].virt_addr;
-+            *pAddress = (void *) at->page_table[0]->virt_addr;
-         }
-         else
-         {
-@@ -2679,7 +2702,7 @@
-              * so use the first page, which is page-aligned. this way, our 
-              * allocated page table does not need to be page-aligned
-              */
--            *pAddress = (void *) at->page_table[0].phys_addr;
-+            *pAddress = (void *) at->page_table[0]->phys_addr;
-         }
- 
-         nvl_add_alloc(nvl, at);
-@@ -2743,7 +2766,7 @@
-             rmStatus = rm_free_agp_pages(nv, pAddress, priv_data);
-             if (rmStatus == RM_OK)
-             {
--                nv_vm_unlock_and_free_pages(NV_ATOMIC_READ(at->usage_count), at);
-+                NV_VM_UNLOCK_AND_FREE_PAGES(nv, NV_ATOMIC_READ(at->usage_count), at);
-             }
-         }
-     } else {
-@@ -2759,7 +2782,7 @@
- 
-         NV_ATOMIC_DEC(at->usage_count);
- 
--        nv_vm_unlock_and_free_pages(NV_ATOMIC_READ(at->usage_count), at);
-+        NV_VM_UNLOCK_AND_FREE_PAGES(nv, NV_ATOMIC_READ(at->usage_count), at);
-     }
- 
-     if (NV_ATOMIC_READ(at->usage_count) == 0)
-@@ -3065,7 +3088,7 @@
-     }
- 
-     /* get the physical address of this page */
--    *paddr = (U032) ((NV_UINTPTR_T)at->page_table[index].dma_addr);
-+    *paddr = (U032) ((NV_UINTPTR_T)at->page_table[index]->dma_addr);
- 
-     return RM_OK;
- }
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch
deleted file mode 100644
index f6045348b5b6..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1162524.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1162524/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1162524/nv-linux.h	2004-12-03 13:04:29.000000000 +0100
-@@ -627,75 +627,136 @@
- #define NV_REMAP_PAGE_RANGE(x...) remap_page_range(x)
- #endif
- 
-+
-+#if defined(pml4_offset)
-+#define NV_PML4_PGD_OFFSET(address, pml4, kernel)       \
-+   ({                                                   \
-+        pgd_t *__pgd;                                   \
-+        if (!kernel)                                    \
-+            __pgd = pml4_pgd_offset(pml4, address);     \
-+        else                                            \
-+            __pgd = pml4_pgd_offset_k(pml4, address);   \
-+        __pgd;                                          \
-+    })
-+
-+#define NV_PML4_PRESENT(pml4)                           \
-+   ({                                                   \
-+        if (pml4 != NULL)                               \
-+        {                                               \
-+            if (pml4_bad(*pml4))                        \
-+            {                                           \
-+                pml4_clear(pml4);                       \
-+                pml4 = NULL; /* mark invalid */         \
-+            }                                           \
-+            else if (pml4_none(*pml4))                  \
-+                pml4 = NULL;                            \
-+        } pml4 != NULL;                                 \
-+    })
-+
-+#define NV_PGD_OFFSET(address, kernel, mm)              \
-+   ({                                                   \
-+        pml4_t *__pml4;                                 \
-+        pgd_t *__pgd = NULL;                            \
-+        if (!kernel)                                    \
-+            __pml4 = pml4_offset(mm, address);          \
-+        else                                            \
-+            __pml4 = pml4_offset_k(address);            \
-+        if (NV_PML4_PRESENT(__pml4))                    \
-+            __pgd = NV_PML4_PGD_OFFSET(address,         \
-+                        __pml4, kernel);                \
-+        __pgd;                                          \
-+    })
-+#else
-+#define NV_PGD_OFFSET(address, kernel, mm)              \
-+   ({                                                   \
-+        pgd_t *__pgd;                                   \
-+        if (!kernel)                                    \
-+            __pgd = pgd_offset(mm, address);            \
-+        else                                            \
-+            __pgd = pgd_offset_k(address);              \
-+        __pgd;                                          \
-+    })
-+#endif
-+
-+#define NV_PGD_PRESENT(pgd)                             \
-+   ({                                                   \
-+         if ((pgd != NULL) &&                           \
-+             (pgd_bad(*pgd) || pgd_none(*pgd)))         \
-+            /* static */ pgd = NULL;                    \
-+         pgd != NULL;                                   \
-+    })
-+
- #if defined(pmd_offset_map)
--#define NV_PMD_OFFSET(addres, pg_dir, pg_mid_dir) \
--    { \
--        pg_mid_dir = pmd_offset_map(pg_dir, address); \
--    }
--#define NV_PMD_UNMAP(pg_mid_dir) \
--    { \
--        pmd_unmap(pg_mid_dir); \
--    }
-+#define NV_PMD_OFFSET(address, pgd)                     \
-+   ({                                                   \
-+        pmd_t *__pmd;                                   \
-+        __pmd = pmd_offset_map(pgd, address);           \
-+   })
-+#define NV_PMD_UNMAP(pmd) pmd_unmap(pmd);
- #else
--#define NV_PMD_OFFSET(addres, pg_dir, pg_mid_dir) \
--    { \
--        pg_mid_dir = pmd_offset(pg_dir, address); \
--    }
--#define NV_PMD_UNMAP(pg_mid_dir)
-+#define NV_PMD_OFFSET(address, pgd)                     \
-+   ({                                                   \
-+        pmd_t *__pmd;                                   \
-+        __pmd = pmd_offset(pgd, address);               \
-+    })
-+#define NV_PMD_UNMAP(pmd)
- #endif
- 
--#define NV_PMD_PRESENT(pg_mid_dir) \
--    ({ \
--        if ( (pg_mid_dir) && (pmd_none(*pg_mid_dir))) { \
--            NV_PMD_UNMAP(pg_mid_dir); pg_mid_dir = NULL; \
--        } pg_mid_dir != NULL; \
-+#define NV_PMD_PRESENT(pmd)                             \
-+   ({                                                   \
-+        if ((pmd != NULL) &&                            \
-+            (pmd_bad(*pmd) || pmd_none(*pmd)))          \
-+        {                                               \
-+            NV_PMD_UNMAP(pmd);                          \
-+            pmd = NULL; /* mark invalid */              \
-+        }                                               \
-+        pmd != NULL;                                    \
-     })
- 
- #if defined(pte_offset_atomic)
--#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \
--    { \
--        pte = pte_offset_atomic(pg_mid_dir, address); \
--        NV_PMD_UNMAP(pg_mid_dir); \
--    }
--#define NV_PTE_UNMAP(pte) \
--    { \
--        pte_kunmap(pte); \
--    }
-+#define NV_PTE_OFFSET(address, pmd)                     \
-+   ({                                                   \
-+        pte_t *__pte;                                   \
-+        __pte = pte_offset_atomic(pmd, address);        \
-+        NV_PMD_UNMAP(pmd); __pte;                       \
-+    })
-+#define NV_PTE_UNMAP(pte) pte_kunmap(pte);
- #elif defined(pte_offset)
--#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \
--    { \
--        pte = pte_offset(pg_mid_dir, address); \
--        NV_PMD_UNMAP(pg_mid_dir); \
--    }
-+#define NV_PTE_OFFSET(address, pmd)                     \
-+   ({                                                   \
-+        pte_t *__pte;                                   \
-+        __pte = pte_offset(pmd, address);               \
-+        NV_PMD_UNMAP(pmd); __pte;                       \
-+    })
- #define NV_PTE_UNMAP(pte)
- #else
--#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \
--    { \
--        pte = pte_offset_map(pg_mid_dir, address); \
--        NV_PMD_UNMAP(pg_mid_dir); \
--    }
--#define NV_PTE_UNMAP(pte) \
--    { \
--        pte_unmap(pte); \
--    }
-+#define NV_PTE_OFFSET(address, pmd)                     \
-+   ({                                                   \
-+        pte_t *__pte;                                   \
-+        __pte = pte_offset_map(pmd, address);           \
-+        NV_PMD_UNMAP(pmd); __pte;                       \
-+    })
-+#define NV_PTE_UNMAP(pte) pte_unmap(pte);
- #endif
- 
--#define NV_PTE_PRESENT(pte) \
--    ({ \
--        if (pte) { \
--            if (!pte_present(*pte)) { \
--                NV_PTE_UNMAP(pte); pte = NULL; \
--            } \
--        } pte != NULL; \
--    })
--
--#define NV_PTE_VALUE(pte) \
--    ({ \
--        unsigned long __pte_value = pte_val(*pte); \
--        NV_PTE_UNMAP(pte); \
--        __pte_value; \
-+#define NV_PTE_PRESENT(pte)                             \
-+   ({                                                   \
-+        if ((pte != NULL) && !pte_present(*pte))        \
-+        {                                               \
-+            NV_PTE_UNMAP(pte);                          \
-+            pte = NULL; /* mark invalid */              \
-+        }                                               \
-+        pte != NULL;                                    \
-     })
- 
-+#define NV_PTE_VALUE(pte)                               \
-+   ({                                                   \
-+        unsigned long __pte_value = pte_val(*pte);      \
-+        NV_PTE_UNMAP(pte);                              \
-+        __pte_value;                                    \
-+    })
-+
-+
- #define NV_PAGE_ALIGN(addr)             ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE)
- #define NV_MASK_OFFSET(addr)            ( (addr) & (PAGE_SIZE - 1) )
- 
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.1162524/nv-vm.c
---- usr/src/nv/nv-vm.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1162524/nv-vm.c	2004-12-03 13:04:34.000000000 +0100
-@@ -53,12 +53,13 @@
-  * conflicts. we try to rely on the kernel's provided interfaces when possible,
-  * but need additional flushing on earlier kernels.
-  */
--
-+#if defined(KERNEL_2_4)
- /* wrap CACHE_FLUSH so we can pass it to smp_call_function */
- static void cache_flush(void *p)
- {
-     CACHE_FLUSH();
- }
-+#endif
- 
- /*
-  * 2.4 kernels handle flushing in the change_page_attr() call, but kernels 
-diff -ru usr/src/nv/nv.c usr/src/nv.1162524/nv.c
---- usr/src/nv/nv.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1162524/nv.c	2004-12-03 13:04:37.000000000 +0100
-@@ -2492,26 +2492,23 @@
- )
- {
-     struct mm_struct *mm;
--    pgd_t *pg_dir;
--    pmd_t *pg_mid_dir;
--    pte_t *pte;
-+    pgd_t *pgd = NULL;
-+    pmd_t *pmd = NULL;
-+    pte_t *pte = NULL;
-     unsigned long retval;
- 
-     mm = (kern) ? &init_mm : current->mm;
-     spin_lock(&mm->page_table_lock);
- 
--    if (kern) pg_dir = pgd_offset_k(address);
--    else pg_dir = pgd_offset(mm, address);
--
--    if (!pg_dir || pgd_none(*pg_dir))
-+    pgd = NV_PGD_OFFSET(address, kern, mm);
-+    if (!NV_PGD_PRESENT(pgd))
-         goto failed;
- 
--    NV_PMD_OFFSET(address, pg_dir, pg_mid_dir);
--    if (!NV_PMD_PRESENT(pg_mid_dir))
-+    pmd = NV_PMD_OFFSET(address, pgd);
-+    if (!NV_PMD_PRESENT(pmd))
-         goto failed;
- 
--    NV_PTE_OFFSET(address, pg_mid_dir, pte);
--
-+    pte = NV_PTE_OFFSET(address, pmd);
-     if (!NV_PTE_PRESENT(pte))
-         goto failed;
- 
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch
deleted file mode 100644
index ca8b2cb1314b..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1165235.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru usr/src/nv/nv.c usr/src/nv.1165235/nv.c
---- usr/src/nv/nv.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1165235/nv.c	2004-11-25 16:45:04.000000000 +0100
-@@ -1604,9 +1604,8 @@
-         }
-         nv_vm_list_page_count(at->page_table, at->num_pages);
- 
--        /* prevent the swapper from swapping it out */
--        /* mark the memory i/o so the buffers aren't dumped on core dumps */
--        vma->vm_flags |= (VM_LOCKED | VM_IO);
-+        // mark it as IO so that we don't dump it on core dump
-+        vma->vm_flags |= VM_IO;
-     }
- 
-     /* Magic allocator */
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch
deleted file mode 100644
index 3fbc404aef51..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1171869.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1171869/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1171869/nv-linux.h	2004-12-03 11:34:45.000000000 +0100
-@@ -480,12 +480,22 @@
- #define NV_PCI_RESOURCE_SIZE(dev, bar)  ((dev)->resource[(bar) - 1].end - (dev)->resource[(bar) - 1].start + 1)
- 
- #define NV_PCI_BUS_NUMBER(dev)        (dev)->bus->number
--#define NV_PCI_SLOT_NUMBER(dev)       PCI_SLOT((dev)->devfn)
-+#define NV_PCI_DEVFN(dev)             (dev)->devfn
-+#define NV_PCI_SLOT_NUMBER(dev)       PCI_SLOT(NV_PCI_DEVFN(dev))
- 
- #ifdef NV_PCI_GET_CLASS_PRESENT
- #define NV_PCI_DEV_PUT(dev)                    pci_dev_put(dev)
- #define NV_PCI_GET_DEVICE(vendor,device,from)  pci_get_device(vendor,device,from)
--#define NV_PCI_GET_SLOT(bus,devfn)             pci_get_slot(pci_find_bus(0,bus),devfn)
-+#define NV_PCI_GET_SLOT(bus,devfn)                                       \
-+   ({                                                                    \
-+        struct pci_dev *__dev = NULL;                                    \
-+        while ((__dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, __dev)))  \
-+        {                                                                \
-+            if (NV_PCI_BUS_NUMBER(__dev) == bus                          \
-+                    && NV_PCI_DEVFN(__dev) == devfn) break;              \
-+        }                                                                \
-+        __dev;                                                           \
-+    })
- #define NV_PCI_GET_CLASS(class,from)           pci_get_class(class,from)
- #else
- #define NV_PCI_DEV_PUT(dev)
-diff -ru usr/src/nv/os-interface.c usr/src/nv.1171869/os-interface.c
---- usr/src/nv/os-interface.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1171869/os-interface.c	2004-12-03 11:34:51.000000000 +0100
-@@ -866,7 +866,8 @@
- )
- {
-     struct pci_dev *dev;
--    dev = NV_PCI_GET_SLOT(bus, PCI_DEVFN(slot, function));
-+    unsigned int devfn = PCI_DEVFN(slot, function);
-+    dev = NV_PCI_GET_SLOT(bus, devfn);
-     if (dev) {
-         if (vendor) *vendor = dev->vendor;
-         if (device) *device = dev->device;
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch
deleted file mode 100644
index 461e80003895..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1175225.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1175225/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1175225/nv-linux.h	2004-12-21 21:03:33.000000000 +0100
-@@ -533,6 +533,7 @@
-  */
- #if defined(CONFIG_SWIOTLB)
- #define NV_SWIOTLB 1
-+#define NV_SWIOTLB_MAX_RETRIES 16
- extern int nv_swiotlb;
- #endif
- 
-@@ -950,10 +951,48 @@
-     sg_ptr->offset = (unsigned long)base & ~PAGE_MASK;
-     sg_ptr->length  = num_pages * PAGE_SIZE;
- 
-+#if defined(NV_SWIOTLB)
-+    i = NV_SWIOTLB_MAX_RETRIES;
-+    do {
-+        if (pci_map_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
-+            return 1;
-+
-+        if (sg_ptr->dma_address & ~PAGE_MASK)
-+        {
-+            struct scatterlist sg_tmp;
-+            pci_unmap_sg(dev, sg_ptr, num_pages, PCI_DMA_BIDIRECTIONAL);
-+
-+            memset(&sg_tmp, 0, sizeof(struct scatterlist));
-+            sg_tmp.page = sg_ptr->page;
-+            sg_tmp.offset = sg_ptr->offset;
-+            sg_tmp.length = 2048;
-+
-+            if (pci_map_sg(dev, &sg_tmp, 1, PCI_DMA_BIDIRECTIONAL) == 0)
-+                return 1;
-+
-+            if (pci_map_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
-+            {
-+                pci_unmap_sg(dev, &sg_tmp, num_pages, PCI_DMA_BIDIRECTIONAL);
-+                return 1;
-+            }
-+
-+            pci_unmap_sg(dev, &sg_tmp, num_pages, PCI_DMA_BIDIRECTIONAL);
-+        }
-+    } while (i-- && sg_ptr->dma_address & ~PAGE_MASK);
-+#else
-     if (pci_map_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
-     {
-         return 1;
-     }
-+#endif
-+
-+    if (sg_ptr->dma_address & ~PAGE_MASK)
-+    {
-+        nv_printf(NV_DBG_ERRORS,
-+            "NVRM: VM: nv_sg_map_buffer: failed to obtain aligned mapping\n");
-+        pci_unmap_sg(dev, sg_ptr, num_pages, PCI_DMA_BIDIRECTIONAL);
-+        return 1;
-+    }
- 
-     NV_FIXUP_SWIOTLB_VIRT_ADDR_BUG(sg_ptr->dma_address);
- 
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch
deleted file mode 100644
index 140ab043feec..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1182399.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1182399/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1182399/nv-linux.h	2004-12-21 18:58:41.000000000 +0100
-@@ -155,6 +155,10 @@
- #endif
- #endif /* defined(NVCPU_X86) */
- 
-+#ifndef get_cpu
-+#define get_cpu() smp_processor_id()
-+#define put_cpu()
-+#endif
- 
- #if !defined (list_for_each)
- #define list_for_each(pos, head) \
-diff -ru usr/src/nv/nv.c usr/src/nv.1182399/nv.c
---- usr/src/nv/nv.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1182399/nv.c	2004-12-21 18:58:55.000000000 +0100
-@@ -2769,21 +2769,13 @@
- }
- 
- 
--/* avoid compiler warnings on UP kernels, 
-- * when spinlock macros are defined away 
-- */
--#define NO_COMPILER_WARNINGS(nvl) \
--    if (nvl == NULL) return
--
--
- static void nv_lock_init_locks
- ( 
-     nv_state_t *nv
- )
- {
--    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
--
--    NO_COMPILER_WARNINGS(nvl);
-+    nv_linux_state_t *nvl;
-+    nvl = NV_GET_NVL_FROM_NV_STATE(nv);
- 
-     spin_lock_init(&nvl->rm_lock);
- 
-@@ -2799,28 +2791,33 @@
-     nv_state_t *nv
- )
- {
--    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
--    NO_COMPILER_WARNINGS(nvl);
-+    nv_linux_state_t *nvl;
-+    int cpu;
-+
-+    nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    cpu = get_cpu();
- 
--    if (nvl->rm_lock_cpu == smp_processor_id())
-+    if (nvl->rm_lock_cpu == cpu)
-     {
-         nvl->rm_lock_count++;
-+        put_cpu();
-         return;
-     }
- 
-+    put_cpu();
-     spin_unlock_wait(&nvl->rm_lock);
-     spin_lock_irq(&nvl->rm_lock);
- 
--   nvl->rm_lock_cpu = smp_processor_id();
--   nvl->rm_lock_count = 1;
-+    nvl->rm_lock_cpu = smp_processor_id();
-+    nvl->rm_lock_count = 1;
- }
- 
- void NV_API_CALL nv_unlock_rm(
-     nv_state_t *nv
- )
- {
--    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
--    NO_COMPILER_WARNINGS(nvl);
-+    nv_linux_state_t *nvl;
-+    nvl = NV_GET_NVL_FROM_NV_STATE(nv);
- 
-     if (--nvl->rm_lock_count)
-         return;
-diff -ru usr/src/nv/os-interface.c usr/src/nv.1182399/os-interface.c
---- usr/src/nv/os-interface.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1182399/os-interface.c	2004-12-21 18:58:47.000000000 +0100
-@@ -732,10 +732,17 @@
- //
- inline void NV_API_CALL out_string(const char *str)
- {
-+#if DEBUG
-     static int was_newline = 0;
- 
--    if (was_newline) printk("%d: %s", smp_processor_id(), str);
--    else             printk("%s", str);
-+    if (NV_NUM_CPUS() > 1 && was_newline)
-+    {
-+        printk("%d: %s", get_cpu(), str);
-+        put_cpu();
-+    }
-+    else
-+#endif
-+        printk("%s", str);
- 
- #if DEBUG
-     if (NV_NUM_CPUS() > 1)
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch
deleted file mode 100644
index 11515ce81dc5..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1189413.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1189413/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1189413/nv-linux.h	2005-01-07 15:44:01.000000000 +0100
-@@ -627,75 +627,109 @@
- #define NV_REMAP_PAGE_RANGE(x...) remap_page_range(x)
- #endif
- 
-+
-+#define NV_PGD_OFFSET(address, kernel, mm)              \
-+   ({                                                   \
-+        pgd_t *__pgd;                                   \
-+        if (!kernel)                                    \
-+            __pgd = pgd_offset(mm, address);            \
-+        else                                            \
-+            __pgd = pgd_offset_k(address);              \
-+        __pgd;                                          \
-+    })
-+
-+#define NV_PGD_PRESENT(pgd)                             \
-+   ({                                                   \
-+         if ((pgd != NULL) &&                           \
-+             (pgd_bad(*pgd) || pgd_none(*pgd)))         \
-+            /* static */ pgd = NULL;                    \
-+         pgd != NULL;                                   \
-+    })
-+
- #if defined(pmd_offset_map)
--#define NV_PMD_OFFSET(addres, pg_dir, pg_mid_dir) \
--    { \
--        pg_mid_dir = pmd_offset_map(pg_dir, address); \
--    }
--#define NV_PMD_UNMAP(pg_mid_dir) \
--    { \
--        pmd_unmap(pg_mid_dir); \
--    }
-+#define NV_PMD_OFFSET(address, pgd)                     \
-+   ({                                                   \
-+        pmd_t *__pmd;                                   \
-+        __pmd = pmd_offset_map(pgd, address);           \
-+   })
-+#define NV_PMD_UNMAP(pmd) pmd_unmap(pmd);
- #else
--#define NV_PMD_OFFSET(addres, pg_dir, pg_mid_dir) \
--    { \
--        pg_mid_dir = pmd_offset(pg_dir, address); \
--    }
--#define NV_PMD_UNMAP(pg_mid_dir)
-+#if defined(PUD_SHIFT) /* 4-level pgtable */
-+#define NV_PMD_OFFSET(address, pgd)                     \
-+   ({                                                   \
-+        pmd_t *__pmd = NULL;                            \
-+        pud_t *__pud;                                   \
-+        __pud = pud_offset(pgd, address);               \
-+        if ((__pud != NULL) &&                          \
-+            !(pud_bad(*__pud) || pud_none(*__pud)))     \
-+            __pmd = pmd_offset(__pud, address);         \
-+        __pmd;                                          \
-+    })
-+#else /* 3-level pgtable */
-+#define NV_PMD_OFFSET(address, pgd)                     \
-+   ({                                                   \
-+        pmd_t *__pmd;                                   \
-+        __pmd = pmd_offset(pgd, address);               \
-+    })
-+#endif
-+#define NV_PMD_UNMAP(pmd)
- #endif
- 
--#define NV_PMD_PRESENT(pg_mid_dir) \
--    ({ \
--        if ( (pg_mid_dir) && (pmd_none(*pg_mid_dir))) { \
--            NV_PMD_UNMAP(pg_mid_dir); pg_mid_dir = NULL; \
--        } pg_mid_dir != NULL; \
-+#define NV_PMD_PRESENT(pmd)                             \
-+   ({                                                   \
-+        if ((pmd != NULL) &&                            \
-+            (pmd_bad(*pmd) || pmd_none(*pmd)))          \
-+        {                                               \
-+            NV_PMD_UNMAP(pmd);                          \
-+            pmd = NULL; /* mark invalid */              \
-+        }                                               \
-+        pmd != NULL;                                    \
-     })
- 
- #if defined(pte_offset_atomic)
--#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \
--    { \
--        pte = pte_offset_atomic(pg_mid_dir, address); \
--        NV_PMD_UNMAP(pg_mid_dir); \
--    }
--#define NV_PTE_UNMAP(pte) \
--    { \
--        pte_kunmap(pte); \
--    }
-+#define NV_PTE_OFFSET(address, pmd)                     \
-+   ({                                                   \
-+        pte_t *__pte;                                   \
-+        __pte = pte_offset_atomic(pmd, address);        \
-+        NV_PMD_UNMAP(pmd); __pte;                       \
-+    })
-+#define NV_PTE_UNMAP(pte) pte_kunmap(pte);
- #elif defined(pte_offset)
--#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \
--    { \
--        pte = pte_offset(pg_mid_dir, address); \
--        NV_PMD_UNMAP(pg_mid_dir); \
--    }
-+#define NV_PTE_OFFSET(address, pmd)                     \
-+   ({                                                   \
-+        pte_t *__pte;                                   \
-+        __pte = pte_offset(pmd, address);               \
-+        NV_PMD_UNMAP(pmd); __pte;                       \
-+    })
- #define NV_PTE_UNMAP(pte)
- #else
--#define NV_PTE_OFFSET(addres, pg_mid_dir, pte) \
--    { \
--        pte = pte_offset_map(pg_mid_dir, address); \
--        NV_PMD_UNMAP(pg_mid_dir); \
--    }
--#define NV_PTE_UNMAP(pte) \
--    { \
--        pte_unmap(pte); \
--    }
-+#define NV_PTE_OFFSET(address, pmd)                     \
-+   ({                                                   \
-+        pte_t *__pte;                                   \
-+        __pte = pte_offset_map(pmd, address);           \
-+        NV_PMD_UNMAP(pmd); __pte;                       \
-+    })
-+#define NV_PTE_UNMAP(pte) pte_unmap(pte);
- #endif
- 
--#define NV_PTE_PRESENT(pte) \
--    ({ \
--        if (pte) { \
--            if (!pte_present(*pte)) { \
--                NV_PTE_UNMAP(pte); pte = NULL; \
--            } \
--        } pte != NULL; \
-+#define NV_PTE_PRESENT(pte)                             \
-+   ({                                                   \
-+        if ((pte != NULL) && !pte_present(*pte))        \
-+        {                                               \
-+            NV_PTE_UNMAP(pte);                          \
-+            pte = NULL; /* mark invalid */              \
-+        }                                               \
-+        pte != NULL;                                    \
-     })
- 
--#define NV_PTE_VALUE(pte) \
--    ({ \
--        unsigned long __pte_value = pte_val(*pte); \
--        NV_PTE_UNMAP(pte); \
--        __pte_value; \
-+#define NV_PTE_VALUE(pte)                               \
-+   ({                                                   \
-+        unsigned long __pte_value = pte_val(*pte);      \
-+        NV_PTE_UNMAP(pte);                              \
-+        __pte_value;                                    \
-     })
- 
-+
- #define NV_PAGE_ALIGN(addr)             ( ((addr) + PAGE_SIZE - 1) / PAGE_SIZE)
- #define NV_MASK_OFFSET(addr)            ( (addr) & (PAGE_SIZE - 1) )
- 
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.1189413/nv-vm.c
---- usr/src/nv/nv-vm.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1189413/nv-vm.c	2005-01-07 15:43:22.000000000 +0100
-@@ -53,12 +53,13 @@
-  * conflicts. we try to rely on the kernel's provided interfaces when possible,
-  * but need additional flushing on earlier kernels.
-  */
--
-+#if defined(KERNEL_2_4)
- /* wrap CACHE_FLUSH so we can pass it to smp_call_function */
- static void cache_flush(void *p)
- {
-     CACHE_FLUSH();
- }
-+#endif
- 
- /*
-  * 2.4 kernels handle flushing in the change_page_attr() call, but kernels 
-diff -ru usr/src/nv/nv.c usr/src/nv.1189413/nv.c
---- usr/src/nv/nv.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1189413/nv.c	2005-01-07 15:43:22.000000000 +0100
-@@ -2492,26 +2492,23 @@
- )
- {
-     struct mm_struct *mm;
--    pgd_t *pg_dir;
--    pmd_t *pg_mid_dir;
--    pte_t *pte;
-+    pgd_t *pgd = NULL;
-+    pmd_t *pmd = NULL;
-+    pte_t *pte = NULL;
-     unsigned long retval;
- 
-     mm = (kern) ? &init_mm : current->mm;
-     spin_lock(&mm->page_table_lock);
- 
--    if (kern) pg_dir = pgd_offset_k(address);
--    else pg_dir = pgd_offset(mm, address);
--
--    if (!pg_dir || pgd_none(*pg_dir))
-+    pgd = NV_PGD_OFFSET(address, kern, mm);
-+    if (!NV_PGD_PRESENT(pgd))
-         goto failed;
- 
--    NV_PMD_OFFSET(address, pg_dir, pg_mid_dir);
--    if (!NV_PMD_PRESENT(pg_mid_dir))
-+    pmd = NV_PMD_OFFSET(address, pgd);
-+    if (!NV_PMD_PRESENT(pmd))
-         goto failed;
- 
--    NV_PTE_OFFSET(address, pg_mid_dir, pte);
--
-+    pte = NV_PTE_OFFSET(address, pmd);
-     if (!NV_PTE_PRESENT(pte))
-         goto failed;
- 
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff
deleted file mode 100644
index 932e02ffcb29..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-1201042.diff
+++ /dev/null
@@ -1,302 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1201042/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1201042/nv-linux.h	2005-01-26 01:56:26.000000000 +0100
-@@ -565,11 +565,6 @@
- #define PCI_CAP_ID_EXP 0x10
- #endif
- 
--#if defined(KERNEL_2_6) && defined(AGPGART)
--typedef struct agp_kern_info agp_kern_info;
--typedef struct agp_memory agp_memory;
--#endif
--
- #if defined(CONFIG_DEVFS_FS)
- #  if defined(KERNEL_2_6)
-      typedef void* devfs_handle_t;
-diff -ru usr/src/nv/nv.c usr/src/nv.1201042/nv.c
---- usr/src/nv/nv.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1201042/nv.c	2005-01-26 01:56:28.000000000 +0100
-@@ -2987,32 +2987,47 @@
-      */
-     if ( (!NV_AGP_ENABLED(nv)) && (config & NVOS_AGP_CONFIG_NVAGP) )
-     {
--        /* make sure the user does not have agpgart loaded */
--        if (inter_module_get("drm_agp")) {
-+#if defined(KERNEL_2_4)
-+        if (inter_module_get("drm_agp"))
-+        {
-             inter_module_put("drm_agp");
--            nv_printf(NV_DBG_WARNINGS, "NVRM: not using NVAGP, AGPGART is loaded!!\n");
--        } else {
--#if defined(CONFIG_X86_64) && defined(CONFIG_GART_IOMMU)
-+            nv_printf(NV_DBG_WARNINGS, "NVRM: not using NVAGP, AGPGART is loaded!\n");
-+            return status;
-+        }
-+#elif defined(AGPGART)
-+        int error;
-+        /*
-+         * We can only safely use NvAGP when no backend has been
-+         * registered with the AGPGART frontend. This condition
-+         * is only met when the acquire function returns -EINVAL.
-+         *
-+         * Other return codes indicate that a backend is present
-+         * and was either acquired, busy or else unavailable.
-+         */
-+        if ((error = agp_backend_acquire()) != -EINVAL)
-+        {
-+            if (!error) agp_backend_release();
-             nv_printf(NV_DBG_WARNINGS,
--                "NVRM: not using NVAGP, kernel was compiled with GART_IOMMU support!!\n");
--#else
--            status = rm_init_agp(nv);
--            if (status == RM_OK)
--            {
--                nv->agp_config = NVOS_AGP_CONFIG_NVAGP;
--                nv->agp_status = NV_AGP_STATUS_ENABLED;
--            }
-+                      "NVRM: not using NVAGP, an AGPGART backend is loaded!\n");
-+            return status;
-+        }
- #endif
-+#if defined(CONFIG_X86_64) && defined(CONFIG_GART_IOMMU)
-+        nv_printf(NV_DBG_WARNINGS,
-+            "NVRM: not using NVAGP, kernel was compiled with GART_IOMMU support!\n");
-+#else
-+        status = rm_init_agp(nv);
-+        if (status == RM_OK)
-+        {
-+            nv->agp_config = NVOS_AGP_CONFIG_NVAGP;
-+            nv->agp_status = NV_AGP_STATUS_ENABLED;
-         }
-+#endif
-     }
- 
-     if (NV_AGP_ENABLED(nv))
-         old_error = 0; /* report new errors */
- 
--    nv_printf(NV_DBG_SETUP, 
--        "NVRM: agp_init finished with status 0x%x and config %d\n",
--        status, nv->agp_config);
--
-     return status;
- }
- 
-@@ -3036,9 +3051,6 @@
-     nv->agp_config = NVOS_AGP_CONFIG_DISABLE_AGP;
-     nv->agp_status = NV_AGP_STATUS_DISABLED;
- 
--    nv_printf(NV_DBG_SETUP, "NVRM: teardown finished with status 0x%x\n", 
--        status);
--
-     return status;
- }
- 
-diff -ru usr/src/nv/os-agp.c usr/src/nv.1201042/os-agp.c
---- usr/src/nv/os-agp.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1201042/os-agp.c	2005-01-26 01:56:30.000000000 +0100
-@@ -25,6 +25,13 @@
- 
- #ifdef AGPGART
- 
-+#if defined(KERNEL_2_6)
-+typedef struct agp_kern_info agp_kern_info;
-+typedef struct agp_memory agp_memory;
-+#elif defined(KERNEL_2_4)
-+const drm_agp_t *drm_agp_p; /* functions */
-+#endif
-+
- typedef struct {
-     agp_memory *ptr;
-     int num_pages;
-@@ -45,7 +52,6 @@
- 
- agp_kern_info         agpinfo;
- agp_gart              gart;
--const drm_agp_t       *drm_agp_p;
- 
- #if defined(CONFIG_MTRR)
- #define MTRR_DEL(gart) if ((gart).mtrr > 0) mtrr_del((gart).mtrr, 0, 0);
-@@ -53,6 +59,26 @@
- #define MTRR_DEL(gart)
- #endif
- 
-+#if defined(KERNEL_2_6)
-+#define NV_AGPGART_BACKEND_ACQUIRE(o) agp_backend_acquire()
-+#define NV_AGPGART_BACKEND_ENABLE(o,mode) agp_enable(mode)
-+#define NV_AGPGART_BACKEND_RELEASE(o) agp_backend_release()
-+#define NV_AGPGART_COPY_INFO(o,p) agp_copy_info(p)
-+#define NV_AGPGART_ALLOCATE_MEMORY(o,count,type) agp_allocate_memory(count,type)
-+#define NV_AGPGART_FREE_MEMORY(o,p) agp_free_memory(p)
-+#define NV_AGPGART_BIND_MEMORY(o,p,offset) agp_bind_memory(p,offset)
-+#define NV_AGPGART_UNBIND_MEMORY(o,p) agp_unbind_memory(p)
-+#elif defined(KERNEL_2_4)
-+#define NV_AGPGART_BACKEND_ACQUIRE(o) ({ (o)->acquire(); 0; })
-+#define NV_AGPGART_BACKEND_ENABLE(o,mode) (o)->enable(mode)
-+#define NV_AGPGART_BACKEND_RELEASE(o) ((o)->release())
-+#define NV_AGPGART_COPY_INFO(o,p) ({ (o)->copy_info(p); 0; })
-+#define NV_AGPGART_ALLOCATE_MEMORY(o,count,type) (o)->allocate_memory(count,type)
-+#define NV_AGPGART_FREE_MEMORY(o,p) (o)->free_memory(p)
-+#define NV_AGPGART_BIND_MEMORY(o,p,offset) (o)->bind_memory(p,offset)
-+#define NV_AGPGART_UNBIND_MEMORY(o,p) (o)->unbind_memory(p)
-+#endif
-+
- #endif /* AGPGART */
- 
- BOOL KernInitAGP(
-@@ -73,8 +99,10 @@
- 
-     memset( (void *) &gart, 0, sizeof(agp_gart));
- 
-+#if defined(KERNEL_2_4)
-     if (!(drm_agp_p = inter_module_get_request("drm_agp", "agpgart")))
-         return 1;
-+#endif
- 
-     /* NOTE: from here down, return an error code of '-1'
-      * that indicates that agpgart is loaded, but we failed to use it
-@@ -82,11 +110,10 @@
-      * the memory controller.
-      */
- 
--    if (drm_agp_p->acquire())
-+    if (NV_AGPGART_BACKEND_ACQUIRE(drm_agp_p))
-     {
--        nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: backend in use\n");
--        inter_module_put("drm_agp");
--        return -1;
-+        nv_printf(NV_DBG_INFO, "NVRM: AGPGART: no backend available\n");
-+        goto bailout;
-     }
- 
-     if (rm_read_registry_dword(nv, "NVreg", "ReqAGPRate", &agp_rate) == RM_ERROR)
-@@ -101,21 +128,12 @@
-         agp_fw = 1;
-     agp_fw &= 0x00000001;
- 
--#if defined(KERNEL_2_4)
--    /*
--     * The original Linux 2.4 AGP GART driver interface declared copy_info to
--     * return nothing. This changed in Linux 2.5, which reports unsupported
--     * chipsets via this function. If this Linux 2.4 kernels behaves the same
--     * way, we have no way to know.
--     */
--    drm_agp_p->copy_info(&agpinfo);
--#else
--    if (drm_agp_p->copy_info(&agpinfo)) {
-+    if (NV_AGPGART_COPY_INFO(drm_agp_p, &agpinfo))
-+    {
-         nv_printf(NV_DBG_ERRORS,
-             "NVRM: AGPGART: kernel reports chipset as unsupported\n");
-         goto failed;
-     }
--#endif
- 
- #ifdef CONFIG_MTRR
-     /*
-@@ -170,7 +188,7 @@
-     if (!(agp_rate & 0x00000004)) agpinfo.mode &= ~0x00000004;
-     if (!(agp_rate & 0x00000002)) agpinfo.mode &= ~0x00000002;
-     
--    drm_agp_p->enable(agpinfo.mode);
-+    NV_AGPGART_BACKEND_ENABLE(drm_agp_p, agpinfo.mode);
- 
-     *ap_phys_base   = (void*) agpinfo.aper_base;
-     *ap_mapped_base = (void*) gart.aperture;
-@@ -182,8 +200,11 @@
- 
- failed:
-     MTRR_DEL(gart); /* checks gart.mtrr */
--    drm_agp_p->release();
-+    NV_AGPGART_BACKEND_RELEASE(drm_agp_p);
-+bailout:
-+#if defined(KERNEL_2_4)
-     inter_module_put("drm_agp");
-+#endif
- 
-     return -1;
- 
-@@ -213,9 +234,10 @@
-         NV_IOUNMAP(gart.aperture, RM_PAGE_SIZE);
-     }
- 
--    drm_agp_p->release();
--
-+    NV_AGPGART_BACKEND_RELEASE(drm_agp_p);
-+#if defined(KERNEL_2_4)
-     inter_module_put("drm_agp");
-+#endif
- 
-     if (rm_clear_agp_bitmap(nv, &bitmap))
-     {
-@@ -244,7 +266,6 @@
-     return RM_ERROR;
- #else
-     agp_memory *ptr;
--    int err;
-     agp_priv_data *data;
-     RM_STATUS status;
- 
-@@ -262,7 +283,7 @@
-         return RM_ERROR;
-     }
- 
--    ptr = drm_agp_p->allocate_memory(PageCount, AGP_NORMAL_MEMORY);
-+    ptr = NV_AGPGART_ALLOCATE_MEMORY(drm_agp_p, PageCount, AGP_NORMAL_MEMORY);
-     if (ptr == NULL)
-     {
-         *pAddress = (void*) 0;
-@@ -270,8 +291,7 @@
-         return RM_ERR_NO_FREE_MEM;
-     }
-     
--    err = drm_agp_p->bind_memory(ptr, *Offset);
--    if (err)
-+    if (NV_AGPGART_BIND_MEMORY(drm_agp_p, ptr, *Offset))
-     {
-         // this happens a lot when the aperture itself fills up..
-         // not a big deal, so don't alarm people with an error message
-@@ -280,14 +300,11 @@
-         goto fail;
-     }
- 
--    /* return the agp aperture address */ 
--    *pAddress = (void *) (agpinfo.aper_base + (*Offset << PAGE_SHIFT));
--
-     status = os_alloc_mem((void **)&data, sizeof(agp_priv_data));
-     if (status != RM_OK)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: memory allocation failed\n");
--        drm_agp_p->unbind_memory(ptr);
-+        NV_AGPGART_UNBIND_MEMORY(drm_agp_p, ptr);
-         goto fail;
-     }
- 
-@@ -302,7 +319,7 @@
-     return RM_OK;
- 
- fail:
--    drm_agp_p->free_memory(ptr);
-+    NV_AGPGART_FREE_MEMORY(drm_agp_p, ptr);
-     *pAddress = (void*) 0;
- 
-     return RM_ERROR;
-@@ -342,7 +359,7 @@
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: unable to remap %lu pages\n",
-             (unsigned long)agp_data->num_pages);
--        drm_agp_p->unbind_memory(agp_data->ptr);
-+        NV_AGPGART_UNBIND_MEMORY(drm_agp_p, agp_data->ptr);
-         goto fail;
-     }
-     
-@@ -441,8 +458,8 @@
-     {
-         size_t pages = ptr->page_count;
- 
--        drm_agp_p->unbind_memory(ptr);
--        drm_agp_p->free_memory(ptr);
-+        NV_AGPGART_UNBIND_MEMORY(drm_agp_p, ptr);
-+        NV_AGPGART_FREE_MEMORY(drm_agp_p, ptr);
- 
-         nv_printf(NV_DBG_INFO, "NVRM: AGPGART: freed %ld pages\n",
-             (unsigned long)pages);
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch
deleted file mode 100644
index f3ce61b31fca..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -ruN nv-6629-jam/usr/src/nv/nv-linux.h nv-6629-jam-2/usr/src/nv/nv-linux.h
---- nv-6629-jam/usr/src/nv/nv-linux.h	2005-01-24 23:16:46.000000000 +0100
-+++ nv-6629-jam-2/usr/src/nv/nv-linux.h	2005-01-26 00:25:10.000000000 +0100
-@@ -930,6 +930,9 @@
- 
-     /* lock for linux-specific alloc queue */
-     struct semaphore at_lock;
-+
-+	/* AGP bridge handle */
-+	struct agp_bridge_data *agp_bridge;
- } nv_linux_state_t;
- 
- 
-diff -ruN nv-6629-jam/usr/src/nv/nv.c nv-6629-jam-2/usr/src/nv/nv.c
---- nv-6629-jam/usr/src/nv/nv.c	2005-01-24 23:16:46.000000000 +0100
-+++ nv-6629-jam-2/usr/src/nv/nv.c	2005-01-26 00:47:14.000000000 +0100
-@@ -3013,18 +3013,19 @@
-             return -1;
-         }
- #elif defined(AGPGART)
--        int error;
-         /*
-          * We can only safely use NvAGP when no backend has been
-          * registered with the AGPGART frontend. This condition
-          * is only met when the acquire function returns -EINVAL.
-          *
-          * Other return codes indicate that a backend is present
-          * and was either acquired, busy or else unavailable.
-          */
--        if ((error = agp_backend_acquire()) != -EINVAL)
-+		nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+		nvl->agp_bridge = agp_backend_acquire(nvl->dev);
-+        if (nvl->agp_bridge)
-         {
--            if (!error) agp_backend_release();
-+            agp_backend_release(nvl->agp_bridge);
-             nv_printf(NV_DBG_WARNINGS,
-                       "NVRM: not using NVAGP, an AGPGART backend is loaded!\n");
-             return -1;
-diff -ruN nv-6629-jam/usr/src/nv/os-agp.c nv-6629-jam-2/usr/src/nv/os-agp.c
---- nv-6629-jam/usr/src/nv/os-agp.c	2005-01-24 23:16:46.000000000 +0100
-+++ nv-6629-jam-2/usr/src/nv/os-agp.c	2005-01-26 00:49:01.000000000 +0100
-@@ -60,23 +60,23 @@
- #endif
- 
- #if defined(KERNEL_2_6)
--#define NV_AGPGART_BACKEND_ACQUIRE(o) agp_backend_acquire()
--#define NV_AGPGART_BACKEND_ENABLE(o,mode) agp_enable(mode)
--#define NV_AGPGART_BACKEND_RELEASE(o) agp_backend_release()
--#define NV_AGPGART_COPY_INFO(o,p) agp_copy_info(p)
--#define NV_AGPGART_ALLOCATE_MEMORY(o,count,type) agp_allocate_memory(count,type)
--#define NV_AGPGART_FREE_MEMORY(o,p) agp_free_memory(p)
--#define NV_AGPGART_BIND_MEMORY(o,p,offset) agp_bind_memory(p,offset)
--#define NV_AGPGART_UNBIND_MEMORY(o,p) agp_unbind_memory(p)
-+#define NV_AGPGART_BACKEND_ACQUIRE(nvl,o) ({ nvl->agp_bridge = agp_backend_acquire(nvl->dev); !nvl->agp_bridge; })
-+#define NV_AGPGART_BACKEND_ENABLE(nvl,o,mode) agp_enable(nvl->agp_bridge,mode)
-+#define NV_AGPGART_BACKEND_RELEASE(nvl,o) agp_backend_release(nvl->agp_bridge)
-+#define NV_AGPGART_COPY_INFO(nvl,o,p) agp_copy_info(nvl->agp_bridge,p)
-+#define NV_AGPGART_ALLOCATE_MEMORY(nvl,o,count,type) agp_allocate_memory(nvl->agp_bridge,count,type)
-+#define NV_AGPGART_FREE_MEMORY(nvl,o,p) agp_free_memory(p)
-+#define NV_AGPGART_BIND_MEMORY(nvl,o,p,offset) agp_bind_memory(p,offset)
-+#define NV_AGPGART_UNBIND_MEMORY(nvl,o,p) agp_unbind_memory(p)
- #elif defined(KERNEL_2_4)
--#define NV_AGPGART_BACKEND_ACQUIRE(o) ({ (o)->acquire(); 0; })
--#define NV_AGPGART_BACKEND_ENABLE(o,mode) (o)->enable(mode)
--#define NV_AGPGART_BACKEND_RELEASE(o) ((o)->release())
--#define NV_AGPGART_COPY_INFO(o,p) ({ (o)->copy_info(p); 0; })
--#define NV_AGPGART_ALLOCATE_MEMORY(o,count,type) (o)->allocate_memory(count,type)
--#define NV_AGPGART_FREE_MEMORY(o,p) (o)->free_memory(p)
--#define NV_AGPGART_BIND_MEMORY(o,p,offset) (o)->bind_memory(p,offset)
--#define NV_AGPGART_UNBIND_MEMORY(o,p) (o)->unbind_memory(p)
-+#define NV_AGPGART_BACKEND_ACQUIRE(nvl,o) ({ (o)->acquire(); 0; })
-+#define NV_AGPGART_BACKEND_ENABLE(nvl,o,mode) (o)->enable(mode)
-+#define NV_AGPGART_BACKEND_RELEASE(nvl,o) ((o)->release())
-+#define NV_AGPGART_COPY_INFO(nvl,o,p) ({ (o)->copy_info(p); 0; })
-+#define NV_AGPGART_ALLOCATE_MEMORY(nvl,o,count,type) (o)->allocate_memory(count,type)
-+#define NV_AGPGART_FREE_MEMORY(nvl,o,p) (o)->free_memory(p)
-+#define NV_AGPGART_BIND_MEMORY(nvl,o,p,offset) (o)->bind_memory(p,offset)
-+#define NV_AGPGART_UNBIND_MEMORY(nvl,o,p) (o)->unbind_memory(p)
- #endif
- 
- #endif /* AGPGART */
-@@ -96,6 +96,7 @@
-     U032  agp_fw;
-     void *bitmap;
-     U032 bitmap_size;
-+	nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
- 
-     memset( (void *) &gart, 0, sizeof(agp_gart));
- 
-@@ -110,7 +111,7 @@
-      * the memory controller.
-      */
- 
--    if (NV_AGPGART_BACKEND_ACQUIRE(drm_agp_p))
-+    if (NV_AGPGART_BACKEND_ACQUIRE(nvl,drm_agp_p))
-     {
-         nv_printf(NV_DBG_INFO, "NVRM: AGPGART: no backend available\n");
-         goto bailout;
-@@ -128,7 +129,7 @@
-         agp_fw = 1;
-     agp_fw &= 0x00000001;
- 
--    if (NV_AGPGART_COPY_INFO(drm_agp_p, &agpinfo))
-+    if (NV_AGPGART_COPY_INFO(nvl,drm_agp_p, &agpinfo))
-     {
-         nv_printf(NV_DBG_ERRORS,
-             "NVRM: AGPGART: kernel reports chipset as unsupported\n");
-@@ -188,7 +189,7 @@
-     if (!(agp_rate & 0x00000004)) agpinfo.mode &= ~0x00000004;
-     if (!(agp_rate & 0x00000002)) agpinfo.mode &= ~0x00000002;
-     
--    NV_AGPGART_BACKEND_ENABLE(drm_agp_p, agpinfo.mode);
-+    NV_AGPGART_BACKEND_ENABLE(nvl,drm_agp_p, agpinfo.mode);
- 
-     *ap_phys_base   = (void*) agpinfo.aper_base;
-     *ap_mapped_base = (void*) gart.aperture;
-@@ -200,7 +201,7 @@
- 
- failed:
-     MTRR_DEL(gart); /* checks gart.mtrr */
--    NV_AGPGART_BACKEND_RELEASE(drm_agp_p);
-+    NV_AGPGART_BACKEND_RELEASE(nvl,drm_agp_p);
- bailout:
- #if defined(KERNEL_2_4)
-     inter_module_put("drm_agp");
-@@ -219,6 +220,7 @@
-     return 1;
- #else
-     void *bitmap;
-+	nv_linux_state_t *nvl;
- 
-     /* sanity check to make sure we should actually be here. */
-     if (!gart.ready)
-@@ -234,7 +236,8 @@
-         NV_IOUNMAP(gart.aperture, RM_PAGE_SIZE);
-     }
- 
--    NV_AGPGART_BACKEND_RELEASE(drm_agp_p);
-+	nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+	NV_AGPGART_BACKEND_RELEASE(nvl,drm_agp_p);
- #if defined(KERNEL_2_4)
-     inter_module_put("drm_agp");
- #endif
-@@ -268,6 +271,7 @@
-     agp_memory *ptr;
-     agp_priv_data *data;
-     RM_STATUS status;
-+	nv_linux_state_t *nvl;
- 
-     if (!gart.ready)
-     {
-@@ -283,7 +287,8 @@
-         return RM_ERROR;
-     }
- 
--    ptr = NV_AGPGART_ALLOCATE_MEMORY(drm_agp_p, PageCount, AGP_NORMAL_MEMORY);
-+	nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    ptr = NV_AGPGART_ALLOCATE_MEMORY(nvl,drm_agp_p, PageCount, AGP_NORMAL_MEMORY);
-     if (ptr == NULL)
-     {
-         *pAddress = (void*) 0;
-@@ -291,7 +296,7 @@
-         return RM_ERR_NO_FREE_MEM;
-     }
-     
--    if (NV_AGPGART_BIND_MEMORY(drm_agp_p, ptr, *Offset))
-+    if (NV_AGPGART_BIND_MEMORY(nvl,drm_agp_p, ptr, *Offset))
-     {
-         // this happens a lot when the aperture itself fills up..
-         // not a big deal, so don't alarm people with an error message
-@@ -304,7 +309,7 @@
-     if (status != RM_OK)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: memory allocation failed\n");
--        NV_AGPGART_UNBIND_MEMORY(drm_agp_p, ptr);
-+        NV_AGPGART_UNBIND_MEMORY(nvl,drm_agp_p, ptr);
-         goto fail;
-     }
- 
-@@ -319,7 +324,7 @@
-     return RM_OK;
- 
- fail:
--    NV_AGPGART_FREE_MEMORY(drm_agp_p, ptr);
-+    NV_AGPGART_FREE_MEMORY(nvl,drm_agp_p, ptr);
-     *pAddress = (void*) 0;
- 
-     return RM_ERROR;
-@@ -359,7 +364,7 @@
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: unable to remap %lu pages\n",
-             (unsigned long)agp_data->num_pages);
--        NV_AGPGART_UNBIND_MEMORY(drm_agp_p, agp_data->ptr);
-+        NV_AGPGART_UNBIND_MEMORY(nvl,drm_agp_p, agp_data->ptr);
-         goto fail;
-     }
-     
-@@ -458,8 +463,8 @@
-     {
-         size_t pages = ptr->page_count;
- 
--        NV_AGPGART_UNBIND_MEMORY(drm_agp_p, ptr);
--        NV_AGPGART_FREE_MEMORY(drm_agp_p, ptr);
-+        NV_AGPGART_UNBIND_MEMORY(nvl,drm_agp_p, ptr);
-+        NV_AGPGART_FREE_MEMORY(nvl,drm_agp_p, ptr);
- 
-         nv_printf(NV_DBG_INFO, "NVRM: AGPGART: freed %ld pages\n",
-             (unsigned long)pages);
-
diff --git a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-7174-1296092.diff b/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-7174-1296092.diff
deleted file mode 100644
index 049c954383bf..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/NVIDIA_kernel-1.0-7174-1296092.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1296092/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1296092/nv-linux.h	2005-06-14 16:55:30.416687848 +0200
-@@ -76,7 +76,7 @@
- #include <asm/page.h>               /* PAGE_OFFSET                      */
- #include <asm/pgtable.h>            /* pte bit definitions              */
- 
--#if defined(NVCPU_X86_64) && defined(KERNEL_2_6)
-+#if defined(NVCPU_X86_64) && defined(KERNEL_2_6) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-diff -ru usr/src/nv/nv.c usr/src/nv.1296092/nv.c
---- usr/src/nv/nv.c	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1296092/nv.c	2005-06-14 16:55:16.745766144 +0200
-@@ -153,6 +153,7 @@
- int           nv_kern_mmap(struct file *, struct vm_area_struct *);
- unsigned int  nv_kern_poll(struct file *, poll_table *);
- int           nv_kern_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
-+long          nv_kern_compat_ioctl(struct file *, unsigned int, unsigned long);
- void          nv_kern_isr_bh(unsigned long);
- irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
- void          nv_kern_rc_timer(unsigned long);
-@@ -209,6 +210,9 @@
-     .owner     = THIS_MODULE,
-     .poll      = nv_kern_poll,
-     .ioctl     = nv_kern_ioctl,
-+#if defined(NVCPU_X86_64) && defined(HAVE_COMPAT_IOCTL)
-+    .compat_ioctl = nv_kern_compat_ioctl,
-+#endif
-     .mmap      = nv_kern_mmap,
-     .open      = nv_kern_open,
-     .release   = nv_kern_close,
-@@ -993,8 +997,10 @@
-     inter_module_register("nv_linux_devices", THIS_MODULE, nv_linux_devices);
- #endif
- 
-+#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION) && !defined(HAVE_COMPAT_IOCTL)
-     /* Register ioctl conversions for 32 bit clients */
-     rm_register_ioctl_conversions();
-+#endif
- 
- #ifdef NV_SWIOTLB
-     // may need a better test than this eventually
-@@ -1154,8 +1160,10 @@
- #endif
-     }
- 
-+#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION) && !defined(HAVE_COMPAT_IOCTL)
-     /* Unregister ioctl conversions for 32 bit clients */
-     rm_unregister_ioctl_conversions();
-+#endif
- 
- #if defined(NV_BUILD_NV_PAT_SUPPORT)
-     if (nv_pat_enabled)
-@@ -1930,6 +1938,15 @@
-     return status;
- }
- 
-+long nv_kern_compat_ioctl(
-+    struct file *file,
-+    unsigned int cmd,
-+    unsigned long i_arg
-+)
-+{
-+    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
-+}
-+
- /*
-  * driver receives an interrupt
-  *    if someone waiting, then hand it off.
-diff -ru usr/src/nv/os-interface.c usr/src/nv.1296092/os-interface.c
---- usr/src/nv/os-interface.c	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1296092/os-interface.c	2005-06-14 16:55:21.366063752 +0200
-@@ -1227,18 +1227,18 @@
- 
- void NV_API_CALL os_register_ioctl32_conversion(U032 cmd, U032 size)
- {
--#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION)
-+#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION) && !defined(HAVE_COMPAT_IOCTL)
-     unsigned int request = _IOWR(NV_IOCTL_MAGIC, cmd, char[size]);
-     register_ioctl32_conversion(request, (void *)sys_ioctl);
--#endif /* NVCPU_X86_64 */
-+#endif
- }
- 
- void NV_API_CALL os_unregister_ioctl32_conversion(U032 cmd, U032 size)
- {
--#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION)
-+#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION) && !defined(HAVE_COMPAT_IOCTL)
-     unsigned int request = _IOWR(NV_IOCTL_MAGIC, cmd, char[size]);
-     unregister_ioctl32_conversion(request);
--#endif /* NVCPU_X86_64 */
-+#endif
- }
- 
- BOOL NV_API_CALL os_pat_supported(void)
diff --git a/media-video/nvidia-kernel/files/1.0.6629/conftest_koutput_includes.patch b/media-video/nvidia-kernel/files/1.0.6629/conftest_koutput_includes.patch
deleted file mode 100644
index 193485bcf497..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/conftest_koutput_includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- conftest.sh.old	2004-11-07 12:20:02.776660256 +1100
-+++ conftest.sh	2004-11-07 12:23:32.432787680 +1100
-@@ -17,7 +17,7 @@
- 
- if [ "$OUTPUT" != "$SOURCES" ]; then
-     CFLAGS="$CFLAGS -I$OUTPUT/include2 -I$OUTPUT/include \
---I$HEADERS -I$HEADERS/asm/mach-default"
-+-I$HEADERS -I$OUTPUT/include2/asm/mach-default"
- else
-     CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/asm/mach-default"
- fi
-@@ -260,8 +260,8 @@
-             echo "installed on your system. If you specified a separate";
-             echo "output directory using either the \"KBUILD_OUTPUT\" or";
-             echo "the \"O\" KBUILD parameter, make sure to specify this";
--            echo "directory with the SYSOUT environment variable or with";
--            echo "the appropriate nvidia-installer command line option.";
-+            echo "directorys _PARENT_ with the KBUILD_OUTPUT_PREFIX";
-+            echo "environment variable, (or see /etc/env.d/05kernel)";
-             echo "";
-             if [ "$VERBOSE" = "full_output" ]; then
-                 echo "*** Unable to determine the target kernel version. ***";
diff --git a/media-video/nvidia-kernel/files/1.0.6629/nv-amd64-shutup-warnings.patch b/media-video/nvidia-kernel/files/1.0.6629/nv-amd64-shutup-warnings.patch
deleted file mode 100644
index 4093f82a330b..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/nv-amd64-shutup-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur NVIDIA-Linux-x86_64-1.0-6629-pkg2.orig/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86_64-1.0-6629-pkg2/usr/src/nv/Makefile.kbuild
---- NVIDIA-Linux-x86_64-1.0-6629-pkg2.orig/usr/src/nv/Makefile.kbuild	2004-11-11 14:55:52.000000000 -0800
-+++ NVIDIA-Linux-x86_64-1.0-6629-pkg2/usr/src/nv/Makefile.kbuild	2004-11-11 14:58:11.000000000 -0800
-@@ -73,7 +73,7 @@
- #
- 
- EXTRA_CFLAGS += -I$(src)
--EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith  -Wno-multichar  -Werror -O -fno-common -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
-+EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wno-multichar  -Werror -O -fno-common -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
- 
- #
- # We rely on these two definitions below; if they aren't set, we set them to
diff --git a/media-video/nvidia-kernel/files/1.0.6629/nv-fix-memory-limit.patch b/media-video/nvidia-kernel/files/1.0.6629/nv-fix-memory-limit.patch
deleted file mode 100644
index 21c68a98aeb0..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/nv-fix-memory-limit.patch
+++ /dev/null
@@ -1,548 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1161283/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1161283/nv-linux.h	2004-11-16 22:56:41.000000000 +0100
-@@ -429,6 +429,30 @@
-         free_pages(ptr, order); \
-     }
- 
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+    {                                                           \
-+        kmem_cache = kmem_cache_create(name, sizeof(type),      \
-+                        0, 0, NULL, NULL);                      \
-+    } 
-+
-+#define NV_KMEM_CACHE_DESTROY(kmem_cache)                       \
-+    {                                                           \
-+        kmem_cache_destroy(kmem_cache);                         \
-+        kmem_cache = NULL;                                      \
-+    } 
-+
-+#define NV_KMEM_CACHE_ALLOC(ptr, kmem_cache, type)              \
-+    {                                                           \
-+        (ptr) = kmem_cache_alloc(kmem_cache, GFP_KERNEL);       \
-+        KM_ALLOC_RECORD(ptr, sizeof(type), "km_cache_alloc");   \
-+    } 
-+
-+#define NV_KMEM_CACHE_FREE(ptr, type, kmem_cache)               \
-+    {                                                           \
-+        KM_FREE_RECORD(ptr, sizeof(type), "km_cache_free");     \
-+        kmem_cache_free(kmem_cache, ptr);                       \
-+    } 
-+
- #endif /* !defined NVWATCH */
- 
- 
-@@ -776,6 +800,9 @@
-     unsigned long   phys_addr;
-     unsigned long   virt_addr;
-     dma_addr_t      dma_addr;
-+#ifdef NV_SG_MAP_BUFFERS
-+    struct scatterlist sg_list;
-+#endif
- #ifdef CONFIG_SWIOTLB
-     unsigned long   orig_phys_addr;
-     unsigned long   orig_virt_addr;
-@@ -789,15 +816,11 @@
-     unsigned int   num_pages;
-     unsigned int   order;
-     unsigned int   size;
--    nv_pte_t      *page_table;          /* list of physical pages allocated */
-+    nv_pte_t     **page_table;          /* list of physical pages allocated */
-     void          *key_mapping;         /* mapping used as a key for finding this nv_alloc_t */
-                                         /*   may be the same as page_table                   */
-     unsigned int   class;
-     void          *priv_data;
--#if defined(NV_SG_MAP_BUFFERS)
--    struct pci_dev *dev;
--    struct scatterlist *sg_list;        /* list of physical pages allocated */
--#endif
- } nv_alloc_t;
- 
- 
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.1161283/nv-vm.c
---- usr/src/nv/nv-vm.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1161283/nv-vm.c	2004-11-16 22:56:41.000000000 +0100
-@@ -138,13 +138,18 @@
-  */
- 
- int nv_vm_malloc_pages(
--    nv_alloc_t       *at
-+    nv_state_t *nv,
-+    nv_alloc_t *at
- )
- {
-     /* point page_ptr at the start of the actual page list */
--    nv_pte_t *page_ptr = at->page_table;
-+    nv_pte_t *page_ptr = *at->page_table;
-     int i;
-     unsigned long virt_addr = 0, phys_addr;
-+#if defined(NV_SG_MAP_BUFFERS)
-+    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    struct pci_dev *dev = nvl->dev;
-+#endif
- 
-     nv_printf(NV_DBG_MEMINFO, "NVRM: VM: nv_vm_malloc_pages: %d pages\n",
-         at->num_pages);
-@@ -175,7 +180,7 @@
-         // for amd 64-bit platforms, remap pages to make them 32-bit addressable
-         // in this case, we need the final remapping to be contiguous, so we
-         // have to do the whole mapping at once, instead of page by page
--        if (nv_sg_map_buffer(at->dev, &at->sg_list[0],
-+        if (nv_sg_map_buffer(dev, &at->page_table[0]->sg_list,
-                              (void *) virt_addr, at->num_pages))
-         {
-             nv_printf(NV_DBG_ERRORS,
-@@ -224,7 +229,7 @@
-         /* lock the page for dma purposes */
-         SetPageReserved(NV_GET_PAGE_STRUCT(phys_addr));
- 
--        page_ptr = &at->page_table[i];
-+        page_ptr = at->page_table[i];
-         page_ptr->phys_addr = phys_addr;
-         page_ptr->virt_addr = virt_addr;
-         page_ptr->dma_addr = page_ptr->phys_addr;
-@@ -235,7 +240,7 @@
- #if defined(NV_SG_MAP_BUFFERS)
-         if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
-         {
--            if (nv_sg_map_buffer(at->dev, &at->sg_list[i], 
-+            if (nv_sg_map_buffer(dev, &at->page_table[i]->sg_list, 
-                                  __va(page_ptr->phys_addr), 1))
-             {
-                 nv_printf(NV_DBG_ERRORS,
-@@ -243,7 +248,7 @@
-                 goto failed;
-             }
-         }
--        nv_sg_load(&at->sg_list[i], page_ptr);
-+        nv_sg_load(&at->page_table[i]->sg_list, page_ptr);
- #endif
-         virt_addr += PAGE_SIZE;
-     }
-@@ -258,7 +263,7 @@
- 
-     for (; i >= 0; i--)
-     {
--        page_ptr = &at->page_table[i];
-+        page_ptr = at->page_table[i];
- 
-         // if we failed when allocating this page, skip over it
-         // but if we failed pci_map_sg, make sure to free this page
-@@ -267,7 +272,7 @@
-             NV_UNLOCK_PAGE(page_ptr);
- #if defined(NV_SG_MAP_BUFFERS)
-             if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
--                nv_sg_unmap_buffer(at->dev, &at->sg_list[i], page_ptr);
-+                nv_sg_unmap_buffer(dev, &at->page_table[i]->sg_list, page_ptr);
- #endif
-             if (!NV_ALLOC_MAPPING_CACHED(at->flags))
-                 NV_SET_PAGE_ATTRIB_CACHED(page_ptr);
-@@ -279,15 +284,15 @@
- 
-     if (NV_ALLOC_MAPPING_CONTIG(at->flags))
-     {
--        page_ptr = at->page_table;
-+        page_ptr = *at->page_table;
- #if defined(NV_SG_MAP_BUFFERS)
--        nv_sg_unmap_buffer(at->dev, &at->sg_list[0], page_ptr);
-+        nv_sg_unmap_buffer(dev, &at->page_table[0]->sg_list, page_ptr);
- #endif
-         NV_FREE_PAGES(page_ptr->virt_addr, at->order);
-     }
-     else if (NV_ALLOC_MAPPING_VMALLOC(at->flags))
-     {
--        page_ptr = at->page_table;
-+        page_ptr = *at->page_table;
-         NV_VFREE((void *) page_ptr->virt_addr, at->size);
-     }
- 
-@@ -296,7 +301,7 @@
- 
- // unlock the pages we've locked down for dma purposes
- void nv_vm_unlock_pages(
--    nv_alloc_t       *at
-+    nv_alloc_t *at
- )
- {
-     nv_pte_t *page_ptr;
-@@ -315,17 +320,22 @@
- 
-     for (i = 0; i < at->num_pages; i++)
-     {
--        page_ptr = &at->page_table[i];
-+        page_ptr = at->page_table[i];
-         NV_UNLOCK_PAGE(page_ptr);
-     }
- }
- 
- void nv_vm_free_pages(
--    nv_alloc_t       *at
-+    nv_state_t *nv,
-+    nv_alloc_t *at
- )
- {
-     nv_pte_t *page_ptr;
-     int i;
-+#if defined(NV_SG_MAP_BUFFERS)
-+    nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    struct pci_dev *dev = nvl->dev;
-+#endif
- 
-     nv_printf(NV_DBG_MEMINFO, "NVRM: VM: nv_vm_free_pages: %d pages\n",
-         at->num_pages);
-@@ -339,10 +349,10 @@
- 
-     for (i = 0; i < at->num_pages; i++)
-     {
--        page_ptr = &at->page_table[i];
-+        page_ptr = at->page_table[i];
- #if defined(NV_SG_MAP_BUFFERS)
-         if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
--            nv_sg_unmap_buffer(at->dev, &at->sg_list[i], page_ptr);
-+            nv_sg_unmap_buffer(dev, &at->page_table[i]->sg_list, page_ptr);
- #endif
-         if (!NV_ALLOC_MAPPING_CACHED(at->flags))
-             NV_SET_PAGE_ATTRIB_CACHED(page_ptr);
-@@ -353,15 +363,15 @@
- 
-     if (NV_ALLOC_MAPPING_CONTIG(at->flags))
-     {
--        page_ptr = at->page_table;
-+        page_ptr = *at->page_table;
- #if defined(NV_SG_MAP_BUFFERS)
--        nv_sg_unmap_buffer(at->dev, &at->sg_list[0], page_ptr);
-+        nv_sg_unmap_buffer(dev, &at->page_table[0]->sg_list, page_ptr);
- #endif
-         NV_FREE_PAGES(page_ptr->virt_addr, at->order);
-     }
-     else if (NV_ALLOC_MAPPING_VMALLOC(at->flags))
-     {
--        page_ptr = at->page_table;
-+        page_ptr = *at->page_table;
-         NV_VFREE((void *) page_ptr->virt_addr, at->size);
-     }
- }
-diff -ru usr/src/nv/nv-vm.h usr/src/nv.1161283/nv-vm.h
---- usr/src/nv/nv-vm.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1161283/nv-vm.h	2004-11-16 22:56:41.000000000 +0100
-@@ -11,9 +11,9 @@
- #ifndef _NV_VM_H_
- #define _NV_VM_H_
- 
--int      nv_vm_malloc_pages(nv_alloc_t *);
-+int      nv_vm_malloc_pages(nv_state_t *, nv_alloc_t *);
- void     nv_vm_unlock_pages(nv_alloc_t *);
--void     nv_vm_free_pages(nv_alloc_t *);
-+void     nv_vm_free_pages(nv_state_t *, nv_alloc_t *);
- 
- #if defined(NV_DBG_MEM)
- void     nv_vm_list_page_count(nv_pte_t *, unsigned long);
-@@ -21,11 +21,12 @@
- #define  nv_vm_list_page_count(page_ptr, num_pages)
- #endif
- 
--#define nv_vm_unlock_and_free_pages(at_count, at) \
--    if (at->page_table) {                         \
--        if (at_count == 0)                        \
--            nv_vm_unlock_pages(at);               \
--        nv_vm_free_pages(at);                     \
-+#define NV_VM_UNLOCK_AND_FREE_PAGES(nv, at_count, at)   \
-+    if (at->page_table)                                 \
-+    {                                                   \
-+        if (at_count == 0)                              \
-+            nv_vm_unlock_pages(at);                     \
-+        nv_vm_free_pages(nv, at);                       \
-     }
- 
- #endif
-diff -ru usr/src/nv/nv.c usr/src/nv.1161283/nv.c
---- usr/src/nv/nv.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1161283/nv.c	2004-11-16 22:57:24.000000000 +0100
-@@ -63,6 +63,8 @@
- int nv_swiotlb = 0;
- #endif
- 
-+static kmem_cache_t *nv_pte_t_cache = NULL;
-+
- // allow an easy way to convert all debug printfs related to events
- // back and forth between 'info' and 'errors'
- #if defined(NV_DBG_EVENTS)
-@@ -266,42 +268,41 @@
- )
- {
-     nv_alloc_t *at;
--    int pt_size;
-+    unsigned int pt_size, i;
- 
-     NV_KMALLOC(at, sizeof(nv_alloc_t));
-     if (at == NULL)
-     {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to allocate alloc_t\n");
-+        nv_printf(NV_DBG_ERRORS, "NVRM: failed to allocate alloc info\n");
-         return NULL;
-     }
- 
-     memset(at, 0, sizeof(nv_alloc_t));
- 
--    pt_size = num_pages *  sizeof(nv_pte_t);
--    NV_KMALLOC(at->page_table, pt_size);
--    if (at->page_table == NULL)
-+    pt_size = num_pages *  sizeof(nv_pte_t *);
-+    if (os_alloc_mem((void **)&at->page_table, pt_size) != RM_OK)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: failed to allocate page table\n");
-         NV_KFREE(at, sizeof(nv_alloc_t));
-         return NULL;
-     }
-+
-     memset(at->page_table, 0, pt_size);
-     at->num_pages = num_pages;
-     NV_ATOMIC_SET(at->usage_count, 0);
- 
--#if defined(NV_SG_MAP_BUFFERS)
--    at->dev = dev;
--    pt_size = num_pages * sizeof(struct scatterlist);
--    NV_KMALLOC(at->sg_list, pt_size);
--    if (at->sg_list == NULL)
-+    for (i = 0; i < at->num_pages; i++)
-     {
--        nv_printf(NV_DBG_ERRORS, "NVRM: failed to allocate scatter gather list\n");
--        NV_KFREE(at->page_table, pt_size);
--        NV_KFREE(at, sizeof(nv_alloc_t));
--        return NULL;
-+        NV_KMEM_CACHE_ALLOC(at->page_table[i], nv_pte_t_cache, nv_pte_t);
-+        if (at->page_table[i] == NULL)
-+        {
-+            nv_printf(NV_DBG_ERRORS,
-+                      "NVRM: failed to allocate page table entry\n");
-+            nvos_free_alloc(at);
-+            return NULL;
-+        }
-+        memset(at->page_table[i], 0, sizeof(nv_pte_t));
-     }
--    memset(at->sg_list, 0, pt_size);
--#endif
- 
-     return at;
- }
-@@ -311,6 +312,8 @@
-     nv_alloc_t *at
- )
- {
-+    unsigned int pt_size, i;
-+
-     if (at == NULL)
-         return -1;
- 
-@@ -320,13 +323,16 @@
-     // we keep the page_table around after freeing the pages
-     // for bookkeeping reasons. Free the page_table and assume
-     // the underlying pages are already unlocked and freed.
--    if (at->page_table)
--        NV_KFREE(at->page_table, at->num_pages * sizeof(nv_pte_t));
--
--#if defined(NV_SG_MAP_BUFFERS)
--    if (at->sg_list)
--        NV_KFREE(at->sg_list, at->num_pages * sizeof(struct scatterlist));
--#endif
-+    if (at->page_table != NULL)
-+    {
-+        for (i = 0; i < at->num_pages; i++)
-+        {
-+            if (at->page_table[i] != NULL)
-+                NV_KMEM_CACHE_FREE(at->page_table[i], nv_pte_t, nv_pte_t_cache);
-+        }
-+        pt_size = at->num_pages * sizeof(nv_pte_t *);
-+        os_free_mem(at->page_table);
-+    }
- 
-     NV_KFREE(at, sizeof(nv_alloc_t));
- 
-@@ -594,7 +600,7 @@
-             int i;
-             for (i = 0; i < at->num_pages; i++)
-             {
--                unsigned long offset = at->page_table[i].phys_addr;
-+                unsigned long offset = at->page_table[i]->phys_addr;
-                 if ((address >= offset) &&
-                     (address < (offset + PAGE_SIZE)))
-                     return at;
-@@ -931,6 +937,13 @@
-     }
- #endif
- 
-+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t);
-+    if (nv_pte_t_cache == NULL)
-+    {
-+        nv_printf(NV_DBG_ERRORS, "NVRM: pte cache allocation failed\n");
-+        goto failed;
-+    }
-+ 
-     // Init the resource manager
-     if (!rm_init_rm())
-     {
-@@ -972,6 +985,14 @@
-     return 0;
- 
- failed:
-+    if (nv_pte_t_cache != NULL)
-+        NV_KMEM_CACHE_DESTROY(nv_pte_t_cache);
-+
-+#if defined(NV_PM_SUPPORT_APM)
-+    for (i = 0; i < num_nv_devices; i++)
-+        if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
-+#endif
-+
- #ifdef CONFIG_DEVFS_FS
-     NV_DEVFS_REMOVE_CONTROL();
-     for (i = 0; i < num_nv_devices; i++)
-@@ -1101,6 +1122,8 @@
-     nv_printf(NV_DBG_ERRORS, "NVRM: final mem usage: vm 0x%x km 0x%x fp 0x%x\n",
-         vm_usage, km_usage, fp_usage);
- #endif
-+
-+    NV_KMEM_CACHE_DESTROY(nv_pte_t_cache);
- }
- 
- module_init(nvidia_init_module);
-@@ -1249,15 +1272,15 @@
-     index = (address - vma->vm_start)>>PAGE_SHIFT;
- 
-     // save that index into our page list (make sure it doesn't already exist)
--    if (at->page_table[index].phys_addr)
-+    if (at->page_table[index]->phys_addr)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: page slot already filled in nopage handler!\n");
-         os_dbg_breakpoint();
-     }
- 
--    at->page_table[index].phys_addr = (page_to_pfn(page_ptr) << PAGE_SHIFT);
--    at->page_table[index].dma_addr  = (page_to_pfn(page_ptr) << PAGE_SHIFT);
--    at->page_table[index].virt_addr = (unsigned long) __va(page_to_pfn(page_ptr) << PAGE_SHIFT);
-+    at->page_table[index]->phys_addr = (page_to_pfn(page_ptr) << PAGE_SHIFT);
-+    at->page_table[index]->dma_addr  = (page_to_pfn(page_ptr) << PAGE_SHIFT);
-+    at->page_table[index]->virt_addr = (unsigned long) __va(page_to_pfn(page_ptr) << PAGE_SHIFT);
- 
-     return page_ptr;
- #endif
-@@ -1670,7 +1693,7 @@
-         start = vma->vm_start;
-         while (pages--)
-         {
--            page = (unsigned long) at->page_table[i++].phys_addr;
-+            page = (unsigned long) at->page_table[i++]->phys_addr;
-             if (NV_REMAP_PAGE_RANGE(start, page, PAGE_SIZE, vma->vm_page_prot))
-                 return -EAGAIN;
-             start += PAGE_SIZE;
-@@ -2368,8 +2391,8 @@
- 
-         for (i = 0; i < at->num_pages; i++)
-         {
--            if (address == at->page_table[i].phys_addr)
--                return (void *)(at->page_table[i].virt_addr + offset);
-+            if (address == at->page_table[i]->phys_addr)
-+                return (void *)(at->page_table[i]->virt_addr + offset);
-         }
-     }
- 
-@@ -2400,8 +2423,8 @@
- 
-         for (i = 0; i < at->num_pages; i++)
-         {
--            if (address == at->page_table[i].phys_addr)
--                return (unsigned long)at->page_table[i].dma_addr + offset;
-+            if (address == at->page_table[i]->phys_addr)
-+                return (unsigned long)at->page_table[i]->dma_addr + offset;
-         }
-     }
- 
-@@ -2427,9 +2450,9 @@
-             unsigned long address = dma_address & PAGE_MASK;
-             for (i = 0; i < at->num_pages; i++)
-             {
--                if (address == at->page_table[i].dma_addr)
-+                if (address == at->page_table[i]->dma_addr)
-                 {
--                    return at->page_table[i].phys_addr + offset;
-+                    return at->page_table[i]->phys_addr + offset;
-                 }
-             }
-         }
-@@ -2466,7 +2489,7 @@
-         int i;
-         for (i = 0; i < at->num_pages; i++)
-         {
--            if (address == (unsigned long) at->page_table[i].dma_addr)
-+            if (address == (unsigned long) at->page_table[i]->dma_addr)
-             {
-                 return (void *)((unsigned long) at->key_mapping + 
-                     (i * PAGE_SIZE));
-@@ -2630,7 +2653,7 @@
-             nvl_add_alloc(nvl, at);
-         } else {
-             /* use nvidia's nvagp support */
--            if (nv_vm_malloc_pages(at))
-+            if (nv_vm_malloc_pages(nv, at))
-                 goto failed;
- 
-             at->class = class;
-@@ -2654,7 +2677,7 @@
-             if (rm_status)
-             {
-                 nvl_remove_alloc(nvl, at);
--                nv_vm_unlock_and_free_pages(NV_ATOMIC_READ(at->usage_count), at);
-+                NV_VM_UNLOCK_AND_FREE_PAGES(nv, NV_ATOMIC_READ(at->usage_count), at);
-                 goto failed;
-             }
-             at->priv_data = *priv_data;
-@@ -2666,12 +2689,12 @@
-     else 
-     {
- 
--        if (nv_vm_malloc_pages(at))
-+        if (nv_vm_malloc_pages(nv, at))
-             goto failed;
- 
-         if (kernel)
-         {
--            *pAddress = (void *) at->page_table[0].virt_addr;
-+            *pAddress = (void *) at->page_table[0]->virt_addr;
-         }
-         else
-         {
-@@ -2679,7 +2702,7 @@
-              * so use the first page, which is page-aligned. this way, our 
-              * allocated page table does not need to be page-aligned
-              */
--            *pAddress = (void *) at->page_table[0].phys_addr;
-+            *pAddress = (void *) at->page_table[0]->phys_addr;
-         }
- 
-         nvl_add_alloc(nvl, at);
-@@ -2743,7 +2766,7 @@
-             rmStatus = rm_free_agp_pages(nv, pAddress, priv_data);
-             if (rmStatus == RM_OK)
-             {
--                nv_vm_unlock_and_free_pages(NV_ATOMIC_READ(at->usage_count), at);
-+                NV_VM_UNLOCK_AND_FREE_PAGES(nv, NV_ATOMIC_READ(at->usage_count), at);
-             }
-         }
-     } else {
-@@ -2759,7 +2782,7 @@
- 
-         NV_ATOMIC_DEC(at->usage_count);
- 
--        nv_vm_unlock_and_free_pages(NV_ATOMIC_READ(at->usage_count), at);
-+        NV_VM_UNLOCK_AND_FREE_PAGES(nv, NV_ATOMIC_READ(at->usage_count), at);
-     }
- 
-     if (NV_ATOMIC_READ(at->usage_count) == 0)
-@@ -3065,7 +3088,7 @@
-     }
- 
-     /* get the physical address of this page */
--    *paddr = (U032) ((NV_UINTPTR_T)at->page_table[index].dma_addr);
-+    *paddr = (U032) ((NV_UINTPTR_T)at->page_table[index]->dma_addr);
- 
-     return RM_OK;
- }
diff --git a/media-video/nvidia-kernel/files/1.0.6629/nv-pgd_offset.patch b/media-video/nvidia-kernel/files/1.0.6629/nv-pgd_offset.patch
deleted file mode 100644
index 8c6029fdb709..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/nv-pgd_offset.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -urpN nv.orig/Makefile.kbuild nv/Makefile.kbuild
---- nv.orig/Makefile.kbuild	2004-11-09 20:27:54.012160376 +0200
-+++ nv/Makefile.kbuild	2004-11-09 20:52:59.256328480 +0200
-@@ -168,6 +168,10 @@ ifeq ($(shell echo $(NV_BUILD_NV_PAT_SUP
- CFLAGS += -DNV_BUILD_NV_PAT_SUPPORT
- endif
- 
-+ifeq ($(shell $(CONFTEST) pgd_offset), pml4)
-+  EXTRA_CFLAGS += -DPML4_PGD_OFFSET
-+endif
-+
- ifeq ($(shell $(CONFTEST) remap_pfn_range), 1)
-   EXTRA_CFLAGS += -DNV_REMAP_PFN_RANGE_PRESENT
- else
-diff -urpN nv.orig/conftest.sh nv/conftest.sh
---- nv.orig/conftest.sh	2004-11-09 20:27:54.012160376 +0200
-+++ nv/conftest.sh	2004-11-09 20:58:16.565090216 +0200
-@@ -23,6 +23,35 @@ else
- fi
- 
- case "$4" in
-+    pgd_offset)
-+        #
-+        # Determine if we have pgd_offset, or pml4_pgd_offset.
-+        #
-+
-+        # Not a very good test, but seems to do the trick
-+        echo "#include <linux/mm.h>
-+        #include <asm/pgtable.h>
-+        int do_test_pgd_offset(void) {
-+          unsigned long addr = (unsigned long)0;
-+          pml4_t *pml4 = pml4_offset_k(addr);
-+          pgd_t *pgd;
-+
-+          pgd = pml4_pgd_offset(pml4, addr);
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+          echo "pml4"
-+          rm -f conftest$$.o
-+          exit 0
-+        else
-+          echo "pgd"
-+          exit 0
-+        fi
-+    ;;
-+
-     remap_page_range)
-         #
-         # Determine the number of arguments expected by remap_page_range.
-diff -urpN nv.orig/nv-linux.h nv/nv-linux.h
---- nv.orig/nv-linux.h	2004-11-09 20:27:54.011160528 +0200
-+++ nv/nv-linux.h	2004-11-09 20:51:44.240732584 +0200
-@@ -615,6 +615,28 @@ typedef struct agp_memory agp_memory;
- #define NV_UNREGISTER_CHRDEV(x...)  unregister_chrdev(x)
- #endif
- 
-+#if defined(PML4_PGD_OFFSET)
-+#define NV_PGD_OFFSET(mm, x...) \
-+	({ \
-+            pgd_t *pgd = NULL; \
-+            pml4_t *pml4 = pml4_offset(mm, x); \
-+            if (!pml4_none(*pml4)) \
-+                pgd = pml4_pgd_offset(pml4, address); \
-+            pgd; \
-+	})
-+#define NV_PGD_OFFSET_K(x...) \
-+        ({ \
-+            pgd_t *pgd = NULL; \
-+            pml4_t *pml4 = pml4_offset_k(x); \
-+            if (!pml4_none(*pml4)) \
-+                pgd = pml4_pgd_offset_k(pml4, address); \
-+            pgd; \
-+        })
-+#else
-+#define NV_PGD_OFFSET(mm, x...)     pgd_offset(mm, x)
-+#define NV_PGD_OFFSET_K(x...)       pgd_offset_k(x)
-+#endif
-+
- #if defined(NV_REMAP_PFN_RANGE_PRESENT)
- #define NV_REMAP_PAGE_RANGE(from, offset, x...) \
-      remap_pfn_range(vma, from, ((offset) >> PAGE_SHIFT), x)
-diff -urpN nv.orig/nv.c nv/nv.c
---- nv.orig/nv.c	2004-11-09 20:27:54.010160680 +0200
-+++ nv/nv.c	2004-11-09 20:28:37.045618296 +0200
-@@ -2500,8 +2500,8 @@ _get_phys_address(
-     mm = (kern) ? &init_mm : current->mm;
-     spin_lock(&mm->page_table_lock);
- 
--    if (kern) pg_dir = pgd_offset_k(address);
--    else pg_dir = pgd_offset(mm, address);
-+    if (kern) pg_dir = NV_PGD_OFFSET_K(address);
-+    else pg_dir = NV_PGD_OFFSET(mm, address);
- 
-     if (!pg_dir || pgd_none(*pg_dir))
-         goto failed;
diff --git a/media-video/nvidia-kernel/files/1.0.6629/nv-pgprot-speedup.patch b/media-video/nvidia-kernel/files/1.0.6629/nv-pgprot-speedup.patch
deleted file mode 100644
index ee5707156598..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/nv-pgprot-speedup.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1155389/nv-linux.h
---- usr/src/nv/nv-linux.h	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1155389/nv-linux.h	2004-11-04 11:47:05.000000000 +0100
-@@ -729,12 +729,21 @@
-         return order;
-     }
- 
-+/* mark memory UC-, rather than UC (don't use _PAGE_PWT) */
-+static inline pgprot_t pgprot_noncached_weak(pgprot_t old_prot)
-+    {
-+        pgprot_t new_prot = old_prot;
-+        if (boot_cpu_data.x86 > 3)
-+            new_prot = __pgprot(pgprot_val(old_prot) | _PAGE_PCD);
-+        return new_prot;
-+    }
-+
- #if !defined (pgprot_noncached)
- static inline pgprot_t pgprot_noncached(pgprot_t old_prot)
-     {
-         pgprot_t new_prot = old_prot;
-         if (boot_cpu_data.x86 > 3)
--            new_prot = __pgprot(pgprot_val(old_prot) | _PAGE_PCD);
-+            new_prot = __pgprot(pgprot_val(old_prot) | _PAGE_PCD | _PAGE_PWT);
-         return new_prot;
-     }
- #endif
-diff -ru usr/src/nv/nv.c usr/src/nv.1155389/nv.c
---- usr/src/nv/nv.c	2004-11-03 22:53:00.000000000 +0100
-+++ usr/src/nv.1155389/nv.c	2004-11-04 11:47:05.000000000 +0100
-@@ -1551,7 +1551,7 @@
-     /* NV fb space */
-     else if (IS_FB_OFFSET(nv, NV_VMA_OFFSET(vma), vma->vm_end - vma->vm_start))
-     {
--        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-+        vma->vm_page_prot = pgprot_noncached_weak(vma->vm_page_prot);
-         if (NV_REMAP_PAGE_RANGE(vma->vm_start,
-                              NV_VMA_OFFSET(vma),
-                              vma->vm_end - vma->vm_start,
diff --git a/media-video/nvidia-kernel/files/1.0.6629/nv-shutup-warnings.patch b/media-video/nvidia-kernel/files/1.0.6629/nv-shutup-warnings.patch
deleted file mode 100644
index 851d40a1faa8..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/nv-shutup-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN nv.orig/Makefile.kbuild nv/Makefile.kbuild
---- nv.orig/Makefile.kbuild	2004-11-09 20:27:54.012160376 +0200
-+++ nv/Makefile.kbuild	2004-11-09 20:52:59.256328480 +0200
-@@ -73,7 +73,7 @@ endif
- #
- 
- EXTRA_CFLAGS += -I$(src)
--EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith  -Wno-multichar  -Werror -O -fno-common -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
-+EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wno-multichar  -Werror -O -fno-common -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
- 
- #
- # We rely on these two definitions below; if they aren't set, we set them to
diff --git a/media-video/nvidia-kernel/files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch b/media-video/nvidia-kernel/files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch
deleted file mode 100644
index bfdfb62ec8b9..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/nv-vm_flags-no-VM_LOCKED.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 1/nv.c	2004-11-14 20:29:48.000000000 +0200
-+++ 2/nv.c	2004-11-14 20:30:23.372332944 +0200
-@@ -1606,7 +1606,7 @@ int nv_kern_mmap(
- 
-         /* prevent the swapper from swapping it out */
-         /* mark the memory i/o so the buffers aren't dumped on core dumps */
--        vma->vm_flags |= (VM_LOCKED | VM_IO);
-+        vma->vm_flags |= VM_IO;
-     }
- 
-     /* Magic allocator */
-@@ -1680,7 +1680,7 @@ int nv_kern_mmap(
- 
-         /* prevent the swapper from swapping it out */
-         /* mark the memory i/o so the buffers aren't dumped on core dumps */
--        vma->vm_flags |= (VM_IO | VM_LOCKED);
-+        vma->vm_flags |= VM_IO;
-     }
- 
-     vma->vm_file = file;
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch
deleted file mode 100644
index f85b7b1c1d76..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1233959.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru usr/src/nv/os-agp.c usr/src/nv.1233959/os-agp.c
---- usr/src/nv/os-agp.c	2005-02-25 18:37:02.000000000 +0100
-+++ usr/src/nv.1233959/os-agp.c	2005-03-07 20:57:17.235559352 +0100
-@@ -176,7 +176,7 @@
-     rm_read_registry_dword(NULL, "NVreg", "EnableAGPFW", &enable_fw);
-     agp_mode |= NV_AGPGART_MODE_BITS_SBA(enable_fw);
- 
--    agp_info.mode &= agp_mode;
-+    agp_info.mode &= (0xff000000 | agp_mode);
-     NV_AGPGART_BACKEND_ENABLE(drm_agp_p, nvl->agp_bridge, agp_info.mode);
- 
- 
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch
deleted file mode 100644
index 38088799f5ae..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru usr/src/nv/nv.c usr/src/nv.1237815/nv.c
---- usr/src/nv/nv.c	2005-02-25 18:37:02.000000000 +0100
-+++ usr/src/nv.1237815/nv.c	2005-03-11 17:29:49.034335416 +0100
-@@ -3071,14 +3071,15 @@
-             nv_printf(NV_DBG_WARNINGS, "NVRM: not using NVAGP, AGPGART is loaded!\n");
-             return status;
-         }
--#elif defined(NV_MULTIPLE_BRIDGE_AGPGART_PRESENT)
-+#elif defined(AGPGART)
-+#if defined(NV_MULTIPLE_BRIDGE_AGPGART_PRESENT)
-         if (!list_empty(&agp_bridges))
-         {
-             nv_printf(NV_DBG_WARNINGS,
-                       "NVRM: not using NVAGP, an AGPGART backend is loaded!\n");
-             return status;
-         }
--#elif defined(AGPGART)
-+#else /* NV_MULTIPLE_BRIDGE_AGPGART_PRESENT */
-         int error;
-         /*
-          * We can only safely use NvAGP when no backend has been
-@@ -3096,6 +3097,7 @@
-             return status;
-         }
- #endif
-+#endif /* AGPGART  */
- #if defined(CONFIG_X86_64) && defined(CONFIG_GART_IOMMU)
-         nv_printf(NV_DBG_WARNINGS,
-             "NVRM: not using NVAGP, kernel was compiled with GART_IOMMU support!!\n");
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch
deleted file mode 100644
index bd75515c50c8..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN nv.orig/Makefile.kbuild nv/Makefile.kbuild
---- nv.orig/Makefile.kbuild	2004-11-09 20:27:54.012160376 +0200
-+++ nv/Makefile.kbuild	2004-11-09 20:52:59.256328480 +0200
-@@ -73,7 +73,7 @@ endif
- #
- 
- EXTRA_CFLAGS += -I$(src)
--EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith  -Wno-multichar  -Werror -O -fno-common -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
-+EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wno-multichar  -Werror -O -fno-common -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
- 
- #
- # We rely on these two definitions below; if they aren't set, we set them to
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch
deleted file mode 100644
index ad408f3ec7ff..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 1/conftest.sh	2004-11-07 12:20:02.776660256 +1100
-+++ 2/conftest.sh	2004-11-07 12:23:32.432787680 +1100
-@@ -17,7 +17,7 @@
- 
- if [ "$OUTPUT" != "$SOURCES" ]; then
-     CFLAGS="$CFLAGS -I$OUTPUT/include2 -I$OUTPUT/include \
---I$HEADERS -I$HEADERS/asm/mach-default"
-+-I$HEADERS -I$OUTPUT/include2/asm/mach-default"
- else
-     CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/asm/mach-default"
- fi
-@@ -260,8 +260,8 @@
-             echo "installed on your system. If you specified a separate";
-             echo "output directory using either the \"KBUILD_OUTPUT\" or";
-             echo "the \"O\" KBUILD parameter, make sure to specify this";
--            echo "directory with the SYSOUT environment variable or with";
--            echo "the appropriate nvidia-installer command line option.";
-+            echo "directorys _PARENT_ with the KBUILD_OUTPUT_PREFIX";
-+            echo "environment variable, (or see /etc/env.d/05kernel)";
-             echo "";
-             if [ "$VERBOSE" = "full_output" ]; then
-                 echo "*** Unable to determine the target kernel version. ***";
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch
deleted file mode 100644
index a82a147f2658..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN nv.orig/Makefile.kbuild nv/Makefile.kbuild
---- nv.orig/Makefile.kbuild	2004-11-09 20:27:54.012160376 +0200
-+++ nv/Makefile.kbuild	2004-11-09 20:52:59.256328480 +0200
-@@ -73,7 +73,7 @@ endif
- #
- 
- EXTRA_CFLAGS += -I$(src)
--EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith  -Wno-multichar  -Werror -O -fno-common -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
-+EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wno-multichar  -Werror -O -fno-common -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
- 
- #
- # We rely on these two definitions below; if they aren't set, we set them to
diff --git a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1258475.diff b/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1258475.diff
deleted file mode 100644
index a6468094ea13..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1258475.diff
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1258475/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1258475/nv-linux.h	2005-05-05 19:06:45.237118320 +0200
-@@ -200,7 +200,6 @@
-  */
- #if defined(CONFIG_SWIOTLB)
- #define NV_SWIOTLB 1
--#define NV_SWIOTLB_MAX_RETRIES 16
- extern int nv_swiotlb;
- #endif
- 
-@@ -1053,6 +1052,31 @@
-     }
- 
- #if defined(NV_SG_MAP_BUFFERS)
-+
-+static inline int nv_map_sg(struct pci_dev *dev, struct scatterlist *sg)
-+    {
-+        int ret;
-+#if defined(KERNEL_2_6) && defined(CONFIG_SWIOTLB)
-+        if (swiotlb)
-+            ret = swiotlb_map_sg(&dev->dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
-+        else
-+#endif
-+            ret = pci_map_sg(dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
-+        return ret;
-+    }
-+
-+static inline void nv_unmap_sg(struct pci_dev *dev, struct scatterlist *sg)
-+    {
-+#if defined(KERNEL_2_6) && defined(CONFIG_SWIOTLB)
-+        if (swiotlb)
-+            swiotlb_unmap_sg(&dev->dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
-+        else
-+#endif
-+            pci_unmap_sg(dev, sg, 1, PCI_DMA_BIDIRECTIONAL);
-+    }
-+
-+#define NV_MAP_SG_MAX_RETRIES 16
-+
- static inline int nv_sg_map_buffer(
-     struct pci_dev     *dev,
-     nv_pte_t          **page_list,
-@@ -1067,50 +1091,42 @@
-     sg_ptr->offset = (unsigned long)base & ~PAGE_MASK;
-     sg_ptr->length  = num_pages * PAGE_SIZE;
- 
--#if defined(NV_SWIOTLB)
--    i = NV_SWIOTLB_MAX_RETRIES;
-+    i = NV_MAP_SG_MAX_RETRIES;
-     do {
--        if (pci_map_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
-+        if (nv_map_sg(dev, sg_ptr) == 0)
-             return 1;
- 
-         if (sg_ptr->dma_address & ~PAGE_MASK)
-         {
-             struct scatterlist sg_tmp;
--            pci_unmap_sg(dev, sg_ptr, num_pages, PCI_DMA_BIDIRECTIONAL);
-+            nv_unmap_sg(dev, sg_ptr);
- 
-             memset(&sg_tmp, 0, sizeof(struct scatterlist));
-             sg_tmp.page = sg_ptr->page;
-             sg_tmp.offset = sg_ptr->offset;
-             sg_tmp.length = 2048;
- 
--            if (pci_map_sg(dev, &sg_tmp, 1, PCI_DMA_BIDIRECTIONAL) == 0)
-+            if (nv_map_sg(dev, &sg_tmp) == 0)
-                 return 1;
- 
--            if (pci_map_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
-+            if (nv_map_sg(dev, sg_ptr) == 0)
-             {
--                pci_unmap_sg(dev, &sg_tmp, num_pages, PCI_DMA_BIDIRECTIONAL);
-+                nv_unmap_sg(dev, &sg_tmp);
-                 return 1;
-             }
- 
--            pci_unmap_sg(dev, &sg_tmp, num_pages, PCI_DMA_BIDIRECTIONAL);
-+            nv_unmap_sg(dev, &sg_tmp);
-         }
-     } while (i-- && sg_ptr->dma_address & ~PAGE_MASK);
--#else
--    if (pci_map_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL) == 0)
--    {
--        return 1;
--    }
--#endif
- 
-     if (sg_ptr->dma_address & ~PAGE_MASK)
-     {
-         nv_printf(NV_DBG_ERRORS,
-             "NVRM: VM: nv_sg_map_buffer: failed to obtain aligned mapping\n");
--        pci_unmap_sg(dev, sg_ptr, num_pages, PCI_DMA_BIDIRECTIONAL);
-+        nv_unmap_sg(dev, sg_ptr);
-         return 1;
-     }
- 
--    NV_FIXUP_SWIOTLB_VIRT_ADDR_BUG(sg_ptr->dma_address);
- 
-     // this is a bit of a hack to make contiguous allocations easier to handle
-     // nv_sg_load below relies on the page_ptr addresses being filed in, as 
-@@ -1139,6 +1155,9 @@
-     // wire in the new page's addresses, but save the original off to free later
-     if (nv_swiotlb)
-     {
-+        // note that we modify our local version, not the sg_ptr version that
-+        // will be returned to the swiotlb pool
-+        NV_FIXUP_SWIOTLB_VIRT_ADDR_BUG(page_ptr->dma_addr);
-         page_ptr->orig_phys_addr = page_ptr->phys_addr;
-         page_ptr->phys_addr      = page_ptr->dma_addr;
-         page_ptr->orig_virt_addr = page_ptr->virt_addr;
-@@ -1171,7 +1190,7 @@
- 
-     if (page_ptr->dma_addr != page_ptr->phys_addr)
-     {
--        pci_unmap_sg(dev, sg_ptr, 1, PCI_DMA_BIDIRECTIONAL);
-+        nv_unmap_sg(dev, sg_ptr);
-         page_ptr->dma_addr = 0;
-     }
- }
diff --git a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1296092.diff b/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1296092.diff
deleted file mode 100644
index 049c954383bf..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1296092.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1296092/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1296092/nv-linux.h	2005-06-14 16:55:30.416687848 +0200
-@@ -76,7 +76,7 @@
- #include <asm/page.h>               /* PAGE_OFFSET                      */
- #include <asm/pgtable.h>            /* pte bit definitions              */
- 
--#if defined(NVCPU_X86_64) && defined(KERNEL_2_6)
-+#if defined(NVCPU_X86_64) && defined(KERNEL_2_6) && !defined(HAVE_COMPAT_IOCTL)
- #include <linux/syscalls.h>         /* sys_ioctl()                      */
- #include <linux/ioctl32.h>          /* register_ioctl32_conversion()    */
- #endif
-diff -ru usr/src/nv/nv.c usr/src/nv.1296092/nv.c
---- usr/src/nv/nv.c	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1296092/nv.c	2005-06-14 16:55:16.745766144 +0200
-@@ -153,6 +153,7 @@
- int           nv_kern_mmap(struct file *, struct vm_area_struct *);
- unsigned int  nv_kern_poll(struct file *, poll_table *);
- int           nv_kern_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
-+long          nv_kern_compat_ioctl(struct file *, unsigned int, unsigned long);
- void          nv_kern_isr_bh(unsigned long);
- irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
- void          nv_kern_rc_timer(unsigned long);
-@@ -209,6 +210,9 @@
-     .owner     = THIS_MODULE,
-     .poll      = nv_kern_poll,
-     .ioctl     = nv_kern_ioctl,
-+#if defined(NVCPU_X86_64) && defined(HAVE_COMPAT_IOCTL)
-+    .compat_ioctl = nv_kern_compat_ioctl,
-+#endif
-     .mmap      = nv_kern_mmap,
-     .open      = nv_kern_open,
-     .release   = nv_kern_close,
-@@ -993,8 +997,10 @@
-     inter_module_register("nv_linux_devices", THIS_MODULE, nv_linux_devices);
- #endif
- 
-+#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION) && !defined(HAVE_COMPAT_IOCTL)
-     /* Register ioctl conversions for 32 bit clients */
-     rm_register_ioctl_conversions();
-+#endif
- 
- #ifdef NV_SWIOTLB
-     // may need a better test than this eventually
-@@ -1154,8 +1160,10 @@
- #endif
-     }
- 
-+#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION) && !defined(HAVE_COMPAT_IOCTL)
-     /* Unregister ioctl conversions for 32 bit clients */
-     rm_unregister_ioctl_conversions();
-+#endif
- 
- #if defined(NV_BUILD_NV_PAT_SUPPORT)
-     if (nv_pat_enabled)
-@@ -1930,6 +1938,15 @@
-     return status;
- }
- 
-+long nv_kern_compat_ioctl(
-+    struct file *file,
-+    unsigned int cmd,
-+    unsigned long i_arg
-+)
-+{
-+    return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
-+}
-+
- /*
-  * driver receives an interrupt
-  *    if someone waiting, then hand it off.
-diff -ru usr/src/nv/os-interface.c usr/src/nv.1296092/os-interface.c
---- usr/src/nv/os-interface.c	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1296092/os-interface.c	2005-06-14 16:55:21.366063752 +0200
-@@ -1227,18 +1227,18 @@
- 
- void NV_API_CALL os_register_ioctl32_conversion(U032 cmd, U032 size)
- {
--#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION)
-+#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION) && !defined(HAVE_COMPAT_IOCTL)
-     unsigned int request = _IOWR(NV_IOCTL_MAGIC, cmd, char[size]);
-     register_ioctl32_conversion(request, (void *)sys_ioctl);
--#endif /* NVCPU_X86_64 */
-+#endif
- }
- 
- void NV_API_CALL os_unregister_ioctl32_conversion(U032 cmd, U032 size)
- {
--#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION)
-+#if defined(NVCPU_X86_64) && defined(CONFIG_IA32_EMULATION) && !defined(HAVE_COMPAT_IOCTL)
-     unsigned int request = _IOWR(NV_IOCTL_MAGIC, cmd, char[size]);
-     unregister_ioctl32_conversion(request);
--#endif /* NVCPU_X86_64 */
-+#endif
- }
- 
- BOOL NV_API_CALL os_pat_supported(void)
diff --git a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1321905.diff b/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1321905.diff
deleted file mode 100644
index 67a1c0af8c33..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1321905.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.1321905/nv-vm.c
---- usr/src/nv/nv-vm.c	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1321905/nv-vm.c	2005-10-23 15:43:12.860170440 +0200
-@@ -248,6 +248,20 @@
-         /* lock the page for dma purposes */
-         SetPageReserved(NV_GET_PAGE_STRUCT(phys_addr));
- 
-+#if defined(_PAGE_NX)
-+        if ((_PAGE_NX & pgprot_val(PAGE_KERNEL)) != 0 && phys_addr < 0x400000) {
-+            // Until a bug in change_page_attr() is fixed
-+            // we avoid pages with physaddr < 0x400000,
-+            // since splitting "jumbo" mappings results
-+            // in kernel pages being mapped as PAGE_KERNEL, which
-+            // may include _PAGE_NX, effectively making much of the
-+            // kernel code non-executable.
-+            nv_printf(NV_DBG_MEMINFO, "NVRM: nv_vm_malloc discarding page @%08x\n", phys_addr);
-+            --i;
-+            continue;
-+        }
-+#endif
-+
-         page_ptr = at->page_table[i];
-         page_ptr->phys_addr = phys_addr;
-         page_ptr->virt_addr = virt_addr;
diff --git a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1361053.diff b/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1361053.diff
deleted file mode 100644
index 5ab3fdbf780c..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1361053.diff
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1361053/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1361053/nv-linux.h	2005-10-11 19:01:57.647002680 +0200
-@@ -1018,15 +1018,50 @@
- #define NV_CHANGE_PAGE_ATTR_BUG_PRESENT 1
- #endif
- 
-+#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
-+/*
-+ * On Linux/x86-64 (and recent Linux/x86) kernels, the PAGE_KERNEL
-+ * and PAGE_KERNEL_NOCACHE protection bit masks include _PAGE_NX
-+ * to indicate that the no-execute protection page feature is used
-+ * for the page in question.
-+ *
-+ * We need to be careful to mask out _PAGE_NX when the host system
-+ * doesn't support this feature or when it's disabled: the kernel
-+ * may not do this in its implementation of the  change_page_attr()
-+ * interface.
-+ */
-+#ifndef X86_FEATURE_NX
-+#define X86_FEATURE_NX (1*32+20)
-+#endif
-+#ifndef boot_cpu_has
-+#define boot_cpu_has(x) test_bit(x, boot_cpu_data.x86_capability)
-+#endif
-+#ifndef MSR_EFER
-+#define MSR_EFER 0xc0000080
-+#endif
-+#ifndef EFER_NX
-+#define EFER_NX (1 << 11)
-+#endif
-+#ifndef _PAGE_NX
-+#define _PAGE_NX ((NvU64)1 << 63)
-+#endif
-+extern NvU64 __nv_supported_pte_mask;
-+#endif
-+
- #if defined(NV_CHANGE_PAGE_ATTR_PRESENT) && !defined(NV_CHANGE_PAGE_ATTR_BUG_PRESENT)
- static inline void NV_SET_PAGE_ATTRIB_UNCACHED(nv_pte_t *page_ptr)
-     {
-         struct page *page = virt_to_page(__va(page_ptr->phys_addr));
--        change_page_attr(page, 1, PAGE_KERNEL_NOCACHE);
-+        pgprot_t prot = PAGE_KERNEL_NOCACHE;
-+#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
-+        pgprot_val(prot) &= __nv_supported_pte_mask;
-+#endif
-+        change_page_attr(page, 1, prot);
-     }
- static inline void NV_SET_PAGE_ATTRIB_CACHED(nv_pte_t *page_ptr)
-     {
-         struct page *page = virt_to_page(__va(page_ptr->phys_addr));
-+        pgprot_t prot = PAGE_KERNEL;
- #ifdef CONFIG_SWIOTLB
-         if (page_ptr->orig_phys_addr)
-         {
-@@ -1034,7 +1069,10 @@
-             os_dbg_breakpoint();
-         }
- #endif
--        change_page_attr(page, 1, PAGE_KERNEL);
-+#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
-+        pgprot_val(prot) &= __nv_supported_pte_mask;
-+#endif
-+        change_page_attr(page, 1, prot);
-     }
- #else
- #define NV_SET_PAGE_ATTRIB_UNCACHED(page_list)
-diff -ru usr/src/nv/nv.c usr/src/nv.1361053/nv.c
---- usr/src/nv/nv.c	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1361053/nv.c	2005-10-11 18:59:20.347915776 +0200
-@@ -38,6 +38,10 @@
- static int nv_disable_pat = 0;
- NV_MODULE_PARAMETER(nv_disable_pat);
- 
-+#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
-+NvU64 __nv_supported_pte_mask = ~_PAGE_NX;
-+#endif
-+
- /*
-  * And one for the control device
-  */
-@@ -1024,6 +1028,16 @@
-         __nv_enable_pat_support();
-     }
- #endif
-+
-+#if defined(NVCPU_X86_64) || (defined(NVCPU_X86) && defined(CONFIG_X86_PAE))
-+    if (boot_cpu_has(X86_FEATURE_NX))
-+    {
-+        U032 __eax, __edx;
-+        rdmsr(MSR_EFER, __eax, __edx);
-+        if ((__eax & EFER_NX) != 0)
-+            __nv_supported_pte_mask |= _PAGE_NX;
-+    }
-+#endif
-  
-     return 0;
- 
diff --git a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1386866.diff b/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1386866.diff
deleted file mode 100644
index 0a6263f81c0e..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7174/NVIDIA_kernel-1.0-7174-1386866.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.1386866/nv-vm.c
---- usr/src/nv/nv-vm.c	2005-03-22 16:19:09.000000000 +0100
-+++ usr/src/nv.1386866/nv-vm.c	2005-10-11 19:33:24.821108608 +0200
-@@ -58,26 +58,57 @@
-  * conflicts. we try to rely on the kernel's provided interfaces when possible,
-  * but need additional flushing on earlier kernels.
-  */
--#if defined(KERNEL_2_4)
--/* wrap CACHE_FLUSH so we can pass it to smp_call_function */
--static void cache_flush(void *p)
--{
--    CACHE_FLUSH();
--}
--#endif
--
- /*
-  * 2.4 kernels handle flushing in the change_page_attr() call, but kernels 
-  * earlier than 2.4.27 don't flush on cpus that support Self Snoop, so we
-  * manually flush on these kernels (actually, we go ahead and flush on all
-  * 2.4 kernels, as it's possible some others may be missing this fix and
-  * we'd prefer to be a little slower flushing caches than hanging the 
-- * system. 2.6 kernels split the flushing out to a seperate call, 
-- * global_flush_tlb(), so we rely on that.
-+ * system.
-+ * 2.6 kernels split the flushing out to a seperate call, 
-+ * global_flush_tlb(), so we rely on that. however, there are some 2.6
-+ * x86_64 kernels that do not properly flush. for now, we'll flush on all
-+ * potential kernels, as it's slightly slower, but safer.
-  */
-+#if defined(KERNEL_2_4) || (defined(KERNEL_2_6) && defined(NVCPU_X86_64))
-+#define NV_CPA_NEEDS_FLUSHING 1
-+#endif
-+
-+#if defined(NV_CPA_NEEDS_FLUSHING)
-+static void cache_flush(void *p)
-+{
-+    unsigned long reg0, reg1;
-+
-+    CACHE_FLUSH();
-+
-+    // flush global TLBs
-+#if defined (NVCPU_X86)
-+    asm volatile("movl %%cr4, %0;  \n"
-+                 "andl $~0x80, %0; \n"
-+                 "movl %0, %%cr4;  \n"
-+                 "movl %%cr3, %1;  \n"
-+                 "movl %1, %%cr3;  \n"
-+                 "orl  $0x80, %0;  \n"
-+                 "movl %0, %%cr4;  \n"
-+                 : "=&r" (reg0), "=&r" (reg1)
-+                 : : "memory");
-+#else
-+    asm volatile("movq %%cr4, %0;  \n"
-+                 "andq $~0x80, %0; \n"
-+                 "movq %0, %%cr4;  \n"
-+                 "movq %%cr3, %1;  \n"
-+                 "movq %1, %%cr3;  \n"
-+                 "orq  $0x80, %0;  \n"
-+                 "movq %0, %%cr4;  \n"
-+                 : "=&r" (reg0), "=&r" (reg1)
-+                 : : "memory");
-+#endif
-+}
-+#endif
-+
- static void nv_flush_caches(void)
- {
--#if defined(KERNEL_2_4)
-+#if defined(NV_CPA_NEEDS_FLUSHING)
- #ifdef CONFIG_SMP
-     smp_call_function(cache_flush, NULL, 1, 1);
- #endif
diff --git a/media-video/nvidia-kernel/files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch b/media-video/nvidia-kernel/files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch
deleted file mode 100644
index 9e897183872c..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7667/NVIDIA_kernel-1.0-7667-KERNEL_VERSION-moved.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -urpN nv/conftest.sh nv.az/conftest.sh
---- nv/conftest.sh	2005-06-17 16:50:43.000000000 +0200
-+++ nv.az/conftest.sh	2005-07-17 00:30:54.000000000 +0200
-@@ -212,6 +212,9 @@ case "$4" in
-             # Determine the kernel version using a compile check.
-             #
-             echo "#include \"linux/version.h\"
-+	    #ifndef KERNEL_VERSION 
-+	    # include <linux/utsname.h>
-+	    #endif
-             int main() {
-               if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) {
-                 return 0;
-@@ -290,6 +293,9 @@ case "$4" in
-         #
- 
-         echo "#include \"linux/version.h\"
-+        #ifndef KERNEL_VERSION 
-+        # include <linux/utsname.h>
-+        #endif
-         int main() {
-             printf(\"%s\n\", UTS_RELEASE);
-             return 0;
-@@ -369,6 +375,9 @@ case "$4" in
-         
-         echo "#include <linux/version.h>
-         #include <linux/mm.h>
-+        #ifndef KERNEL_VERSION 
-+        # include <linux/utsname.h>
-+        #endif
-         #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-           #include <asm/cacheflush.h>
-         #endif
-@@ -460,6 +469,9 @@ case "$4" in
-         VERBOSE=$5
- 
-         echo "#include <linux/version.h>
-+        #ifndef KERNEL_VERSION 
-+        # include <linux/utsname.h>
-+        #endif
-         #include <linux/autoconf.h>
-         #if defined(CONFIG_X86_64) && \
-             LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) && \
-diff -urpN nv/nv-linux.h nv.az/nv-linux.h
---- nv/nv-linux.h	2005-06-17 16:50:42.000000000 +0200
-+++ nv.az/nv-linux.h	2005-07-17 00:31:06.000000000 +0200
-@@ -16,6 +16,9 @@
- 
- #include <linux/config.h>
- #include <linux/version.h>
-+#ifndef KERNEL_VERSION 
-+# include <linux/utsname.h>
-+#endif
- 
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
diff --git a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff b/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff
deleted file mode 100644
index 4e592a950f1f..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1321905.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.1321905/nv-vm.c
---- usr/src/nv/nv-vm.c	2005-07-29 22:30:43.000000000 +0200
-+++ usr/src/nv.1321905/nv-vm.c	2005-09-29 20:08:12.186906704 +0200
-@@ -248,6 +248,20 @@
-         /* lock the page for dma purposes */
-         SetPageReserved(NV_GET_PAGE_STRUCT(phys_addr));
- 
-+#if defined(_PAGE_NX)
-+        if ((_PAGE_NX & pgprot_val(PAGE_KERNEL)) != 0 && phys_addr < 0x400000) {
-+            // Until a bug in change_page_attr() is fixed
-+            // we avoid pages with physaddr < 0x400000,
-+            // since splitting "jumbo" mappings results
-+            // in kernel pages being mapped as PAGE_KERNEL, which
-+            // may include _PAGE_NX, effectively making much of the
-+            // kernel code non-executable.
-+            nv_printf(NV_DBG_MEMINFO, "NVRM: nv_vm_malloc discarding page @%08x\n", phys_addr);
-+            --i;
-+            continue;
-+        }
-+#endif
-+
-         page_ptr = at->page_table[i];
-         page_ptr->phys_addr = phys_addr;
-         page_ptr->virt_addr = virt_addr;
diff --git a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff b/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff
deleted file mode 100644
index 61e0c9a1a250..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1359015.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ru usr/src/nv/Makefile.kbuild usr/src/nv.1359015/Makefile.kbuild
---- usr/src/nv/Makefile.kbuild	2005-07-29 22:51:12.000000000 +0200
-+++ usr/src/nv.1359015/Makefile.kbuild	2005-09-06 23:15:03.788036912 +0200
-@@ -222,6 +222,10 @@
-     EXTRA_CFLAGS += -DNV_VMAP_4_PRESENT
- endif
- 
-+ifeq ($(shell $(CONFTEST) supported_pte_mask), 1)
-+  EXTRA_CFLAGS += -DNV_SUPPORTED_PTE_MASK_PRESENT
-+endif
-+
- #
- # Miscellaneous NVIDIA kernel module build support targets. They are needed
- # to satisfy KBUILD requirements and to support NVIDIA specifics.
-diff -ru usr/src/nv/Makefile.nvidia usr/src/nv.1359015/Makefile.nvidia
---- usr/src/nv/Makefile.nvidia	2005-07-29 22:51:12.000000000 +0200
-+++ usr/src/nv.1359015/Makefile.nvidia	2005-09-06 23:15:03.788036912 +0200
-@@ -85,6 +85,10 @@
-     DEFINES += -DNV_VMAP_4_PRESENT
- endif
- 
-+ifeq ($(shell $(CONFTEST) supported_pte_mask), 1)
-+  EXTRA_CFLAGS += -DNV_SUPPORTED_PTE_MASK_PRESENT
-+endif
-+
- DEFINES+=$(EXTRA_DEFINES)
- 
- # allow build parameters to be passed in through the environment
-diff -ru usr/src/nv/conftest.sh usr/src/nv.1359015/conftest.sh
---- usr/src/nv/conftest.sh	2005-07-29 22:51:12.000000000 +0200
-+++ usr/src/nv.1359015/conftest.sh	2005-09-06 23:15:03.789036760 +0200
-@@ -537,7 +537,8 @@
- 
-     vmap_arg_count)
-         #
--        # Determine, if vmap() is present, and how many arguments it takes
-+        # Determine, if vmap() is present, and how many arguments
-+        # it takes.
-         #
- 
-         echo "#include <linux/vmalloc.h>
-@@ -567,4 +568,30 @@
-         else
-             exit 1  # there ain't no vmap()
-         fi
-+    ;;
-+
-+    supported_pte_mask)
-+        #
-+        # Determine if the i386/x86_64 __supported_pte_mask symbol
-+        # is available.
-+        #
-+
-+        echo "#include <asm/pgtable.h>
-+        #include <asm/page.h>
-+        void nv___suported_pte_mask_test() {
-+            pgprot_t prot = __pgprot(0);
-+            pgprot_val(prot) &= __supported_pte_mask;
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
- esac
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1359015/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-07-29 22:51:12.000000000 +0200
-+++ usr/src/nv.1359015/nv-linux.h	2005-09-06 23:16:43.998802560 +0200
-@@ -980,7 +980,11 @@
-         if (nv_use_cpa)
-         {
-             struct page *page = virt_to_page(__va(page_ptr->phys_addr));
--            change_page_attr(page, 1, PAGE_KERNEL_NOCACHE);
-+            pgprot_t prot = PAGE_KERNEL_NOCACHE;
-+#if defined(NV_SUPPORTED_PTE_MASK_PRESENT)
-+            pgprot_val(prot) &= __supported_pte_mask;
-+#endif
-+            change_page_attr(page, 1, prot);
-         }
-     }
- static inline void NV_SET_PAGE_ATTRIB_CACHED(nv_pte_t *page_ptr)
-@@ -988,7 +992,11 @@
-         if (nv_use_cpa)
-         {
-             struct page *page = virt_to_page(__va(page_ptr->phys_addr));
--            change_page_attr(page, 1, PAGE_KERNEL);
-+            pgprot_t prot = PAGE_KERNEL;
-+#if defined(NV_SUPPORTED_PTE_MASK_PRESENT)
-+            pgprot_val(prot) &= __supported_pte_mask;
-+#endif
-+            change_page_attr(page, 1, prot);
-         }
-     }
- #else
diff --git a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff b/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff
deleted file mode 100644
index bcb3d85b1809..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1361053.diff
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1361053/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-07-29 22:51:12.000000000 +0200
-+++ usr/src/nv.1361053/nv-linux.h	2005-10-11 18:57:16.781700696 +0200
-@@ -973,6 +973,36 @@
- #define NV_CHANGE_PAGE_ATTR_BUG_PRESENT 1
- #endif
- 
-+#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
-+/*
-+ * On Linux/x86-64 (and recent Linux/x86) kernels, the PAGE_KERNEL
-+ * and PAGE_KERNEL_NOCACHE protection bit masks include _PAGE_NX
-+ * to indicate that the no-execute protection page feature is used
-+ * for the page in question.
-+ *
-+ * We need to be careful to mask out _PAGE_NX when the host system
-+ * doesn't support this feature or when it's disabled: the kernel
-+ * may not do this in its implementation of the  change_page_attr()
-+ * interface.
-+ */
-+#ifndef X86_FEATURE_NX
-+#define X86_FEATURE_NX (1*32+20)
-+#endif
-+#ifndef boot_cpu_has
-+#define boot_cpu_has(x) test_bit(x, boot_cpu_data.x86_capability)
-+#endif
-+#ifndef MSR_EFER
-+#define MSR_EFER 0xc0000080
-+#endif
-+#ifndef EFER_NX
-+#define EFER_NX (1 << 11)
-+#endif
-+#ifndef _PAGE_NX
-+#define _PAGE_NX ((NvU64)1 << 63)
-+#endif
-+extern NvU64 __nv_supported_pte_mask;
-+#endif
-+
- #if defined(NV_CHANGE_PAGE_ATTR_PRESENT)
- extern int nv_use_cpa;
- static inline void NV_SET_PAGE_ATTRIB_UNCACHED(nv_pte_t *page_ptr)
-@@ -980,15 +1010,23 @@
-         if (nv_use_cpa)
-         {
-             struct page *page = virt_to_page(__va(page_ptr->phys_addr));
--            change_page_attr(page, 1, PAGE_KERNEL_NOCACHE);
-+			pgprot_t prot = PAGE_KERNEL_NOCACHE;
-+#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
-+			pgprot_val(prot) &= __nv_supported_pte_mask;
-+#endif
-+			change_page_attr(page, 1, prot);
-         }
-     }
- static inline void NV_SET_PAGE_ATTRIB_CACHED(nv_pte_t *page_ptr)
-     {
-         if (nv_use_cpa)
-         {
--            struct page *page = virt_to_page(__va(page_ptr->phys_addr));
--            change_page_attr(page, 1, PAGE_KERNEL);
-+			struct page *page = virt_to_page(__va(page_ptr->phys_addr));
-+			pgprot_t prot = PAGE_KERNEL;
-+#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
-+			pgprot_val(prot) &= __nv_supported_pte_mask;
-+#endif
-+			change_page_attr(page, 1, prot);
-         }
-     }
- #else
-diff -ru usr/src/nv/nv.c usr/src/nv.1361053/nv.c
---- usr/src/nv/nv.c	2005-07-29 22:51:11.000000000 +0200
-+++ usr/src/nv.1361053/nv.c	2005-10-11 18:58:08.578826336 +0200
-@@ -38,6 +38,10 @@
- static int nv_disable_pat = 0;
- NV_MODULE_PARAMETER(nv_disable_pat);
- 
-+#if defined(NVCPU_X86) || defined(NVCPU_X86_64)
-+NvU64 __nv_supported_pte_mask = ~_PAGE_NX;
-+#endif
-+
- /*
-  * And one for the control device
-  */
-@@ -1158,6 +1162,16 @@
-         __nv_enable_pat_support();
-     }
- #endif
-+
-+#if defined(NVCPU_X86_64) || (defined(NVCPU_X86) && defined(CONFIG_X86_PAE))
-+    if (boot_cpu_has(X86_FEATURE_NX))
-+    {
-+        U032 __eax, __edx;
-+        rdmsr(MSR_EFER, __eax, __edx);
-+        if ((__eax & EFER_NX) != 0)
-+            __nv_supported_pte_mask |= _PAGE_NX;
-+    }
-+#endif
-  
-     return 0;
- 
diff --git a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff b/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff
deleted file mode 100644
index 7161b1b388a2..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1386866.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.1386866/nv-vm.c
---- usr/src/nv/nv-vm.c	2005-07-29 22:51:11.000000000 +0200
-+++ usr/src/nv.1386866/nv-vm.c	2005-10-11 19:34:36.222253984 +0200
-@@ -58,26 +58,57 @@
-  * conflicts. we try to rely on the kernel's provided interfaces when possible,
-  * but need additional flushing on earlier kernels.
-  */
--#if defined(KERNEL_2_4)
--/* wrap CACHE_FLUSH so we can pass it to smp_call_function */
--static void cache_flush(void *p)
--{
--    CACHE_FLUSH();
--}
--#endif
--
- /*
-  * 2.4 kernels handle flushing in the change_page_attr() call, but kernels 
-  * earlier than 2.4.27 don't flush on cpus that support Self Snoop, so we
-  * manually flush on these kernels (actually, we go ahead and flush on all
-  * 2.4 kernels, as it's possible some others may be missing this fix and
-  * we'd prefer to be a little slower flushing caches than hanging the 
-- * system. 2.6 kernels split the flushing out to a seperate call, 
-- * global_flush_tlb(), so we rely on that.
-+ * system.
-+ * 2.6 kernels split the flushing out to a seperate call, 
-+ * global_flush_tlb(), so we rely on that. however, there are some 2.6
-+ * x86_64 kernels that do not properly flush. for now, we'll flush on all
-+ * potential kernels, as it's slightly slower, but safer.
-  */
-+#if defined(KERNEL_2_4) || (defined(KERNEL_2_6) && defined(NVCPU_X86_64))
-+#define NV_CPA_NEEDS_FLUSHING 1
-+#endif
-+
-+#if defined(NV_CPA_NEEDS_FLUSHING)
-+static void cache_flush(void *p)
-+{
-+    unsigned long reg0, reg1;
-+
-+    CACHE_FLUSH();
-+
-+    // flush global TLBs
-+#if defined (NVCPU_X86)
-+    asm volatile("movl %%cr4, %0;  \n"
-+                 "andl $~0x80, %0; \n"
-+                 "movl %0, %%cr4;  \n"
-+                 "movl %%cr3, %1;  \n"
-+                 "movl %1, %%cr3;  \n"
-+                 "orl  $0x80, %0;  \n"
-+                 "movl %0, %%cr4;  \n"
-+                 : "=&r" (reg0), "=&r" (reg1)
-+                 : : "memory");
-+#else
-+    asm volatile("movq %%cr4, %0;  \n"
-+                 "andq $~0x80, %0; \n"
-+                 "movq %0, %%cr4;  \n"
-+                 "movq %%cr3, %1;  \n"
-+                 "movq %1, %%cr3;  \n"
-+                 "orq  $0x80, %0;  \n"
-+                 "movq %0, %%cr4;  \n"
-+                 : "=&r" (reg0), "=&r" (reg1)
-+                 : : "memory");
-+#endif
-+}
-+#endif
-+
- static void nv_flush_caches(void)
- {
--#if defined(KERNEL_2_4)
-+#if defined(NV_CPA_NEEDS_FLUSHING)
- #ifdef CONFIG_SMP
-     smp_call_function(cache_flush, NULL, 1, 1);
- #endif
diff --git a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff b/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff
deleted file mode 100644
index 54d653d0afa3..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7676/NVIDIA_kernel-1.0-7676-1392404.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.1392404/nv-vm.c
---- usr/src/nv/nv-vm.c	2005-07-29 22:51:11.000000000 +0200
-+++ usr/src/nv.1392404/nv-vm.c	2005-10-18 23:25:09.868215136 +0200
-@@ -261,10 +261,14 @@
-             {
-                 nv_printf(NV_DBG_ERRORS,
-                     "NVRM: VM: nv_vm_malloc_pages: failed to sg map pages\n");
-+                NV_UNLOCK_PAGE(page_ptr);
-+                if (!NV_ALLOC_MAPPING_VMALLOC(at->flags))
-+                    NV_FREE_PAGES(virt_addr, 0);
-+                i--;
-                 goto failed;
-             }
-         }
--        nv_sg_load(&at->page_table[i]->sg_list, page_ptr);
-+        nv_sg_load(&page_ptr->sg_list, page_ptr);
- 
-         if (NV_ALLOC_MAPPING_VMAP(at->flags))
-             pages[i] = NV_GET_PAGE_STRUCT(page_ptr->phys_addr);
-@@ -303,9 +307,9 @@
- 
- failed:
- 
--    for (j = 0; j <= i; j++)
-+    for (j = 1; j <= (i+1); j++)
-     {
--        page_ptr = at->page_table[j];
-+        page_ptr = at->page_table[j-1];
- 
-         // if we failed when allocating this page, skip over it
-         // but if we failed pci_map_sg, make sure to free this page
-@@ -316,7 +320,7 @@
-                 NV_SET_PAGE_ATTRIB_CACHED(page_ptr);
- #if defined(NV_SG_MAP_BUFFERS)
-             if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
--                nv_sg_unmap_buffer(dev, &at->page_table[j]->sg_list, page_ptr);
-+                nv_sg_unmap_buffer(dev, &page_ptr->sg_list, page_ptr);
- #endif
-             if (!NV_ALLOC_MAPPING_CONTIG(at->flags) && !NV_ALLOC_MAPPING_VMALLOC(at->flags))
-                 NV_FREE_PAGES(page_ptr->virt_addr, 0);
-@@ -340,7 +344,7 @@
- 
- #if defined(NV_SG_MAP_BUFFERS)
-     if (NV_ALLOC_MAPPING_VMAP(at->flags) && pages != 0)
--        NV_VFREE((void *)pages, sizeof(struct page *) * at->num_pages);
-+        NV_KFREE((void *)pages, sizeof(struct page *) * at->num_pages);
- #endif
- 
-     return -1;
-@@ -408,7 +412,7 @@
-         if (NV_ALLOC_MAPPING_VMAP(at->flags))
-             page_ptr->virt_addr = (unsigned long) __va(page_ptr->phys_addr);
-         if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
--            nv_sg_unmap_buffer(dev, &at->page_table[i]->sg_list, page_ptr);
-+            nv_sg_unmap_buffer(dev, &page_ptr->sg_list, page_ptr);
- #endif
-         if (!NV_ALLOC_MAPPING_CONTIG(at->flags) && !NV_ALLOC_MAPPING_VMALLOC(at->flags))
-             NV_FREE_PAGES(page_ptr->virt_addr, 0);
diff --git a/media-video/nvidia-kernel/files/1.0.8174/NVIDIA_kernel-1.0-8174-1423627.diff b/media-video/nvidia-kernel/files/1.0.8174/NVIDIA_kernel-1.0-8174-1423627.diff
deleted file mode 100644
index 565a7ac557a9..000000000000
--- a/media-video/nvidia-kernel/files/1.0.8174/NVIDIA_kernel-1.0-8174-1423627.diff
+++ /dev/null
@@ -1,385 +0,0 @@
-Only in usr/src/nv.1423627: .nv.c.rej.swp
-diff -ru usr/src/nv/Makefile.kbuild usr/src/nv.1423627/Makefile.kbuild
---- usr/src/nv/Makefile.kbuild	2005-11-23 03:58:01.000000000 +0100
-+++ usr/src/nv.1423627/Makefile.kbuild	2005-12-04 14:56:24.092375500 +0100
-@@ -186,6 +186,14 @@
-   ifeq ($(shell $(CONFTEST) sysctl_max_map_count), 1)
-     EXTRA_CFLAGS += -DNV_SYSCTL_MAX_MAP_COUNT_PRESENT
-   endif
-+
-+  ifeq ($(shell $(CONFTEST) pm_message_t), 1)
-+    EXTRA_CFLAGS += -DNV_PM_MESSAGE_T_PRESENT
-+  endif
-+
-+  ifeq ($(shell $(CONFTEST) pci_choose_state), 1)
-+    EXTRA_CFLAGS += -DNV_PCI_CHOOSE_STATE_PRESENT
-+  endif
- endif
- 
- ifeq ($(shell $(CONFTEST) remap_pfn_range), 1)
-diff -ru usr/src/nv/conftest.sh usr/src/nv.1423627/conftest.sh
---- usr/src/nv/conftest.sh	2005-11-23 03:58:01.000000000 +0100
-+++ usr/src/nv.1423627/conftest.sh	2005-12-04 14:56:24.092375500 +0100
-@@ -643,4 +643,47 @@
-         fi
-     ;;
- 
-+    pm_message_t)
-+        #
-+        # Does linux/pm.h declare the pm_message_t type?
-+        #
-+
-+        echo "#include <linux/pm.h>
-+        void nv_test_pm_message_t(pm_message_t state) {
-+            pm_message_t *p = &state;
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -Wno-error -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
-+    pci_choose_state)
-+        #
-+        # Determine if pci_choose_state() is present.
-+        #
-+
-+        echo "#include <linux/pci.h>
-+        pci_power_t
-+        nv_pci_choose_state(struct pci_dev *dev, pm_message_t state) {
-+            return pci_choose_state(dev, state);
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
- esac
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.1423627/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-11-23 03:58:01.000000000 +0100
-+++ usr/src/nv.1423627/nv-linux.h	2005-12-04 14:56:24.092375500 +0100
-@@ -642,15 +642,49 @@
- #define NV_PRINT_AT(at)
- #endif
- 
--// acpi support has been back-ported to the 2.4 kernel, but the 2.4 driver
--// model is not sufficient for full acpi support. it may work in some cases,
--// but not enough for us to officially support this configuration.
--#if defined(CONFIG_ACPI) && defined(KERNEL_2_6)
--#define NV_PM_SUPPORT_ACPI
-+/*
-+ * On Linux 2.6, we support both APM and ACPI power management. On Linux
-+ * 2.4, we support APM, only. ACPI support has been back-ported to the
-+ * Linux 2.4 kernel, but the Linux 2.4 driver model is not sufficient for
-+ * full ACPI support: it may work with some systems, but not reliably
-+ * enough for us to officially support this configuration.
-+ *
-+ * We support two Linux kernel power managment interfaces: the original
-+ * pm_register()/pm_unregister() on Linux 2.4 and the device driver model
-+ * backed PCI driver power management callbacks introduced with Linux
-+ * 2.6.
-+ *
-+ * The code below determines which interface to support on this kernel
-+ * version, if any; if built for Linux 2.6, it will also determine if the
-+ * kernel comes with ACPI or APM power management support.
-+ */
-+#if defined(KERNEL_2_6) && (defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) || defined(CONFIG_ACPI))
-+#define NV_PM_SUPPORT_DEVICE_DRIVER_MODEL
-+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-+#define NV_PM_SUPPORT_NEW_STYLE_APM
-+#endif
- #endif
- 
--#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
--#define NV_PM_SUPPORT_APM
-+/*
-+ * On Linux 2.6 kernels >= 2.6.11, the PCI subsystem provides a new 
-+ * interface that allows PCI drivers to determine the correct power state
-+ * for a given system power state; our suspend/resume callbacks now use
-+ * this interface and operate on PCI power state defines.
-+ *
-+ * Define these new PCI power state #define's here for compatibility with
-+ * older Linux 2.6 kernels.
-+ */
-+#if defined(KERNEL_2_6) && !defined(PCI_D0)
-+#define PCI_D0 PM_SUSPEND_ON
-+#define PCI_D3hot PM_SUSPEND_MEM
-+#endif
-+
-+#if defined(KERNEL_2_6) && !defined(NV_PM_MESSAGE_T_PRESENT)
-+typedef u32 pm_message_t;
-+#endif
-+
-+#if defined(KERNEL_2_4) && (defined(CONFIG_APM) || defined(CONFIG_APM_MODULE))
-+#define NV_PM_SUPPORT_OLD_STYLE_APM
- #endif
- 
- #ifndef minor
-diff -ru usr/src/nv/nv.c usr/src/nv.1423627/nv.c
---- usr/src/nv/nv.c	2005-11-23 03:58:01.000000000 +0100
-+++ usr/src/nv.1423627/nv.c	2005-12-04 14:57:13.791481500 +0100
-@@ -29,7 +29,7 @@
- 
- static nv_linux_state_t nv_linux_devices[NV_MAX_DEVICES];
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- static struct pm_dev *apm_nv_dev[NV_MAX_DEVICES] = { 0 };
- #endif
- 
-@@ -244,8 +244,8 @@
- void          nv_kern_isr_bh(unsigned long);
- irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
- void          nv_kern_rc_timer(unsigned long);
--#if defined(NV_PM_SUPPORT_APM)
--int           nv_kern_apm_event(struct pm_dev *dev, pm_request_t rqst, void *data);
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-+static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
- #endif
- 
- static int    nv_kern_read_cardinfo(char *, char **, off_t off, int, int *, void *);
-@@ -265,9 +265,10 @@
- unsigned int  nv_kern_ctl_poll(struct file *, poll_table *);
- 
- int nv_kern_probe(struct pci_dev *, const struct pci_device_id *);
--#if defined(NV_PM_SUPPORT_ACPI)
--int nv_kern_acpi_standby(struct pci_dev *, u32);
--int nv_kern_acpi_resume(struct pci_dev *);
-+
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
-+static int    nv_kern_suspend(struct pci_dev *, pm_message_t);
-+static int    nv_kern_resume(struct pci_dev *);
- #endif
- 
- /***
-@@ -292,9 +293,9 @@
-     .name     = "nvidia",
-     .id_table = nv_pci_table,
-     .probe    = nv_kern_probe,
--#if defined(NV_PM_SUPPORT_ACPI)
--    .suspend  = nv_kern_acpi_standby,
--    .resume   = nv_kern_acpi_resume,
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
-+    .suspend  = nv_kern_suspend,
-+    .resume   = nv_kern_resume,
- #endif
- };
- 
-@@ -1299,7 +1300,7 @@
-         nv_lock_init_locks(nv_ctl);
-     }
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-     {
-         apm_nv_dev[i] = pm_register(PM_PCI_DEV, PM_SYS_VGA, nv_kern_apm_event);
-@@ -1418,7 +1419,7 @@
-     if (nv_pte_t_cache != NULL)
-         NV_KMEM_CACHE_DESTROY(nv_pte_t_cache);
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-         if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
- #endif
-@@ -1473,10 +1474,10 @@
-     inter_module_unregister("nv_linux_devices");
- #endif
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-     {
--        pm_unregister(apm_nv_dev[i]);
-+        if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
-     }
- #endif
- 
-@@ -2429,9 +2430,9 @@
-     mod_timer(&nvl->rc_timer, jiffies + HZ);  /* set another timeout in 1 second */
- }
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- /* kernel calls us with a power management event */
--int
-+static int
- nv_kern_apm_event(
-     struct pm_dev *dev,
-     pm_request_t rqst,
-@@ -2466,7 +2467,6 @@
- 
-     switch (rqst)
-     {
--#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-         case PM_RESUME:
-             nv_printf(NV_DBG_INFO, "NVRM: APM: received resume event\n");
-             status = rm_power_management(nv, 0, NV_PM_APM_RESUME);
-@@ -2476,15 +2476,12 @@
-             nv_printf(NV_DBG_INFO, "NVRM: APM: received suspend event\n");
-             status = rm_power_management(nv, 0, NV_PM_APM_SUSPEND);
-             break;
--#endif
- 
--#if defined(KERNEL_2_4)
-         // 2.4 kernels sent a PM_SAVE_STATE request when powering down via
-         // ACPI. just ignore it and return success so the power down works
-         case PM_SAVE_STATE:
-             status = RM_OK;
-             break;
--#endif
- 
-         default:
-             nv_printf(NV_DBG_WARNINGS, "NVRM: APM: unsupported event: %d\n", rqst);
-@@ -2496,7 +2493,7 @@
- 
-     return status;
- }
--#endif
-+#endif /* defined(NV_PM_SUPPORT_OLD_STYLE_APM) */
- 
- /*
- ** nv_kern_ctl_open
-@@ -3739,6 +3736,7 @@
-     nvl = &nv_linux_devices[num_nv_devices];
-     nv  = NV_STATE_PTR(nvl);
- 
-+    pci_set_drvdata(dev, (void *)nvl);
-     nvl->dev          = dev;
-     nv->vendor_id     = dev->vendor;
-     nv->device_id     = dev->device;
-@@ -3816,11 +3814,10 @@
- #endif
- }
- 
--#if defined(NV_PM_SUPPORT_ACPI)
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
- 
--int
--nv_acpi_event
--(
-+static int
-+nv_power_management(
-     struct pci_dev *dev, 
-     u32 state
- )
-@@ -3828,70 +3825,77 @@
-     nv_state_t *nv;
-     nv_linux_state_t *lnv = NULL;
-     int status = RM_OK;
--    U032 i;
--
--    nv_printf(NV_DBG_INFO, "NVRM: nv_acpi_event: %d\n", state);
- 
--    for (i = 0; i < num_nv_devices; i++)
--    {
--        if (nv_linux_devices[i].dev == dev)
--        {
--            lnv = &nv_linux_devices[i];
--            break;
--        }
--    }
-+    nv_printf(NV_DBG_INFO, "NVRM: nv_power_management: %d\n", state);
-+    lnv = pci_get_drvdata(dev);
- 
-     if ((!lnv) || (lnv->dev != dev))
-     {
--        nv_printf(NV_DBG_WARNINGS, "NVRM: ACPI: invalid device!\n");
-+        nv_printf(NV_DBG_WARNINGS, "NVRM: PM: invalid device!\n");
-         return -1;
-     }
- 
-     nv = NV_STATE_PTR(lnv);
-+    nv_verify_pci_config(NV_STATE_PTR(lnv), TRUE);
- 
-     switch (state)
-     {
--        case PM_SUSPEND_MEM:
-+#if defined(NV_PM_SUPPORT_NEW_STYLE_APM)
-+        case PCI_D3hot:
-+            nv_printf(NV_DBG_INFO, "NVRM: APM: received suspend event\n");
-+            status = rm_power_management(nv, 0, NV_PM_APM_SUSPEND);
-+            break;
-+
-+        case PCI_D0:
-+            nv_printf(NV_DBG_INFO, "NVRM: APM: received resume event\n");
-+            status = rm_power_management(nv, 0, NV_PM_APM_RESUME);
-+            break;
-+#else
-+        case PCI_D3hot:
-             nv_printf(NV_DBG_INFO, "NVRM: ACPI: received suspend event\n");
-             status = rm_power_management(nv, 0, NV_PM_ACPI_STANDBY);
-             break;
- 
--        case PM_SUSPEND_ON:
-+        case PCI_D0:
-             nv_printf(NV_DBG_INFO, "NVRM: ACPI: received resume event\n");
-             status = rm_power_management(nv, 0, NV_PM_ACPI_RESUME);
-             break;
--
-+#endif
-         default:
--            nv_printf(NV_DBG_WARNINGS, "NVRM: ACPI: unsupported event: %d\n", state);
-+            nv_printf(NV_DBG_WARNINGS, "NVRM: PM: unsupported event: %d\n", state);
-             return -1;
-     }
- 
-     if (status != RM_OK)
--        nv_printf(NV_DBG_ERRORS, "NVRM: ACPI: failed event: %d\n", state);
-+        nv_printf(NV_DBG_ERRORS, "NVRM: PM: failed event: %d\n", state);
- 
-     return status;
- }
- 
--int
--nv_kern_acpi_standby
--(
--    struct pci_dev *dev, 
--    u32 state
-+static int nv_kern_suspend(
-+    struct pci_dev *dev,
-+    pm_message_t state
- )
- {
--    return nv_acpi_event(dev, state);
-+    int power_state = -1;
-+
-+#if !defined(NV_PM_MESSAGE_T_PRESENT)
-+    power_state = state;
-+#elif defined(NV_PCI_CHOOSE_STATE_PRESENT)
-+    power_state = pci_choose_state(dev, state);
-+#endif
-+
-+    return nv_power_management(dev, power_state);
- }
- 
--int
--nv_kern_acpi_resume
--(
-+static int nv_kern_resume(
-     struct pci_dev *dev
- )
- {
--    return nv_acpi_event(dev, PM_SUSPEND_ON);
-+    return nv_power_management(dev, PCI_D0);
- }
- 
--#endif
-+#endif /* defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL) */
- 
- void* NV_API_CALL nv_get_adapter_state(
-     U016 bus,
diff --git a/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff b/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff
deleted file mode 100644
index d6b85295f125..000000000000
--- a/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-1444349.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru usr/src/nv/conftest.sh usr/src/nv.1444349/conftest.sh
---- usr/src/nv/conftest.sh	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.1444349/conftest.sh	2006-01-06 13:54:29.916051750 +0100
-@@ -22,6 +22,7 @@
- OUTPUT=$4
- 
- CFLAGS="-D__KERNEL__ \
-+-DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
- -nostdinc -isystem $ISYSTEM \
- -Werror -Wimplicit-function-declaration"
- 
diff --git a/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-U011106.diff b/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-U011106.diff
deleted file mode 100644
index 668eaa663219..000000000000
--- a/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-U011106.diff
+++ /dev/null
@@ -1,527 +0,0 @@
-diff -ru usr/src/nv/Makefile.kbuild usr/src/nv.U011106/Makefile.kbuild
---- usr/src/nv/Makefile.kbuild	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U011106/Makefile.kbuild	2006-01-11 18:57:07.922310250 +0100
-@@ -186,6 +186,18 @@
-   ifeq ($(shell $(CONFTEST) sysctl_max_map_count), 1)
-     EXTRA_CFLAGS += -DNV_SYSCTL_MAX_MAP_COUNT_PRESENT
-   endif
-+
-+  ifeq ($(shell $(CONFTEST) pm_message_t), 1)
-+    EXTRA_CFLAGS += -DNV_PM_MESSAGE_T_PRESENT
-+  endif
-+
-+  ifeq ($(shell $(CONFTEST) pci_choose_state), 1)
-+    EXTRA_CFLAGS += -DNV_PCI_CHOOSE_STATE_PRESENT
-+  endif
-+
-+  ifeq ($(shell $(CONFTEST) vm_insert_page), 1)
-+	EXTRA_CFLAGS += -DNV_VM_INSERT_PAGE_PRESENT
-+  endif
- endif
- 
- ifeq ($(shell $(CONFTEST) remap_pfn_range), 1)
-diff -ru usr/src/nv/conftest.sh usr/src/nv.U011106/conftest.sh
---- usr/src/nv/conftest.sh	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U011106/conftest.sh	2006-01-11 18:57:15.466781750 +0100
-@@ -22,9 +22,17 @@
- OUTPUT=$4
- 
- CFLAGS="-D__KERNEL__ \
-+-DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
- -nostdinc -isystem $ISYSTEM \
- -Werror -Wimplicit-function-declaration"
- 
-+touch conftest$$.c
-+$CC -Wno-attributes -c conftest$$.c > /dev/null 2>&1
-+if [ $? -eq 0 ]; then
-+    CFLAGS="$CFLAGS -Wno-attributes"
-+fi
-+rm -f conftest$$.*
-+
- if [ "$OUTPUT" != "$SOURCES" ]; then
-     ARCH=`uname -m | sed -e 's/i.86/i386/'`
-     CFLAGS="$CFLAGS -I$OUTPUT/include2 -I$OUTPUT/include \
-@@ -42,7 +50,7 @@
-         echo "#include <linux/mm.h>
-         int nv_remap_page_range(void) {
-            pgprot_t pgprot = __pgprot(0);
--           remap_page_range(NULL, 0L, 0L, 0L, pgprot);
-+           return remap_page_range(NULL, 0L, 0L, 0L, pgprot);
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -57,7 +65,7 @@
-         echo "#include <linux/mm.h>
-         int nv_remap_page_range(void) {
-            pgprot_t pgprot = __pgprot(0);
--           remap_page_range(0L, 0L, 0L, pgprot);
-+           return remap_page_range(0L, 0L, 0L, pgprot);
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -528,7 +536,7 @@
-         echo "#include <linux/mm.h>
-         int nv_remap_pfn_range(void) {
-             pgprot_t pgprot = __pgprot(0);
--            remap_pfn_range(NULL, 0L, 0L, 0L, pgprot);
-+            return remap_pfn_range(NULL, 0L, 0L, 0L, pgprot);
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -644,4 +652,69 @@
-         fi
-     ;;
- 
-+    pm_message_t)
-+        #
-+        # Does linux/pm.h declare the pm_message_t type?
-+        #
-+
-+        echo "#include <linux/pm.h>
-+        void nv_test_pm_message_t(pm_message_t state) {
-+            pm_message_t *p = &state;
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -Wno-error -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
-+    pci_choose_state)
-+        #
-+        # Determine if pci_choose_state() is present.
-+        #
-+
-+        echo "#include <linux/pci.h>
-+        pci_power_t
-+        nv_pci_choose_state(struct pci_dev *dev, pm_message_t state) {
-+            return pci_choose_state(dev, state);
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
-+    vm_insert_page)
-+        #
-+        # Determine if vm_insert_page() is present.
-+        #
-+
-+        echo "#include <linux/mm.h>
-+        int nv_vm_insert_page(void) {
-+            struct page *page;
-+            return vm_insert_page(NULL, 0L, page);
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
- esac
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.U011106/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U011106/nv-linux.h	2006-01-11 18:57:07.922310250 +0100
-@@ -642,15 +642,49 @@
- #define NV_PRINT_AT(at)
- #endif
- 
--// acpi support has been back-ported to the 2.4 kernel, but the 2.4 driver
--// model is not sufficient for full acpi support. it may work in some cases,
--// but not enough for us to officially support this configuration.
--#if defined(CONFIG_ACPI) && defined(KERNEL_2_6)
--#define NV_PM_SUPPORT_ACPI
-+/*
-+ * On Linux 2.6, we support both APM and ACPI power management. On Linux
-+ * 2.4, we support APM, only. ACPI support has been back-ported to the
-+ * Linux 2.4 kernel, but the Linux 2.4 driver model is not sufficient for
-+ * full ACPI support: it may work with some systems, but not reliably
-+ * enough for us to officially support this configuration.
-+ *
-+ * We support two Linux kernel power managment interfaces: the original
-+ * pm_register()/pm_unregister() on Linux 2.4 and the device driver model
-+ * backed PCI driver power management callbacks introduced with Linux
-+ * 2.6.
-+ *
-+ * The code below determines which interface to support on this kernel
-+ * version, if any; if built for Linux 2.6, it will also determine if the
-+ * kernel comes with ACPI or APM power management support.
-+ */
-+#if defined(KERNEL_2_6) && (defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) || defined(CONFIG_ACPI))
-+#define NV_PM_SUPPORT_DEVICE_DRIVER_MODEL
-+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-+#define NV_PM_SUPPORT_NEW_STYLE_APM
-+#endif
- #endif
- 
--#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
--#define NV_PM_SUPPORT_APM
-+/*
-+ * On Linux 2.6 kernels >= 2.6.11, the PCI subsystem provides a new 
-+ * interface that allows PCI drivers to determine the correct power state
-+ * for a given system power state; our suspend/resume callbacks now use
-+ * this interface and operate on PCI power state defines.
-+ *
-+ * Define these new PCI power state #define's here for compatibility with
-+ * older Linux 2.6 kernels.
-+ */
-+#if defined(KERNEL_2_6) && !defined(PCI_D0)
-+#define PCI_D0 PM_SUSPEND_ON
-+#define PCI_D3hot PM_SUSPEND_MEM
-+#endif
-+
-+#if defined(KERNEL_2_6) && !defined(NV_PM_MESSAGE_T_PRESENT)
-+typedef u32 pm_message_t;
-+#endif
-+
-+#if defined(KERNEL_2_4) && (defined(CONFIG_APM) || defined(CONFIG_APM_MODULE))
-+#define NV_PM_SUPPORT_OLD_STYLE_APM
- #endif
- 
- #ifndef minor
-@@ -666,9 +700,13 @@
- #define PCI_CAP_ID_EXP 0x10
- #endif
- 
-+#if defined(NV_VM_INSERT_PAGE_PRESENT)
-+#define NV_VM_INSERT_PAGE(vma, addr, page) \
-+    vm_insert_page(vma, addr, page)
-+#endif
- #if defined(NV_REMAP_PFN_RANGE_PRESENT)
- #define NV_REMAP_PAGE_RANGE(from, offset, x...) \
--     remap_pfn_range(vma, from, ((offset) >> PAGE_SHIFT), x)
-+    remap_pfn_range(vma, from, ((offset) >> PAGE_SHIFT), x)
- #elif defined(NV_REMAP_PAGE_RANGE_5_PRESENT)
- #define NV_REMAP_PAGE_RANGE(x...) remap_page_range(vma, x)
- #elif defined(NV_REMAP_PAGE_RANGE_4_PRESENT)
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.U011106/nv-vm.c
---- usr/src/nv/nv-vm.c	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U011106/nv-vm.c	2006-01-11 18:57:07.922310250 +0100
-@@ -105,6 +105,15 @@
- #endif
- }
- 
-+static inline BOOL nv_page_locked(nv_pte_t *page_ptr)
-+{
-+    BOOL locked = FALSE; 
-+#if defined(PageReserved)
-+    locked = PageReserved(NV_GET_PAGE_STRUCT(page_ptr->phys_addr));
-+#endif 
-+    return locked;
-+}
-+
- #if defined(NV_SG_MAP_BUFFERS)
- 
- /* track how much memory has been remapped through the iommu/swiotlb */
-@@ -704,7 +713,7 @@
-         if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
-             nv_sg_unmap_buffer(dev, &page_ptr->sg_list, page_ptr);
- #endif
--        if (!NV_ALLOC_MAPPING_CONTIG(at->flags) && !NV_ALLOC_MAPPING_VMALLOC(at->flags))
-+        if (!NV_ALLOC_MAPPING_CONTIG(at->flags) && !NV_ALLOC_MAPPING_VMALLOC(at->flags) && !nv_page_locked(page_ptr))
-             NV_FREE_PAGES(page_ptr->virt_addr, 0);
-     }
-     nv_flush_caches();
-diff -ru usr/src/nv/nv.c usr/src/nv.U011106/nv.c
---- usr/src/nv/nv.c	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U011106/nv.c	2006-01-11 18:57:07.922310250 +0100
-@@ -29,7 +29,7 @@
- 
- static nv_linux_state_t nv_linux_devices[NV_MAX_DEVICES];
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- static struct pm_dev *apm_nv_dev[NV_MAX_DEVICES] = { 0 };
- #endif
- 
-@@ -244,8 +244,8 @@
- void          nv_kern_isr_bh(unsigned long);
- irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
- void          nv_kern_rc_timer(unsigned long);
--#if defined(NV_PM_SUPPORT_APM)
--int           nv_kern_apm_event(struct pm_dev *dev, pm_request_t rqst, void *data);
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-+static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
- #endif
- 
- static int    nv_kern_read_cardinfo(char *, char **, off_t off, int, int *, void *);
-@@ -265,9 +265,10 @@
- unsigned int  nv_kern_ctl_poll(struct file *, poll_table *);
- 
- int nv_kern_probe(struct pci_dev *, const struct pci_device_id *);
--#if defined(NV_PM_SUPPORT_ACPI)
--int nv_kern_acpi_standby(struct pci_dev *, u32);
--int nv_kern_acpi_resume(struct pci_dev *);
-+
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
-+static int    nv_kern_suspend(struct pci_dev *, pm_message_t);
-+static int    nv_kern_resume(struct pci_dev *);
- #endif
- 
- /***
-@@ -292,9 +293,9 @@
-     .name     = "nvidia",
-     .id_table = nv_pci_table,
-     .probe    = nv_kern_probe,
--#if defined(NV_PM_SUPPORT_ACPI)
--    .suspend  = nv_kern_acpi_standby,
--    .resume   = nv_kern_acpi_resume,
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
-+    .suspend  = nv_kern_suspend,
-+    .resume   = nv_kern_resume,
- #endif
- };
- 
-@@ -1084,9 +1085,12 @@
- 
-         // broken kernels may get confused after splitting the page and
-         // restore the page before returning to us. detect that case.
--        if ( (pte_val(*kpte) == kpte_val) &&
--             (pte_val(*kpte) & _PAGE_PSE))
-+        if (((pte_val(*kpte) & ~_PAGE_NX) == kpte_val) &&
-+            (pte_val(*kpte) & _PAGE_PSE))
-         {
-+            if ((pte_val(*kpte) & _PAGE_NX) &&
-+                    (__nv_supported_pte_mask & _PAGE_NX) == 0)
-+                clear_bit(_PAGE_BIT_NX, kpte);
-             spin_unlock(&init_mm.page_table_lock);
-             // don't change the page back, as it's already been reverted
-             put_page(kpte_page);
-@@ -1299,7 +1303,7 @@
-         nv_lock_init_locks(nv_ctl);
-     }
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-     {
-         apm_nv_dev[i] = pm_register(PM_PCI_DEV, PM_SYS_VGA, nv_kern_apm_event);
-@@ -1418,7 +1422,7 @@
-     if (nv_pte_t_cache != NULL)
-         NV_KMEM_CACHE_DESTROY(nv_pte_t_cache);
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-         if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
- #endif
-@@ -1473,10 +1477,10 @@
-     inter_module_unregister("nv_linux_devices");
- #endif
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-     {
--        pm_unregister(apm_nv_dev[i]);
-+        if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
-     }
- #endif
- 
-@@ -2118,8 +2122,13 @@
-         for (j = i; j < (i + pages); j++)
-         {
-             nv_verify_page_mappings(at->page_table[j], NV_ALLOC_MAPPING(at->flags));
-+#if defined(NV_VM_INSERT_PAGE_PRESENT)
-+            if (NV_VM_INSERT_PAGE(vma, start,
-+                    NV_GET_PAGE_STRUCT(at->page_table[j]->phys_addr)))
-+#else
-             if (NV_REMAP_PAGE_RANGE(start, at->page_table[j]->phys_addr,
-                     PAGE_SIZE, vma->vm_page_prot))
-+#endif
-             {
-                 NV_ATOMIC_DEC(at->usage_count);
-                 return -EAGAIN;
-@@ -2429,9 +2438,9 @@
-     mod_timer(&nvl->rc_timer, jiffies + HZ);  /* set another timeout in 1 second */
- }
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- /* kernel calls us with a power management event */
--int
-+static int
- nv_kern_apm_event(
-     struct pm_dev *dev,
-     pm_request_t rqst,
-@@ -2466,7 +2475,6 @@
- 
-     switch (rqst)
-     {
--#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-         case PM_RESUME:
-             nv_printf(NV_DBG_INFO, "NVRM: APM: received resume event\n");
-             status = rm_power_management(nv, 0, NV_PM_APM_RESUME);
-@@ -2476,15 +2484,12 @@
-             nv_printf(NV_DBG_INFO, "NVRM: APM: received suspend event\n");
-             status = rm_power_management(nv, 0, NV_PM_APM_SUSPEND);
-             break;
--#endif
- 
--#if defined(KERNEL_2_4)
-         // 2.4 kernels sent a PM_SAVE_STATE request when powering down via
-         // ACPI. just ignore it and return success so the power down works
-         case PM_SAVE_STATE:
-             status = RM_OK;
-             break;
--#endif
- 
-         default:
-             nv_printf(NV_DBG_WARNINGS, "NVRM: APM: unsupported event: %d\n", rqst);
-@@ -2496,7 +2501,7 @@
- 
-     return status;
- }
--#endif
-+#endif /* defined(NV_PM_SUPPORT_OLD_STYLE_APM) */
- 
- /*
- ** nv_kern_ctl_open
-@@ -3739,6 +3744,7 @@
-     nvl = &nv_linux_devices[num_nv_devices];
-     nv  = NV_STATE_PTR(nvl);
- 
-+    pci_set_drvdata(dev, (void *)nvl);
-     nvl->dev          = dev;
-     nv->vendor_id     = dev->vendor;
-     nv->device_id     = dev->device;
-@@ -3816,11 +3822,10 @@
- #endif
- }
- 
--#if defined(NV_PM_SUPPORT_ACPI)
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
- 
--int
--nv_acpi_event
--(
-+static int
-+nv_power_management(
-     struct pci_dev *dev, 
-     u32 state
- )
-@@ -3828,70 +3833,77 @@
-     nv_state_t *nv;
-     nv_linux_state_t *lnv = NULL;
-     int status = RM_OK;
--    U032 i;
- 
--    nv_printf(NV_DBG_INFO, "NVRM: nv_acpi_event: %d\n", state);
--
--    for (i = 0; i < num_nv_devices; i++)
--    {
--        if (nv_linux_devices[i].dev == dev)
--        {
--            lnv = &nv_linux_devices[i];
--            break;
--        }
--    }
-+    nv_printf(NV_DBG_INFO, "NVRM: nv_power_management: %d\n", state);
-+    lnv = pci_get_drvdata(dev);
- 
-     if ((!lnv) || (lnv->dev != dev))
-     {
--        nv_printf(NV_DBG_WARNINGS, "NVRM: ACPI: invalid device!\n");
-+        nv_printf(NV_DBG_WARNINGS, "NVRM: PM: invalid device!\n");
-         return -1;
-     }
- 
-     nv = NV_STATE_PTR(lnv);
-+    nv_verify_pci_config(NV_STATE_PTR(lnv), TRUE);
- 
-     switch (state)
-     {
--        case PM_SUSPEND_MEM:
-+#if defined(NV_PM_SUPPORT_NEW_STYLE_APM)
-+        case PCI_D3hot:
-+            nv_printf(NV_DBG_INFO, "NVRM: APM: received suspend event\n");
-+            status = rm_power_management(nv, 0, NV_PM_APM_SUSPEND);
-+            break;
-+
-+        case PCI_D0:
-+            nv_printf(NV_DBG_INFO, "NVRM: APM: received resume event\n");
-+            status = rm_power_management(nv, 0, NV_PM_APM_RESUME);
-+            break;
-+#else
-+        case PCI_D3hot:
-             nv_printf(NV_DBG_INFO, "NVRM: ACPI: received suspend event\n");
-             status = rm_power_management(nv, 0, NV_PM_ACPI_STANDBY);
-             break;
- 
--        case PM_SUSPEND_ON:
-+        case PCI_D0:
-             nv_printf(NV_DBG_INFO, "NVRM: ACPI: received resume event\n");
-             status = rm_power_management(nv, 0, NV_PM_ACPI_RESUME);
-             break;
--
-+#endif
-         default:
--            nv_printf(NV_DBG_WARNINGS, "NVRM: ACPI: unsupported event: %d\n", state);
-+            nv_printf(NV_DBG_WARNINGS, "NVRM: PM: unsupported event: %d\n", state);
-             return -1;
-     }
- 
-     if (status != RM_OK)
--        nv_printf(NV_DBG_ERRORS, "NVRM: ACPI: failed event: %d\n", state);
-+        nv_printf(NV_DBG_ERRORS, "NVRM: PM: failed event: %d\n", state);
- 
-     return status;
- }
- 
--int
--nv_kern_acpi_standby
--(
--    struct pci_dev *dev, 
--    u32 state
-+static int nv_kern_suspend(
-+    struct pci_dev *dev,
-+    pm_message_t state
- )
- {
--    return nv_acpi_event(dev, state);
-+    int power_state = -1;
-+
-+#if !defined(NV_PM_MESSAGE_T_PRESENT)
-+    power_state = state;
-+#elif defined(NV_PCI_CHOOSE_STATE_PRESENT)
-+    power_state = pci_choose_state(dev, state);
-+#endif
-+
-+    return nv_power_management(dev, power_state);
- }
- 
--int
--nv_kern_acpi_resume
--(
-+static int nv_kern_resume(
-     struct pci_dev *dev
- )
- {
--    return nv_acpi_event(dev, PM_SUSPEND_ON);
-+    return nv_power_management(dev, PCI_D0);
- }
- 
--#endif
-+#endif /* defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL) */
- 
- void* NV_API_CALL nv_get_adapter_state(
-     U016 bus,
diff --git a/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-U012206.diff b/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-U012206.diff
deleted file mode 100644
index 9736ea95468f..000000000000
--- a/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-U012206.diff
+++ /dev/null
@@ -1,793 +0,0 @@
-diff -ru usr/src/nv/Makefile.kbuild usr/src/nv.U012206/Makefile.kbuild
---- usr/src/nv/Makefile.kbuild	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U012206/Makefile.kbuild	2006-01-22 15:32:35.775636750 +0100
-@@ -186,6 +186,18 @@
-   ifeq ($(shell $(CONFTEST) sysctl_max_map_count), 1)
-     EXTRA_CFLAGS += -DNV_SYSCTL_MAX_MAP_COUNT_PRESENT
-   endif
-+
-+  ifeq ($(shell $(CONFTEST) pm_message_t), 1)
-+    EXTRA_CFLAGS += -DNV_PM_MESSAGE_T_PRESENT
-+  endif
-+
-+  ifeq ($(shell $(CONFTEST) pci_choose_state), 1)
-+    EXTRA_CFLAGS += -DNV_PCI_CHOOSE_STATE_PRESENT
-+  endif
-+
-+  ifeq ($(shell $(CONFTEST) vm_insert_page), 1)
-+	EXTRA_CFLAGS += -DNV_VM_INSERT_PAGE_PRESENT
-+  endif
- endif
- 
- ifeq ($(shell $(CONFTEST) remap_pfn_range), 1)
-diff -ru usr/src/nv/conftest.sh usr/src/nv.U012206/conftest.sh
---- usr/src/nv/conftest.sh	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U012206/conftest.sh	2006-01-22 15:32:06.353798000 +0100
-@@ -22,8 +22,8 @@
- OUTPUT=$4
- 
- CFLAGS="-D__KERNEL__ \
---nostdinc -isystem $ISYSTEM \
---Werror -Wimplicit-function-declaration"
-+-DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
-+-nostdinc -isystem $ISYSTEM"
- 
- if [ "$OUTPUT" != "$SOURCES" ]; then
-     ARCH=`uname -m | sed -e 's/i.86/i386/'`
-@@ -40,9 +40,22 @@
-         #
- 
-         echo "#include <linux/mm.h>
--        int nv_remap_page_range(void) {
-+        void conftest_remap_page_range(void) {
-+           remap_page_range();
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+          rm -f conftest$$.o
-+          exit 1
-+        fi
-+
-+        echo "#include <linux/mm.h>
-+        int conftest_remap_page_range(void) {
-            pgprot_t pgprot = __pgprot(0);
--           remap_page_range(NULL, 0L, 0L, 0L, pgprot);
-+           return remap_page_range(NULL, 0L, 0L, 0L, pgprot);
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -55,9 +68,9 @@
-         fi
- 
-         echo "#include <linux/mm.h>
--        int nv_remap_page_range(void) {
-+        int conftest_remap_page_range(void) {
-            pgprot_t pgprot = __pgprot(0);
--           remap_page_range(0L, 0L, 0L, pgprot);
-+           return remap_page_range(0L, 0L, 0L, pgprot);
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -330,7 +343,7 @@
-                 return 0;
-             }" > conftest$$.c
- 
--            $HOSTCC $CFLAGS -Wno-error -o conftest$$ conftest$$.c > /dev/null 2>&1
-+            $HOSTCC $CFLAGS -o conftest$$ conftest$$.c > /dev/null 2>&1
-             rm -f conftest$$.c
- 
-             if [ -f conftest$$ ]; then
-@@ -483,8 +496,8 @@
-         #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-           #include <asm/cacheflush.h>
-         #endif
--        int nv_change_page_attr(struct page *pp, int i, pgprot_t prot) {
--            return change_page_attr(pp, i, prot);
-+        void conftest_change_page_attr() {
-+            change_page_attr();
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -492,9 +505,9 @@
- 
-         if [ -f conftest$$.o ]; then
-             rm -f conftest$$.o
--            echo 1
--        else
-             echo 0
-+        else
-+            echo 1
-         fi
-     ;;
- 
-@@ -504,9 +517,8 @@
-         #
- 
-         echo "#include <linux/pci.h>
--        struct pci_dev*
--        nv_pci_get_class(unsigned int class, struct pci_dev *from) {
--            return pci_get_class(class, from);
-+        void conftest_pci_get_class(void) {
-+            pci_get_class();
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -514,9 +526,9 @@
- 
-         if [ -f conftest$$.o ]; then
-             rm -f conftest$$.o
--            echo 1
--        else
-             echo 0
-+        else
-+            echo 1
-         fi
-     ;;
- 
-@@ -526,9 +538,8 @@
-         #
- 
-         echo "#include <linux/mm.h>
--        int nv_remap_pfn_range(void) {
--            pgprot_t pgprot = __pgprot(0);
--            remap_pfn_range(NULL, 0L, 0L, 0L, pgprot);
-+        void conftest_remap_pfn_range(void) {
-+            remap_pfn_range();
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -536,9 +547,9 @@
- 
-         if [ -f conftest$$.o ]; then
-             rm -f conftest$$.o
--            echo 1
--        else
-             echo 0
-+        else
-+            echo 1
-         fi
-     ;;
- 
-@@ -548,11 +559,11 @@
-         #
- 
-         echo "#include <linux/sched.h>
--        struct rlimit *nv_signal_struct_rlim(void) {
-+        struct rlimit *conftest_signal_struct_rlim(void) {
-             return current->signal->rlim;
-         }" > conftest$$.c
- 
--        $CC $CFLAGS -Wno-error -c conftest$$.c > /dev/null 2>&1
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-         rm -f conftest$$.c
- 
-         if [ -f conftest$$.o ]; then
-@@ -572,7 +583,7 @@
-         echo "#include <linux/types.h>
-         #include <linux/agp_backend.h>
-         typedef struct agp_bridge_data agp_bridge_data;
--        agp_bridge_data *nv_agp_backend_acquire(struct pci_dev *dev) {
-+        agp_bridge_data *conftest_agp_backend_acquire(struct pci_dev *dev) {
-             return agp_backend_acquire(dev);
-         }" > conftest$$.c
- 
-@@ -594,9 +605,23 @@
-         #
- 
-         echo "#include <linux/vmalloc.h>
--        void *nv_vmap(struct page **pg, int cnt) {
-+        void conftest_vmap(void) {
-+            vmap();
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            exit 1
-+        fi
-+
-+        echo "#include <linux/vmalloc.h>
-+        void *conftest_vmap(struct page **pg, int cnt) {
-             return vmap(pg, cnt);
-         }" > conftest$$.c
-+
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-         rm -f conftest$$.c
- 
-@@ -608,9 +633,10 @@
- 
-         echo "#include <linux/vmalloc.h>
-         #include <linux/mm.h>
--        void *nv_vmap(struct page **pg, int cnt) {
-+        void *conftest_vmap(struct page **pg, int cnt) {
-             return vmap(pg, cnt, 0, PAGE_KERNEL);
-         }" > conftest$$.c
-+
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-         rm -f conftest$$.c
- 
-@@ -618,7 +644,11 @@
-             rm -f conftest$$.o
-             echo 4
-         else
--            exit 1  # there ain't no vmap()
-+            #
-+            # We couldn't determine the number of arguments expected by the
-+            # vmap() function.
-+            #
-+            exit 1
-         fi
-     ;;
- 
-@@ -629,7 +659,7 @@
-         #
- 
-         echo "#include <linux/sched.h>
--        int nv_test_sysctl_max_map_count(void) {
-+        int conftest_sysctl_max_map_count(void) {
-             return sysctl_max_map_count;
-         }" > conftest$$.c
- 
-@@ -644,4 +674,67 @@
-         fi
-     ;;
- 
-+    pm_message_t)
-+        #
-+        # Does linux/pm.h declare the pm_message_t type?
-+        #
-+
-+        echo "#include <linux/pm.h>
-+        void conftest_pm_message_t(pm_message_t state) {
-+            pm_message_t *p = &state;
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
-+    pci_choose_state)
-+        #
-+        # Determine if pci_choose_state() is present.
-+        #
-+
-+        echo "#include <linux/pci.h>
-+        void conftest_pci_choose_state(void) {
-+            pci_choose_state();
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 0
-+        else
-+            echo 1
-+        fi
-+    ;;
-+
-+    vm_insert_page)
-+        #
-+        # Determine if vm_insert_page() is present.
-+        #
-+
-+        echo "#include <linux/mm.h>
-+        void conftest_vm_insert_page(void) {
-+            vm_insert_page();
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 0
-+        else
-+            echo 1
-+        fi
-+    ;;
-+
- esac
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.U012206/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U012206/nv-linux.h	2006-01-22 15:32:35.775636750 +0100
-@@ -642,15 +642,49 @@
- #define NV_PRINT_AT(at)
- #endif
- 
--// acpi support has been back-ported to the 2.4 kernel, but the 2.4 driver
--// model is not sufficient for full acpi support. it may work in some cases,
--// but not enough for us to officially support this configuration.
--#if defined(CONFIG_ACPI) && defined(KERNEL_2_6)
--#define NV_PM_SUPPORT_ACPI
-+/*
-+ * On Linux 2.6, we support both APM and ACPI power management. On Linux
-+ * 2.4, we support APM, only. ACPI support has been back-ported to the
-+ * Linux 2.4 kernel, but the Linux 2.4 driver model is not sufficient for
-+ * full ACPI support: it may work with some systems, but not reliably
-+ * enough for us to officially support this configuration.
-+ *
-+ * We support two Linux kernel power managment interfaces: the original
-+ * pm_register()/pm_unregister() on Linux 2.4 and the device driver model
-+ * backed PCI driver power management callbacks introduced with Linux
-+ * 2.6.
-+ *
-+ * The code below determines which interface to support on this kernel
-+ * version, if any; if built for Linux 2.6, it will also determine if the
-+ * kernel comes with ACPI or APM power management support.
-+ */
-+#if defined(KERNEL_2_6) && (defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) || defined(CONFIG_ACPI))
-+#define NV_PM_SUPPORT_DEVICE_DRIVER_MODEL
-+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-+#define NV_PM_SUPPORT_NEW_STYLE_APM
-+#endif
- #endif
- 
--#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
--#define NV_PM_SUPPORT_APM
-+/*
-+ * On Linux 2.6 kernels >= 2.6.11, the PCI subsystem provides a new 
-+ * interface that allows PCI drivers to determine the correct power state
-+ * for a given system power state; our suspend/resume callbacks now use
-+ * this interface and operate on PCI power state defines.
-+ *
-+ * Define these new PCI power state #define's here for compatibility with
-+ * older Linux 2.6 kernels.
-+ */
-+#if defined(KERNEL_2_6) && !defined(PCI_D0)
-+#define PCI_D0 PM_SUSPEND_ON
-+#define PCI_D3hot PM_SUSPEND_MEM
-+#endif
-+
-+#if defined(KERNEL_2_6) && !defined(NV_PM_MESSAGE_T_PRESENT)
-+typedef u32 pm_message_t;
-+#endif
-+
-+#if defined(KERNEL_2_4) && (defined(CONFIG_APM) || defined(CONFIG_APM_MODULE))
-+#define NV_PM_SUPPORT_OLD_STYLE_APM
- #endif
- 
- #ifndef minor
-@@ -666,9 +700,13 @@
- #define PCI_CAP_ID_EXP 0x10
- #endif
- 
-+#if defined(NV_VM_INSERT_PAGE_PRESENT)
-+#define NV_VM_INSERT_PAGE(vma, addr, page) \
-+    vm_insert_page(vma, addr, page)
-+#endif
- #if defined(NV_REMAP_PFN_RANGE_PRESENT)
- #define NV_REMAP_PAGE_RANGE(from, offset, x...) \
--     remap_pfn_range(vma, from, ((offset) >> PAGE_SHIFT), x)
-+    remap_pfn_range(vma, from, ((offset) >> PAGE_SHIFT), x)
- #elif defined(NV_REMAP_PAGE_RANGE_5_PRESENT)
- #define NV_REMAP_PAGE_RANGE(x...) remap_page_range(vma, x)
- #elif defined(NV_REMAP_PAGE_RANGE_4_PRESENT)
-@@ -840,11 +878,7 @@
-     }
- #endif
- 
--#if !defined(page_to_pfn)
--#define page_to_pfn(page)  ((page) - mem_map)
--#endif
--
--#if !defined(pfn_to_page)
-+#if defined(KERNEL_2_4) && defined(NVCPU_X86) && !defined(pfn_to_page)
- #define pfn_to_page(pfn) (mem_map + (pfn))
- #endif
- 
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.U012206/nv-vm.c
---- usr/src/nv/nv-vm.c	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U012206/nv-vm.c	2006-01-22 15:32:35.775636750 +0100
-@@ -105,6 +105,15 @@
- #endif
- }
- 
-+static inline BOOL nv_page_locked(nv_pte_t *page_ptr)
-+{
-+    BOOL locked = FALSE; 
-+#if defined(PageReserved)
-+    locked = PageReserved(NV_GET_PAGE_STRUCT(page_ptr->phys_addr));
-+#endif 
-+    return locked;
-+}
-+
- #if defined(NV_SG_MAP_BUFFERS)
- 
- /* track how much memory has been remapped through the iommu/swiotlb */
-@@ -704,7 +713,7 @@
-         if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
-             nv_sg_unmap_buffer(dev, &page_ptr->sg_list, page_ptr);
- #endif
--        if (!NV_ALLOC_MAPPING_CONTIG(at->flags) && !NV_ALLOC_MAPPING_VMALLOC(at->flags))
-+        if (!NV_ALLOC_MAPPING_CONTIG(at->flags) && !NV_ALLOC_MAPPING_VMALLOC(at->flags) && !nv_page_locked(page_ptr))
-             NV_FREE_PAGES(page_ptr->virt_addr, 0);
-     }
-     nv_flush_caches();
-diff -ru usr/src/nv/nv.c usr/src/nv.U012206/nv.c
---- usr/src/nv/nv.c	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U012206/nv.c	2006-01-22 15:32:35.775636750 +0100
-@@ -29,7 +29,7 @@
- 
- static nv_linux_state_t nv_linux_devices[NV_MAX_DEVICES];
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- static struct pm_dev *apm_nv_dev[NV_MAX_DEVICES] = { 0 };
- #endif
- 
-@@ -244,8 +244,8 @@
- void          nv_kern_isr_bh(unsigned long);
- irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
- void          nv_kern_rc_timer(unsigned long);
--#if defined(NV_PM_SUPPORT_APM)
--int           nv_kern_apm_event(struct pm_dev *dev, pm_request_t rqst, void *data);
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-+static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
- #endif
- 
- static int    nv_kern_read_cardinfo(char *, char **, off_t off, int, int *, void *);
-@@ -265,9 +265,10 @@
- unsigned int  nv_kern_ctl_poll(struct file *, poll_table *);
- 
- int nv_kern_probe(struct pci_dev *, const struct pci_device_id *);
--#if defined(NV_PM_SUPPORT_ACPI)
--int nv_kern_acpi_standby(struct pci_dev *, u32);
--int nv_kern_acpi_resume(struct pci_dev *);
-+
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
-+static int    nv_kern_suspend(struct pci_dev *, pm_message_t);
-+static int    nv_kern_resume(struct pci_dev *);
- #endif
- 
- /***
-@@ -292,9 +293,9 @@
-     .name     = "nvidia",
-     .id_table = nv_pci_table,
-     .probe    = nv_kern_probe,
--#if defined(NV_PM_SUPPORT_ACPI)
--    .suspend  = nv_kern_acpi_standby,
--    .resume   = nv_kern_acpi_resume,
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
-+    .suspend  = nv_kern_suspend,
-+    .resume   = nv_kern_resume,
- #endif
- };
- 
-@@ -852,7 +853,8 @@
- 
-     if (!test_bit(X86_FEATURE_PAT, (volatile unsigned long *)&boot_cpu_data.x86_capability))
-     {
--        nv_printf(NV_DBG_ERRORS, "NVRM: cpu does not support PAT, aborting..\n");
-+        nv_printf(NV_DBG_ERRORS,
-+            "NVRM: CPU does not support the PAT, falling back to MTRRs.\n");
-         return 0;
-     }
- 
-@@ -1084,9 +1086,12 @@
- 
-         // broken kernels may get confused after splitting the page and
-         // restore the page before returning to us. detect that case.
--        if ( (pte_val(*kpte) == kpte_val) &&
--             (pte_val(*kpte) & _PAGE_PSE))
-+        if (((pte_val(*kpte) & ~_PAGE_NX) == kpte_val) &&
-+            (pte_val(*kpte) & _PAGE_PSE))
-         {
-+            if ((pte_val(*kpte) & _PAGE_NX) &&
-+                    (__nv_supported_pte_mask & _PAGE_NX) == 0)
-+                clear_bit(_PAGE_BIT_NX, kpte);
-             spin_unlock(&init_mm.page_table_lock);
-             // don't change the page back, as it's already been reverted
-             put_page(kpte_page);
-@@ -1299,7 +1304,7 @@
-         nv_lock_init_locks(nv_ctl);
-     }
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-     {
-         apm_nv_dev[i] = pm_register(PM_PCI_DEV, PM_SYS_VGA, nv_kern_apm_event);
-@@ -1407,8 +1412,11 @@
- 
- #if defined(NV_BUILD_NV_PAT_SUPPORT)
-     if (!nv_disable_pat)
--    {
-         __nv_enable_pat_support();
-+    else
-+    {
-+        nv_printf(NV_DBG_ERRORS,
-+            "NVRM: builtin PAT support disabled, falling back to MTRRs.\n");
-     }
- #endif
- 
-@@ -1418,7 +1426,7 @@
-     if (nv_pte_t_cache != NULL)
-         NV_KMEM_CACHE_DESTROY(nv_pte_t_cache);
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-         if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
- #endif
-@@ -1473,10 +1481,10 @@
-     inter_module_unregister("nv_linux_devices");
- #endif
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-     {
--        pm_unregister(apm_nv_dev[i]);
-+        if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
-     }
- #endif
- 
-@@ -1889,9 +1897,6 @@
-     // allow setting or refusal of specific caching types
-     switch (cache_type)
-     {
--        case NV_MEMORY_CACHED:
--        //case NV_MEMORY_WRITEBACK:
--            break;
-         case NV_MEMORY_UNCACHED_WEAK:
-             *prot = pgprot_noncached_weak(*prot);
-             break;
-@@ -1899,19 +1904,53 @@
-             *prot = pgprot_noncached(*prot);
-             break;
-         case NV_MEMORY_WRITECOMBINED:
--            if (nv_pat_enabled)
-+            if (nv_pat_enabled &&
-+                (memory_type != NV_MEMORY_TYPE_REGISTERS))
-             {
-                 *prot = pgprot_writecombined(*prot);
-                 break;
-             }
--            /* agp allocations should be covered by an mtrr if pat isn't enabled */
-+            /*
-+             * If PAT support is unavailable and the memory space isn't
-+             * NV_MEMORY_TYPE_AGP, we need to return an error code to
-+             * the caller, but do not print a warning message.
-+             *
-+             * In the case of AGP memory, we will have attempted to add
-+             * a WC MTRR for the AGP aperture and aborted the AGP
-+             * initialization if this failed, so we can safely return
-+             * success here.
-+             *
-+             * For frame buffer memory, callers are expected to use the
-+             * UC- memory type if we report WC as unsupported, which
-+             * translates to the effective memory type WC if a WC MTRR
-+             * exists or else UC.
-+             */
-             if (memory_type == NV_MEMORY_TYPE_AGP)
-                 break;
-+            return 1;
-+        case NV_MEMORY_CACHED:
-+        //case NV_MEMORY_WRITEBACK:
-+            /*
-+             * RAM is cached on Linux by default, we can assume there's
-+             * nothing to be done here. This is not the case for the
-+             * other memory spaces: as commented on above, we will have
-+             * added a WC MTRR for the AGP aperture (or else aborted
-+             * AGP initialization), and we will have made an attempt to
-+             * add a WC MTRR for the frame buffer.
-+             *
-+             * If a WC MTRR is present, we can't satisfy the WB mapping
-+             * attempt here, since the achievable effective memory
-+             * types in that case are WC and UC, if not it's typically
-+             * UC (MTRRdefType is UC); we could only satisfy WB mapping
-+             * requests with a WB MTRR.
-+             */
-+            if (memory_type == NV_MEMORY_TYPE_SYSTEM)
-+                break;
-         //case NV_MEMORY_WRITETHRU:
-         //case NV_MEMORY_WRITEPROTECT:
-         default:
-             nv_printf(NV_DBG_ERRORS,
--                "NVRM: memory caching type 0x%x not supported for memory space %d!\n",
-+                "NVRM: VM: memory type %d not supported for memory space %d!\n",
-                 cache_type, memory_type);
-             return 1;
-     }
-@@ -2118,8 +2157,13 @@
-         for (j = i; j < (i + pages); j++)
-         {
-             nv_verify_page_mappings(at->page_table[j], NV_ALLOC_MAPPING(at->flags));
-+#if defined(NV_VM_INSERT_PAGE_PRESENT)
-+            if (NV_VM_INSERT_PAGE(vma, start,
-+                    NV_GET_PAGE_STRUCT(at->page_table[j]->phys_addr)))
-+#else
-             if (NV_REMAP_PAGE_RANGE(start, at->page_table[j]->phys_addr,
-                     PAGE_SIZE, vma->vm_page_prot))
-+#endif
-             {
-                 NV_ATOMIC_DEC(at->usage_count);
-                 return -EAGAIN;
-@@ -2429,9 +2473,9 @@
-     mod_timer(&nvl->rc_timer, jiffies + HZ);  /* set another timeout in 1 second */
- }
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- /* kernel calls us with a power management event */
--int
-+static int
- nv_kern_apm_event(
-     struct pm_dev *dev,
-     pm_request_t rqst,
-@@ -2466,7 +2510,6 @@
- 
-     switch (rqst)
-     {
--#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-         case PM_RESUME:
-             nv_printf(NV_DBG_INFO, "NVRM: APM: received resume event\n");
-             status = rm_power_management(nv, 0, NV_PM_APM_RESUME);
-@@ -2476,15 +2519,12 @@
-             nv_printf(NV_DBG_INFO, "NVRM: APM: received suspend event\n");
-             status = rm_power_management(nv, 0, NV_PM_APM_SUSPEND);
-             break;
--#endif
- 
--#if defined(KERNEL_2_4)
-         // 2.4 kernels sent a PM_SAVE_STATE request when powering down via
-         // ACPI. just ignore it and return success so the power down works
-         case PM_SAVE_STATE:
-             status = RM_OK;
-             break;
--#endif
- 
-         default:
-             nv_printf(NV_DBG_WARNINGS, "NVRM: APM: unsupported event: %d\n", rqst);
-@@ -2496,7 +2536,7 @@
- 
-     return status;
- }
--#endif
-+#endif /* defined(NV_PM_SUPPORT_OLD_STYLE_APM) */
- 
- /*
- ** nv_kern_ctl_open
-@@ -3739,6 +3779,7 @@
-     nvl = &nv_linux_devices[num_nv_devices];
-     nv  = NV_STATE_PTR(nvl);
- 
-+    pci_set_drvdata(dev, (void *)nvl);
-     nvl->dev          = dev;
-     nv->vendor_id     = dev->vendor;
-     nv->device_id     = dev->device;
-@@ -3816,11 +3857,10 @@
- #endif
- }
- 
--#if defined(NV_PM_SUPPORT_ACPI)
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
- 
--int
--nv_acpi_event
--(
-+static int
-+nv_power_management(
-     struct pci_dev *dev, 
-     u32 state
- )
-@@ -3828,70 +3868,77 @@
-     nv_state_t *nv;
-     nv_linux_state_t *lnv = NULL;
-     int status = RM_OK;
--    U032 i;
- 
--    nv_printf(NV_DBG_INFO, "NVRM: nv_acpi_event: %d\n", state);
--
--    for (i = 0; i < num_nv_devices; i++)
--    {
--        if (nv_linux_devices[i].dev == dev)
--        {
--            lnv = &nv_linux_devices[i];
--            break;
--        }
--    }
-+    nv_printf(NV_DBG_INFO, "NVRM: nv_power_management: %d\n", state);
-+    lnv = pci_get_drvdata(dev);
- 
-     if ((!lnv) || (lnv->dev != dev))
-     {
--        nv_printf(NV_DBG_WARNINGS, "NVRM: ACPI: invalid device!\n");
-+        nv_printf(NV_DBG_WARNINGS, "NVRM: PM: invalid device!\n");
-         return -1;
-     }
- 
-     nv = NV_STATE_PTR(lnv);
-+    nv_verify_pci_config(NV_STATE_PTR(lnv), TRUE);
- 
-     switch (state)
-     {
--        case PM_SUSPEND_MEM:
-+#if defined(NV_PM_SUPPORT_NEW_STYLE_APM)
-+        case PCI_D3hot:
-+            nv_printf(NV_DBG_INFO, "NVRM: APM: received suspend event\n");
-+            status = rm_power_management(nv, 0, NV_PM_APM_SUSPEND);
-+            break;
-+
-+        case PCI_D0:
-+            nv_printf(NV_DBG_INFO, "NVRM: APM: received resume event\n");
-+            status = rm_power_management(nv, 0, NV_PM_APM_RESUME);
-+            break;
-+#else
-+        case PCI_D3hot:
-             nv_printf(NV_DBG_INFO, "NVRM: ACPI: received suspend event\n");
-             status = rm_power_management(nv, 0, NV_PM_ACPI_STANDBY);
-             break;
- 
--        case PM_SUSPEND_ON:
-+        case PCI_D0:
-             nv_printf(NV_DBG_INFO, "NVRM: ACPI: received resume event\n");
-             status = rm_power_management(nv, 0, NV_PM_ACPI_RESUME);
-             break;
--
-+#endif
-         default:
--            nv_printf(NV_DBG_WARNINGS, "NVRM: ACPI: unsupported event: %d\n", state);
-+            nv_printf(NV_DBG_WARNINGS, "NVRM: PM: unsupported event: %d\n", state);
-             return -1;
-     }
- 
-     if (status != RM_OK)
--        nv_printf(NV_DBG_ERRORS, "NVRM: ACPI: failed event: %d\n", state);
-+        nv_printf(NV_DBG_ERRORS, "NVRM: PM: failed event: %d\n", state);
- 
-     return status;
- }
- 
--int
--nv_kern_acpi_standby
--(
--    struct pci_dev *dev, 
--    u32 state
-+static int nv_kern_suspend(
-+    struct pci_dev *dev,
-+    pm_message_t state
- )
- {
--    return nv_acpi_event(dev, state);
-+    int power_state = -1;
-+
-+#if !defined(NV_PM_MESSAGE_T_PRESENT)
-+    power_state = state;
-+#elif defined(NV_PCI_CHOOSE_STATE_PRESENT)
-+    power_state = pci_choose_state(dev, state);
-+#endif
-+
-+    return nv_power_management(dev, power_state);
- }
- 
--int
--nv_kern_acpi_resume
--(
-+static int nv_kern_resume(
-     struct pci_dev *dev
- )
- {
--    return nv_acpi_event(dev, PM_SUSPEND_ON);
-+    return nv_power_management(dev, PCI_D0);
- }
- 
--#endif
-+#endif /* defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL) */
- 
- void* NV_API_CALL nv_get_adapter_state(
-     U016 bus,
diff --git a/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-U122205.diff b/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-U122205.diff
deleted file mode 100644
index 4a672cbe49c5..000000000000
--- a/media-video/nvidia-kernel/files/1.0.8178/NVIDIA_kernel-1.0-8178-U122205.diff
+++ /dev/null
@@ -1,509 +0,0 @@
-diff -ru usr/src/nv/Makefile.kbuild usr/src/nv.U122205/Makefile.kbuild
---- usr/src/nv/Makefile.kbuild	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U122205/Makefile.kbuild	2005-12-22 18:49:02.746376250 +0100
-@@ -186,6 +186,18 @@
-   ifeq ($(shell $(CONFTEST) sysctl_max_map_count), 1)
-     EXTRA_CFLAGS += -DNV_SYSCTL_MAX_MAP_COUNT_PRESENT
-   endif
-+
-+  ifeq ($(shell $(CONFTEST) pm_message_t), 1)
-+    EXTRA_CFLAGS += -DNV_PM_MESSAGE_T_PRESENT
-+  endif
-+
-+  ifeq ($(shell $(CONFTEST) pci_choose_state), 1)
-+    EXTRA_CFLAGS += -DNV_PCI_CHOOSE_STATE_PRESENT
-+  endif
-+
-+  ifeq ($(shell $(CONFTEST) vm_insert_page), 1)
-+	EXTRA_CFLAGS += -DNV_VM_INSERT_PAGE_PRESENT
-+  endif
- endif
- 
- ifeq ($(shell $(CONFTEST) remap_pfn_range), 1)
-diff -ru usr/src/nv/conftest.sh usr/src/nv.U122205/conftest.sh
---- usr/src/nv/conftest.sh	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U122205/conftest.sh	2005-12-22 18:49:02.746376250 +0100
-@@ -42,7 +42,7 @@
-         echo "#include <linux/mm.h>
-         int nv_remap_page_range(void) {
-            pgprot_t pgprot = __pgprot(0);
--           remap_page_range(NULL, 0L, 0L, 0L, pgprot);
-+           return remap_page_range(NULL, 0L, 0L, 0L, pgprot);
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -57,7 +57,7 @@
-         echo "#include <linux/mm.h>
-         int nv_remap_page_range(void) {
-            pgprot_t pgprot = __pgprot(0);
--           remap_page_range(0L, 0L, 0L, pgprot);
-+           return remap_page_range(0L, 0L, 0L, pgprot);
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -528,7 +528,7 @@
-         echo "#include <linux/mm.h>
-         int nv_remap_pfn_range(void) {
-             pgprot_t pgprot = __pgprot(0);
--            remap_pfn_range(NULL, 0L, 0L, 0L, pgprot);
-+            return remap_pfn_range(NULL, 0L, 0L, 0L, pgprot);
-         }" > conftest$$.c
- 
-         $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-@@ -644,4 +644,69 @@
-         fi
-     ;;
- 
-+    pm_message_t)
-+        #
-+        # Does linux/pm.h declare the pm_message_t type?
-+        #
-+
-+        echo "#include <linux/pm.h>
-+        void nv_test_pm_message_t(pm_message_t state) {
-+            pm_message_t *p = &state;
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -Wno-error -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
-+    pci_choose_state)
-+        #
-+        # Determine if pci_choose_state() is present.
-+        #
-+
-+        echo "#include <linux/pci.h>
-+        pci_power_t
-+        nv_pci_choose_state(struct pci_dev *dev, pm_message_t state) {
-+            return pci_choose_state(dev, state);
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
-+    vm_insert_page)
-+        #
-+        # Determine if vm_insert_page() is present.
-+        #
-+
-+        echo "#include <linux/mm.h>
-+        int nv_vm_insert_page(void) {
-+            struct page *page;
-+            return vm_insert_page(NULL, 0L, page);
-+        }" > conftest$$.c
-+
-+        $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
-+        rm -f conftest$$.c
-+
-+        if [ -f conftest$$.o ]; then
-+            rm -f conftest$$.o
-+            echo 1
-+        else
-+            echo 0
-+        fi
-+    ;;
-+
- esac
-diff -ru usr/src/nv/nv-linux.h usr/src/nv.U122205/nv-linux.h
---- usr/src/nv/nv-linux.h	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U122205/nv-linux.h	2005-12-22 18:49:02.746376250 +0100
-@@ -642,15 +642,49 @@
- #define NV_PRINT_AT(at)
- #endif
- 
--// acpi support has been back-ported to the 2.4 kernel, but the 2.4 driver
--// model is not sufficient for full acpi support. it may work in some cases,
--// but not enough for us to officially support this configuration.
--#if defined(CONFIG_ACPI) && defined(KERNEL_2_6)
--#define NV_PM_SUPPORT_ACPI
-+/*
-+ * On Linux 2.6, we support both APM and ACPI power management. On Linux
-+ * 2.4, we support APM, only. ACPI support has been back-ported to the
-+ * Linux 2.4 kernel, but the Linux 2.4 driver model is not sufficient for
-+ * full ACPI support: it may work with some systems, but not reliably
-+ * enough for us to officially support this configuration.
-+ *
-+ * We support two Linux kernel power managment interfaces: the original
-+ * pm_register()/pm_unregister() on Linux 2.4 and the device driver model
-+ * backed PCI driver power management callbacks introduced with Linux
-+ * 2.6.
-+ *
-+ * The code below determines which interface to support on this kernel
-+ * version, if any; if built for Linux 2.6, it will also determine if the
-+ * kernel comes with ACPI or APM power management support.
-+ */
-+#if defined(KERNEL_2_6) && (defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) || defined(CONFIG_ACPI))
-+#define NV_PM_SUPPORT_DEVICE_DRIVER_MODEL
-+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-+#define NV_PM_SUPPORT_NEW_STYLE_APM
-+#endif
- #endif
- 
--#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
--#define NV_PM_SUPPORT_APM
-+/*
-+ * On Linux 2.6 kernels >= 2.6.11, the PCI subsystem provides a new 
-+ * interface that allows PCI drivers to determine the correct power state
-+ * for a given system power state; our suspend/resume callbacks now use
-+ * this interface and operate on PCI power state defines.
-+ *
-+ * Define these new PCI power state #define's here for compatibility with
-+ * older Linux 2.6 kernels.
-+ */
-+#if defined(KERNEL_2_6) && !defined(PCI_D0)
-+#define PCI_D0 PM_SUSPEND_ON
-+#define PCI_D3hot PM_SUSPEND_MEM
-+#endif
-+
-+#if defined(KERNEL_2_6) && !defined(NV_PM_MESSAGE_T_PRESENT)
-+typedef u32 pm_message_t;
-+#endif
-+
-+#if defined(KERNEL_2_4) && (defined(CONFIG_APM) || defined(CONFIG_APM_MODULE))
-+#define NV_PM_SUPPORT_OLD_STYLE_APM
- #endif
- 
- #ifndef minor
-@@ -666,9 +700,13 @@
- #define PCI_CAP_ID_EXP 0x10
- #endif
- 
-+#if defined(NV_VM_INSERT_PAGE_PRESENT)
-+#define NV_VM_INSERT_PAGE(vma, addr, page) \
-+    vm_insert_page(vma, addr, page)
-+#endif
- #if defined(NV_REMAP_PFN_RANGE_PRESENT)
- #define NV_REMAP_PAGE_RANGE(from, offset, x...) \
--     remap_pfn_range(vma, from, ((offset) >> PAGE_SHIFT), x)
-+    remap_pfn_range(vma, from, ((offset) >> PAGE_SHIFT), x)
- #elif defined(NV_REMAP_PAGE_RANGE_5_PRESENT)
- #define NV_REMAP_PAGE_RANGE(x...) remap_page_range(vma, x)
- #elif defined(NV_REMAP_PAGE_RANGE_4_PRESENT)
-diff -ru usr/src/nv/nv-vm.c usr/src/nv.U122205/nv-vm.c
---- usr/src/nv/nv-vm.c	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U122205/nv-vm.c	2005-12-22 18:49:02.746376250 +0100
-@@ -105,6 +105,15 @@
- #endif
- }
- 
-+static inline BOOL nv_page_locked(nv_pte_t *page_ptr)
-+{
-+    BOOL locked = FALSE; 
-+#if defined(PageReserved)
-+    locked = PageReserved(NV_GET_PAGE_STRUCT(page_ptr->phys_addr));
-+#endif 
-+    return locked;
-+}
-+
- #if defined(NV_SG_MAP_BUFFERS)
- 
- /* track how much memory has been remapped through the iommu/swiotlb */
-@@ -704,7 +713,7 @@
-         if (!NV_ALLOC_MAPPING_CONTIG(at->flags))
-             nv_sg_unmap_buffer(dev, &page_ptr->sg_list, page_ptr);
- #endif
--        if (!NV_ALLOC_MAPPING_CONTIG(at->flags) && !NV_ALLOC_MAPPING_VMALLOC(at->flags))
-+        if (!NV_ALLOC_MAPPING_CONTIG(at->flags) && !NV_ALLOC_MAPPING_VMALLOC(at->flags) && !nv_page_locked(page_ptr))
-             NV_FREE_PAGES(page_ptr->virt_addr, 0);
-     }
-     nv_flush_caches();
-diff -ru usr/src/nv/nv.c usr/src/nv.U122205/nv.c
---- usr/src/nv/nv.c	2005-12-15 01:57:35.000000000 +0100
-+++ usr/src/nv.U122205/nv.c	2005-12-22 18:49:05.822568500 +0100
-@@ -29,7 +29,7 @@
- 
- static nv_linux_state_t nv_linux_devices[NV_MAX_DEVICES];
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- static struct pm_dev *apm_nv_dev[NV_MAX_DEVICES] = { 0 };
- #endif
- 
-@@ -244,8 +244,8 @@
- void          nv_kern_isr_bh(unsigned long);
- irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
- void          nv_kern_rc_timer(unsigned long);
--#if defined(NV_PM_SUPPORT_APM)
--int           nv_kern_apm_event(struct pm_dev *dev, pm_request_t rqst, void *data);
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-+static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
- #endif
- 
- static int    nv_kern_read_cardinfo(char *, char **, off_t off, int, int *, void *);
-@@ -265,9 +265,10 @@
- unsigned int  nv_kern_ctl_poll(struct file *, poll_table *);
- 
- int nv_kern_probe(struct pci_dev *, const struct pci_device_id *);
--#if defined(NV_PM_SUPPORT_ACPI)
--int nv_kern_acpi_standby(struct pci_dev *, u32);
--int nv_kern_acpi_resume(struct pci_dev *);
-+
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
-+static int    nv_kern_suspend(struct pci_dev *, pm_message_t);
-+static int    nv_kern_resume(struct pci_dev *);
- #endif
- 
- /***
-@@ -292,9 +293,9 @@
-     .name     = "nvidia",
-     .id_table = nv_pci_table,
-     .probe    = nv_kern_probe,
--#if defined(NV_PM_SUPPORT_ACPI)
--    .suspend  = nv_kern_acpi_standby,
--    .resume   = nv_kern_acpi_resume,
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
-+    .suspend  = nv_kern_suspend,
-+    .resume   = nv_kern_resume,
- #endif
- };
- 
-@@ -1084,9 +1085,12 @@
- 
-         // broken kernels may get confused after splitting the page and
-         // restore the page before returning to us. detect that case.
--        if ( (pte_val(*kpte) == kpte_val) &&
--             (pte_val(*kpte) & _PAGE_PSE))
-+        if (((pte_val(*kpte) & ~_PAGE_NX) == kpte_val) &&
-+            (pte_val(*kpte) & _PAGE_PSE))
-         {
-+            if ((pte_val(*kpte) & _PAGE_NX) &&
-+                    (__nv_supported_pte_mask & _PAGE_NX) == 0)
-+                clear_bit(_PAGE_BIT_NX, kpte);
-             spin_unlock(&init_mm.page_table_lock);
-             // don't change the page back, as it's already been reverted
-             put_page(kpte_page);
-@@ -1299,7 +1303,7 @@
-         nv_lock_init_locks(nv_ctl);
-     }
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-     {
-         apm_nv_dev[i] = pm_register(PM_PCI_DEV, PM_SYS_VGA, nv_kern_apm_event);
-@@ -1418,7 +1422,7 @@
-     if (nv_pte_t_cache != NULL)
-         NV_KMEM_CACHE_DESTROY(nv_pte_t_cache);
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-         if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
- #endif
-@@ -1473,10 +1477,10 @@
-     inter_module_unregister("nv_linux_devices");
- #endif
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
-     for (i = 0; i < num_nv_devices; i++)
-     {
--        pm_unregister(apm_nv_dev[i]);
-+        if (apm_nv_dev[i] != NULL) pm_unregister(apm_nv_dev[i]);
-     }
- #endif
- 
-@@ -2118,8 +2122,13 @@
-         for (j = i; j < (i + pages); j++)
-         {
-             nv_verify_page_mappings(at->page_table[j], NV_ALLOC_MAPPING(at->flags));
-+#if defined(NV_VM_INSERT_PAGE_PRESENT)
-+            if (NV_VM_INSERT_PAGE(vma, start,
-+                    NV_GET_PAGE_STRUCT(at->page_table[j]->phys_addr)))
-+#else
-             if (NV_REMAP_PAGE_RANGE(start, at->page_table[j]->phys_addr,
-                     PAGE_SIZE, vma->vm_page_prot))
-+#endif
-             {
-                 NV_ATOMIC_DEC(at->usage_count);
-                 return -EAGAIN;
-@@ -2429,9 +2438,9 @@
-     mod_timer(&nvl->rc_timer, jiffies + HZ);  /* set another timeout in 1 second */
- }
- 
--#if defined(NV_PM_SUPPORT_APM)
-+#if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- /* kernel calls us with a power management event */
--int
-+static int
- nv_kern_apm_event(
-     struct pm_dev *dev,
-     pm_request_t rqst,
-@@ -2466,7 +2475,6 @@
- 
-     switch (rqst)
-     {
--#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
-         case PM_RESUME:
-             nv_printf(NV_DBG_INFO, "NVRM: APM: received resume event\n");
-             status = rm_power_management(nv, 0, NV_PM_APM_RESUME);
-@@ -2476,15 +2484,12 @@
-             nv_printf(NV_DBG_INFO, "NVRM: APM: received suspend event\n");
-             status = rm_power_management(nv, 0, NV_PM_APM_SUSPEND);
-             break;
--#endif
- 
--#if defined(KERNEL_2_4)
-         // 2.4 kernels sent a PM_SAVE_STATE request when powering down via
-         // ACPI. just ignore it and return success so the power down works
-         case PM_SAVE_STATE:
-             status = RM_OK;
-             break;
--#endif
- 
-         default:
-             nv_printf(NV_DBG_WARNINGS, "NVRM: APM: unsupported event: %d\n", rqst);
-@@ -2496,7 +2501,7 @@
- 
-     return status;
- }
--#endif
-+#endif /* defined(NV_PM_SUPPORT_OLD_STYLE_APM) */
- 
- /*
- ** nv_kern_ctl_open
-@@ -3739,6 +3744,7 @@
-     nvl = &nv_linux_devices[num_nv_devices];
-     nv  = NV_STATE_PTR(nvl);
- 
-+    pci_set_drvdata(dev, (void *)nvl);
-     nvl->dev          = dev;
-     nv->vendor_id     = dev->vendor;
-     nv->device_id     = dev->device;
-@@ -3816,11 +3822,10 @@
- #endif
- }
- 
--#if defined(NV_PM_SUPPORT_ACPI)
-+#if defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL)
- 
--int
--nv_acpi_event
--(
-+static int
-+nv_power_management(
-     struct pci_dev *dev, 
-     u32 state
- )
-@@ -3828,70 +3833,77 @@
-     nv_state_t *nv;
-     nv_linux_state_t *lnv = NULL;
-     int status = RM_OK;
--    U032 i;
- 
--    nv_printf(NV_DBG_INFO, "NVRM: nv_acpi_event: %d\n", state);
--
--    for (i = 0; i < num_nv_devices; i++)
--    {
--        if (nv_linux_devices[i].dev == dev)
--        {
--            lnv = &nv_linux_devices[i];
--            break;
--        }
--    }
-+    nv_printf(NV_DBG_INFO, "NVRM: nv_power_management: %d\n", state);
-+    lnv = pci_get_drvdata(dev);
- 
-     if ((!lnv) || (lnv->dev != dev))
-     {
--        nv_printf(NV_DBG_WARNINGS, "NVRM: ACPI: invalid device!\n");
-+        nv_printf(NV_DBG_WARNINGS, "NVRM: PM: invalid device!\n");
-         return -1;
-     }
- 
-     nv = NV_STATE_PTR(lnv);
-+    nv_verify_pci_config(NV_STATE_PTR(lnv), TRUE);
- 
-     switch (state)
-     {
--        case PM_SUSPEND_MEM:
-+#if defined(NV_PM_SUPPORT_NEW_STYLE_APM)
-+        case PCI_D3hot:
-+            nv_printf(NV_DBG_INFO, "NVRM: APM: received suspend event\n");
-+            status = rm_power_management(nv, 0, NV_PM_APM_SUSPEND);
-+            break;
-+
-+        case PCI_D0:
-+            nv_printf(NV_DBG_INFO, "NVRM: APM: received resume event\n");
-+            status = rm_power_management(nv, 0, NV_PM_APM_RESUME);
-+            break;
-+#else
-+        case PCI_D3hot:
-             nv_printf(NV_DBG_INFO, "NVRM: ACPI: received suspend event\n");
-             status = rm_power_management(nv, 0, NV_PM_ACPI_STANDBY);
-             break;
- 
--        case PM_SUSPEND_ON:
-+        case PCI_D0:
-             nv_printf(NV_DBG_INFO, "NVRM: ACPI: received resume event\n");
-             status = rm_power_management(nv, 0, NV_PM_ACPI_RESUME);
-             break;
--
-+#endif
-         default:
--            nv_printf(NV_DBG_WARNINGS, "NVRM: ACPI: unsupported event: %d\n", state);
-+            nv_printf(NV_DBG_WARNINGS, "NVRM: PM: unsupported event: %d\n", state);
-             return -1;
-     }
- 
-     if (status != RM_OK)
--        nv_printf(NV_DBG_ERRORS, "NVRM: ACPI: failed event: %d\n", state);
-+        nv_printf(NV_DBG_ERRORS, "NVRM: PM: failed event: %d\n", state);
- 
-     return status;
- }
- 
--int
--nv_kern_acpi_standby
--(
--    struct pci_dev *dev, 
--    u32 state
-+static int nv_kern_suspend(
-+    struct pci_dev *dev,
-+    pm_message_t state
- )
- {
--    return nv_acpi_event(dev, state);
-+    int power_state = -1;
-+
-+#if !defined(NV_PM_MESSAGE_T_PRESENT)
-+    power_state = state;
-+#elif defined(NV_PCI_CHOOSE_STATE_PRESENT)
-+    power_state = pci_choose_state(dev, state);
-+#endif
-+
-+    return nv_power_management(dev, power_state);
- }
- 
--int
--nv_kern_acpi_resume
--(
-+static int nv_kern_resume(
-     struct pci_dev *dev
- )
- {
--    return nv_acpi_event(dev, PM_SUSPEND_ON);
-+    return nv_power_management(dev, PCI_D0);
- }
- 
--#endif
-+#endif /* defined(NV_PM_SUPPORT_DEVICE_DRIVER_MODEL) */
- 
- void* NV_API_CALL nv_get_adapter_state(
-     U016 bus,
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111-r3 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111-r3
deleted file mode 100644
index 60732349dbc2..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111-r3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 51e83be46f83c52102ccb8995b54f4e2 NVIDIA-Linux-x86-1.0-6111-pkg1.run 8167999
-MD5 6c7b0c8b3ce5c34186e0c80042e6d046 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486
-RMD160 b90d9dbac560f55ffa737450f073e1188e0acd23 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486
-SHA256 797006376a017fee57f04ff006dcee5931122c4dbfc0bf9c9e3b5fb8a0d61296 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111-r4 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111-r4
deleted file mode 100644
index 60732349dbc2..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 51e83be46f83c52102ccb8995b54f4e2 NVIDIA-Linux-x86-1.0-6111-pkg1.run 8167999
-MD5 6c7b0c8b3ce5c34186e0c80042e6d046 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486
-RMD160 b90d9dbac560f55ffa737450f073e1188e0acd23 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486
-SHA256 797006376a017fee57f04ff006dcee5931122c4dbfc0bf9c9e3b5fb8a0d61296 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6629-r5 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6629-r5
deleted file mode 100644
index 7e946e3239d6..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6629-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f7737c1e95371f37a4fd30da2f11e72c NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221
-RMD160 c6d17cd1b0e101acbd31cd991595c1b52f294c1c NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221
-SHA256 63b735881a05462e8e9e8ef0863cdfec038c0419c728bd7fad1fdb84d9792c0b NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221
-MD5 652e69f549c81a7a3f2806daa74b9c36 NVIDIA-Linux-x86_64-1.0-6629-pkg2.run 7777882
-RMD160 029a82b0003d0481860d54a3fc8bf203c94a6b20 NVIDIA-Linux-x86_64-1.0-6629-pkg2.run 7777882
-SHA256 9fa8cb2d4e9a05a07f24c0beddc1fcc0046218027ebcc28c397f56f019fcefbb NVIDIA-Linux-x86_64-1.0-6629-pkg2.run 7777882
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6629-r6 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6629-r6
deleted file mode 100644
index 7e946e3239d6..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6629-r6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f7737c1e95371f37a4fd30da2f11e72c NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221
-RMD160 c6d17cd1b0e101acbd31cd991595c1b52f294c1c NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221
-SHA256 63b735881a05462e8e9e8ef0863cdfec038c0419c728bd7fad1fdb84d9792c0b NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221
-MD5 652e69f549c81a7a3f2806daa74b9c36 NVIDIA-Linux-x86_64-1.0-6629-pkg2.run 7777882
-RMD160 029a82b0003d0481860d54a3fc8bf203c94a6b20 NVIDIA-Linux-x86_64-1.0-6629-pkg2.run 7777882
-SHA256 9fa8cb2d4e9a05a07f24c0beddc1fcc0046218027ebcc28c397f56f019fcefbb NVIDIA-Linux-x86_64-1.0-6629-pkg2.run 7777882
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167-r1 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167-r1
deleted file mode 100644
index 9ad68fab99bd..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 d88d606873be255e8c4926961a1f09bf NVIDIA-Linux-x86-1.0-7167-pkg1.run 9427444
-MD5 a0433d841c41862af266300b589c12a7 NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382
-RMD160 54e9ac9c7f845ce1bf75ecb5ac2404a59a6b4eb3 NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382
-SHA256 db60506ed3b06c2b693e1abeae3152b14ed7974f7d4d570a477ca2eb0907e7f3 NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167-r2 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167-r2
deleted file mode 100644
index 9ad68fab99bd..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7167-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 d88d606873be255e8c4926961a1f09bf NVIDIA-Linux-x86-1.0-7167-pkg1.run 9427444
-MD5 a0433d841c41862af266300b589c12a7 NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382
-RMD160 54e9ac9c7f845ce1bf75ecb5ac2404a59a6b4eb3 NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382
-SHA256 db60506ed3b06c2b693e1abeae3152b14ed7974f7d4d570a477ca2eb0907e7f3 NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174-r2 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174-r2
deleted file mode 100644
index 92cf7adee22e..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 71e56aa82021c5b0c1e34944f88c6432 NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
-RMD160 705d3991d2ba25365c97e1530d1f26b7b54efb12 NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
-SHA256 daf76e25bcc9dc96f5e12d9f478e18136324e37b0d2e07babf18656e632e630e NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
-MD5 125ec3ecc64202c6c27ef762a438d0f0 NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038
-RMD160 593a3ca26e7ef480ac51a4fded29f19a9081d8f8 NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038
-SHA256 95acbd320f09526e95b7920cb0f9031486a7730356b1b11adc316852846a3eb9 NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174-r3 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174-r3
deleted file mode 100644
index 92cf7adee22e..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7174-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 71e56aa82021c5b0c1e34944f88c6432 NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
-RMD160 705d3991d2ba25365c97e1530d1f26b7b54efb12 NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
-SHA256 daf76e25bcc9dc96f5e12d9f478e18136324e37b0d2e07babf18656e632e630e NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
-MD5 125ec3ecc64202c6c27ef762a438d0f0 NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038
-RMD160 593a3ca26e7ef480ac51a4fded29f19a9081d8f8 NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038
-SHA256 95acbd320f09526e95b7920cb0f9031486a7730356b1b11adc316852846a3eb9 NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7667 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7667
deleted file mode 100644
index 77b0c12c8e98..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7667
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 1d062204da2902ae86154a03e1a40204 NVIDIA-Linux-x86-1.0-7667-pkg0.run 5629423
-MD5 f76f14a71e71fa7b8c349a038e42b119 NVIDIA-Linux-x86_64-1.0-7667-pkg2.run 8819702
-RMD160 da9fae439627f6de15ab17d34b16a8530dd313e7 NVIDIA-Linux-x86_64-1.0-7667-pkg2.run 8819702
-SHA256 ec65e6dfc5dd5304a76e57b3de2d6ada86c8620a1a1d9377c3950b9f56dea1c4 NVIDIA-Linux-x86_64-1.0-7667-pkg2.run 8819702
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7667-r1 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7667-r1
deleted file mode 100644
index 77b0c12c8e98..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7667-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 1d062204da2902ae86154a03e1a40204 NVIDIA-Linux-x86-1.0-7667-pkg0.run 5629423
-MD5 f76f14a71e71fa7b8c349a038e42b119 NVIDIA-Linux-x86_64-1.0-7667-pkg2.run 8819702
-RMD160 da9fae439627f6de15ab17d34b16a8530dd313e7 NVIDIA-Linux-x86_64-1.0-7667-pkg2.run 8819702
-SHA256 ec65e6dfc5dd5304a76e57b3de2d6ada86c8620a1a1d9377c3950b9f56dea1c4 NVIDIA-Linux-x86_64-1.0-7667-pkg2.run 8819702
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7676-r1 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7676-r1
deleted file mode 100644
index fb8dbbc74a06..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7676-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 2474c5513006668b0fba401e042dc009 NVIDIA-Linux-x86-1.0-7676-pkg0.run 5631274
-MD5 df2081504b609aaa95ccc8e95aebfb97 NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402
-RMD160 4f48ef2d5146c182a936d8711b4a5a3e62d6ac46 NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402
-SHA256 7e5eb3e549717c1b44b21a12358fa99476666a66d723f8a7bb936419d09052cd NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7676-r2 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7676-r2
deleted file mode 100644
index fb8dbbc74a06..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.7676-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 2474c5513006668b0fba401e042dc009 NVIDIA-Linux-x86-1.0-7676-pkg0.run 5631274
-MD5 df2081504b609aaa95ccc8e95aebfb97 NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402
-RMD160 4f48ef2d5146c182a936d8711b4a5a3e62d6ac46 NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402
-SHA256 7e5eb3e549717c1b44b21a12358fa99476666a66d723f8a7bb936419d09052cd NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8174-r1 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8174-r1
deleted file mode 100644
index 466b5efea409..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8174-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3f21b6928ab38960113bf257062576c7 NVIDIA-Linux-x86-1.0-8174-pkg1.run 11998227
-RMD160 bfb99ba894ecc9616adc63847d024e98a27f06b3 NVIDIA-Linux-x86-1.0-8174-pkg1.run 11998227
-SHA256 1082fe6d7269924221ec9a9f34d3fb7b395a62f1284676b4a1df8a4de788bc6d NVIDIA-Linux-x86-1.0-8174-pkg1.run 11998227
-MD5 d1f9786dfda74005832ac005e276462a NVIDIA-Linux-x86_64-1.0-8174-pkg2.run 9559334
-RMD160 799acae44b40ec3356dbd1a34bf4c73b1b76e66c NVIDIA-Linux-x86_64-1.0-8174-pkg2.run 9559334
-SHA256 2af40ab752f6bc5dd51cde622ce5dd19375d7640a65fa507404b318451911898 NVIDIA-Linux-x86_64-1.0-8174-pkg2.run 9559334
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8174-r2 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8174-r2
deleted file mode 100644
index 466b5efea409..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8174-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3f21b6928ab38960113bf257062576c7 NVIDIA-Linux-x86-1.0-8174-pkg1.run 11998227
-RMD160 bfb99ba894ecc9616adc63847d024e98a27f06b3 NVIDIA-Linux-x86-1.0-8174-pkg1.run 11998227
-SHA256 1082fe6d7269924221ec9a9f34d3fb7b395a62f1284676b4a1df8a4de788bc6d NVIDIA-Linux-x86-1.0-8174-pkg1.run 11998227
-MD5 d1f9786dfda74005832ac005e276462a NVIDIA-Linux-x86_64-1.0-8174-pkg2.run 9559334
-RMD160 799acae44b40ec3356dbd1a34bf4c73b1b76e66c NVIDIA-Linux-x86_64-1.0-8174-pkg2.run 9559334
-SHA256 2af40ab752f6bc5dd51cde622ce5dd19375d7640a65fa507404b318451911898 NVIDIA-Linux-x86_64-1.0-8174-pkg2.run 9559334
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8178-r3 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8178-r3
deleted file mode 100644
index 16d343bf7a06..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8178-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bc9d459bfeee93735e3959de041635df NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-RMD160 4075969c4229dd75467113b8eb22ab9645893385 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-SHA256 dd71799636db5a48d0f602663032dc12fdd9473841cd005b082ba812c34dc6e9 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-MD5 524acaed325910bed26e880ce65e7405 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
-RMD160 ee9b91f58d30d9d4800891760e24748795d07b5c NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
-SHA256 bc59ded88f0d60a662a911766e923e397b8c7902cef8b293adfb1acc0669d097 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8178-r4 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8178-r4
deleted file mode 100644
index 16d343bf7a06..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8178-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bc9d459bfeee93735e3959de041635df NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-RMD160 4075969c4229dd75467113b8eb22ab9645893385 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-SHA256 dd71799636db5a48d0f602663032dc12fdd9473841cd005b082ba812c34dc6e9 NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641
-MD5 524acaed325910bed26e880ce65e7405 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
-RMD160 ee9b91f58d30d9d4800891760e24748795d07b5c NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
-SHA256 bc59ded88f0d60a662a911766e923e397b8c7902cef8b293adfb1acc0669d097 NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8756 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8756
deleted file mode 100644
index 465afe6064b7..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8756
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 67293549b90f549ca9210743eaa5b09c NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804
-RMD160 e33aad0b2cf948e54b9bd245f5ad865dd2c46abe NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804
-SHA256 eb8cdd5acc14044e35f8462e00a6626dbf498804aca4ec8e4cd421a8e0898dd6 NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804
-MD5 a8e7309076785a892dcc68ee50f9f3b0 NVIDIA-Linux-x86_64-1.0-8756-pkg2.run 9950572
-RMD160 ae6d8496607798bd9de3a9211c02d4fcb08bd088 NVIDIA-Linux-x86_64-1.0-8756-pkg2.run 9950572
-SHA256 31c5e7be79d4e5dfb5cf878b2d4dacf0e0ff88e4661f301bee6cf1eece59191e NVIDIA-Linux-x86_64-1.0-8756-pkg2.run 9950572
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8756-r1 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8756-r1
deleted file mode 100644
index 465afe6064b7..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8756-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 67293549b90f549ca9210743eaa5b09c NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804
-RMD160 e33aad0b2cf948e54b9bd245f5ad865dd2c46abe NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804
-SHA256 eb8cdd5acc14044e35f8462e00a6626dbf498804aca4ec8e4cd421a8e0898dd6 NVIDIA-Linux-x86-1.0-8756-pkg1.run 12961804
-MD5 a8e7309076785a892dcc68ee50f9f3b0 NVIDIA-Linux-x86_64-1.0-8756-pkg2.run 9950572
-RMD160 ae6d8496607798bd9de3a9211c02d4fcb08bd088 NVIDIA-Linux-x86_64-1.0-8756-pkg2.run 9950572
-SHA256 31c5e7be79d4e5dfb5cf878b2d4dacf0e0ff88e4661f301bee6cf1eece59191e NVIDIA-Linux-x86_64-1.0-8756-pkg2.run 9950572
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8762 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8762
deleted file mode 100644
index 85b3208ae9e8..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8762
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 86bcf4a3a9d441dff9e25b82ec8a6060 NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175
-RMD160 1e887de23c5d0b9eb3a581b2d91989c1b9c45514 NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175
-SHA256 b38ce2853195175a2b7380fe95968d52a707a08dbe9fcb6ae423c9b9b0a47eee NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175
-MD5 5eb0b27342fd726fbbdd1d99eadbd0e7 NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191
-RMD160 55f0ca9d35f7be6e3b65de2ed1c121e9c39c23a9 NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191
-SHA256 84fb9bf70684943cc12b3e9be19de0aadbbfaa9d2118e6bef5525ac45fb0462c NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8762-r1 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8762-r1
deleted file mode 100644
index 85b3208ae9e8..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.8762-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 86bcf4a3a9d441dff9e25b82ec8a6060 NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175
-RMD160 1e887de23c5d0b9eb3a581b2d91989c1b9c45514 NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175
-SHA256 b38ce2853195175a2b7380fe95968d52a707a08dbe9fcb6ae423c9b9b0a47eee NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175
-MD5 5eb0b27342fd726fbbdd1d99eadbd0e7 NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191
-RMD160 55f0ca9d35f7be6e3b65de2ed1c121e9c39c23a9 NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191
-SHA256 84fb9bf70684943cc12b3e9be19de0aadbbfaa9d2118e6bef5525ac45fb0462c NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191
diff --git a/media-video/nvidia-kernel/files/nvidia b/media-video/nvidia-kernel/files/nvidia
deleted file mode 100644
index df7a7467b275..000000000000
--- a/media-video/nvidia-kernel/files/nvidia
+++ /dev/null
@@ -1,21 +0,0 @@
-# Nvidia drivers support
-alias char-major-195 nvidia
-alias /dev/nvidiactl char-major-195
-
-# To tweak the driver the following options can be used, note that
-# you should be careful, as it could cause instability!! For more 
-# option see /usr/share/doc/${PACKAGE}/README.gz 
-#
-#   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
-#
-#   To enable Fast Writes: NVreg_EnableAGPFW=1
-#
-# To enable both for instance, uncomment following line:
-#
-#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1
-
-# If you have a mobile chip, you may need to enable this option
-# if you have hard lockups when starting X.
-#
-# See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=343186
-#option nvidia NVreg_Mobile=1
diff --git a/media-video/nvidia-kernel/metadata.xml b/media-video/nvidia-kernel/metadata.xml
deleted file mode 100644
index 765155b16c4a..000000000000
--- a/media-video/nvidia-kernel/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>X11-drivers</herd>
-<maintainer>
-  <email>X11-drivers@gentoo.org</email>
-</maintainer>
-<longdescription>Linux kernel module for then NVIDIA X11 driver</longdescription>
-</pkgmetadata>
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild
deleted file mode 100644
index 190d30be21ab..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r3.ebuild,v 1.7 2005/10/28 07:19:45 eradicator Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-MODULE_NAMES="nvidia(video:${S})"
-BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [ "$?" != 0 ]
-	then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	mtrr_check;
-}
-
-src_unpack() {
-	# 2.6.10_rc1-mm{1,2,3} all EXPORT_SYMBOL_GPL the udev functions, this breaks loading
-	CS="$(grep -c EXPORT_SYMBOL\(class_simple_create\)\; ${KV_DIR}/drivers/base/class_simple.c)"
-	if [ "${CS}" == "0" ]
-	then
-		ewarn "Your current kernel uses EXPORT_SYMBOL_GPL() on some methods required by nvidia-kernel."
-		ewarn "This probably means you are using 2.6.10_rc1-mm*. Please change away from mm-sources until this is"
-		ewarn "revised and a solution released into the mm branch, development-sources will work."
-		die "Incompatible kernel export."
-	fi
-
-	if [ ${KV_MINOR} -ge 6 -a ${KV_PATCH} -lt 7 ]
-	then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# none at the moment
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6
-	then
-		einfo "Applying 2.6 kernel patches"
-		# Fix up the removal of PM_SAVE_STATE in kernels > 2.6.8
-		epatch ${FILESDIR}/${PV}/power-suspend-2.6.9-changes.patch
-		# Update pci stuff to work with irqroutes being changed in kernels
-		epatch ${FILESDIR}/${PV}/nv_enable_pci.patch
-		# Fix VMALLOC_RESERVE issues with the new 2.6.9 release candidates
-		epatch ${FILESDIR}/${PV}/vmalloc-reserve.patch
-		# Port pci_find_class() -> pci_get_class() for >= 2.6.9-rc2
-		epatch ${FILESDIR}/${PV}/nv-pci_find_class.patch
-		# Fix remap_page_range() -> remap_pfn_range() for >= 2.6.9-rc2
-		epatch ${FILESDIR}/${PV}/nv-remap-range.patch
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		epatch ${FILESDIR}/${PV}/conftest_koutput_includes.patch
-	fi
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[ -n "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# if greater than 2.6.5 use M= instead of SUBDIR=
-	convert_to_m ${S}/Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	dodoc ${S}/../../share/doc/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] && \
-		[ ! -e /dev/.devfsd ] && \
-		[ ! -e /dev/.udev ] && \
-		[ -x /sbin/NVmakedevices.sh ]
-	then
-		/sbin/NVmakedevices.sh >/dev/null 2>&1
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r4.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r4.ebuild
deleted file mode 100644
index f00e457bf821..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r4.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r4.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	 !x11-drivers/nvidia-legacy-drivers
-	 !x11-drivers/nvidia-drivers"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-MODULE_NAMES="nvidia(video:${S})"
-BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [ "$?" != 0 ]
-	then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	mtrr_check;
-}
-
-src_unpack() {
-	# 2.6.10_rc1-mm{1,2,3} all EXPORT_SYMBOL_GPL the udev functions, this breaks loading
-	CS="$(grep -c EXPORT_SYMBOL\(class_simple_create\)\; ${KV_DIR}/drivers/base/class_simple.c)"
-	if [ "${CS}" == "0" ]
-	then
-		ewarn "Your current kernel uses EXPORT_SYMBOL_GPL() on some methods required by nvidia-kernel."
-		ewarn "This probably means you are using 2.6.10_rc1-mm*. Please change away from mm-sources until this is"
-		ewarn "revised and a solution released into the mm branch, development-sources will work."
-		die "Incompatible kernel export."
-	fi
-
-	if [ ${KV_MINOR} -ge 6 -a ${KV_PATCH} -lt 7 ]
-	then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# none at the moment
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6
-	then
-		einfo "Applying 2.6 kernel patches"
-		# Fix up the removal of PM_SAVE_STATE in kernels > 2.6.8
-		epatch ${FILESDIR}/${PV}/power-suspend-2.6.9-changes.patch
-		# Update pci stuff to work with irqroutes being changed in kernels
-		epatch ${FILESDIR}/${PV}/nv_enable_pci.patch
-		# Fix VMALLOC_RESERVE issues with the new 2.6.9 release candidates
-		epatch ${FILESDIR}/${PV}/vmalloc-reserve.patch
-		# Port pci_find_class() -> pci_get_class() for >= 2.6.9-rc2
-		epatch ${FILESDIR}/${PV}/nv-pci_find_class.patch
-		# Fix remap_page_range() -> remap_pfn_range() for >= 2.6.9-rc2
-		epatch ${FILESDIR}/${PV}/nv-remap-range.patch
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		epatch ${FILESDIR}/${PV}/conftest_koutput_includes.patch
-	fi
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[ -n "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# if greater than 2.6.5 use M= instead of SUBDIR=
-	convert_to_m ${S}/Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	dodoc ${S}/../../share/doc/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] && \
-		[ ! -e /dev/.devfsd ] && \
-		[ ! -e /dev/.udev ] && \
-		[ -x /sbin/NVmakedevices.sh ]
-	then
-		/sbin/NVmakedevices.sh >/dev/null 2>&1
-	fi
-
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild
deleted file mode 100644
index 6fde87b3c9b7..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild,v 1.2 2006/05/02 14:14:55 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-MODULE_NAMES="nvidia(video:${S})"
-BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [ "$?" != 0 ]
-	then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	mtrr_check;
-}
-
-src_unpack() {
-	if [ ${KV_MINOR} -ge 6 -a ${KV_PATCH} -lt 7 ]
-	then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	use x86 && epatch ${FILESDIR}/${PV}/nv-shutup-warnings.patch
-	use amd64 && epatch ${FILESDIR}/${PV}/nv-amd64-shutup-warnings.patch
-
-	# Patches from Zander (http://www.minion.de/files/1.0-6629/)
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1155389.patch
-	#epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1162524.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1165235.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1171869.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1175225.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1182399.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1189413.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1201042.diff
-	# Yes this is the wrong version but it's needed to fix problems with
-	# 6629 and 7174 is no longer in portage.
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-7174-1296092.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6
-	then
-		einfo "Applying 2.6 kernel patches"
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		epatch ${FILESDIR}/${PV}/conftest_koutput_includes.patch
-		# Fix a limitation on available video memory bug #71684
-		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1161283.patch
-		# New multi-agp support with newer -mm kernels
-		# http://lkml.org/lkml/2005/1/25/349
-		[[ -n $(grep agp_bridge_data "${KV_DIR}/include/linux/agp_backend.h") ]] && \
-			epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch
-	fi
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[ -n "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# if greater than 2.6.5 use M= instead of SUBDIR=
-	convert_to_m ${S}/Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	dodoc ${S}/../../share/doc/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] && \
-		[ ! -e /dev/.devfsd ] && \
-		[ ! -e /dev/.udev ] && \
-		[ -x /sbin/NVmakedevices.sh ]
-	then
-		/sbin/NVmakedevices.sh >/dev/null 2>&1
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r6.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r6.ebuild
deleted file mode 100644
index b000ecfa8518..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r6.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	  !x11-drivers/nvidia-legacy-drivers
-	  !x11-drivers/nvidia-drivers"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-MODULE_NAMES="nvidia(video:${S})"
-BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [ "$?" != 0 ]
-	then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	mtrr_check;
-}
-
-src_unpack() {
-	if [ ${KV_MINOR} -ge 6 -a ${KV_PATCH} -lt 7 ]
-	then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	use x86 && epatch ${FILESDIR}/${PV}/nv-shutup-warnings.patch
-	use amd64 && epatch ${FILESDIR}/${PV}/nv-amd64-shutup-warnings.patch
-
-	# Patches from Zander (http://www.minion.de/files/1.0-6629/)
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1155389.patch
-	#epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1162524.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1165235.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1171869.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1175225.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1182399.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1189413.patch
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1201042.diff
-	# Yes this is the wrong version but it's needed to fix problems with
-	# 6629 and 7174 is no longer in portage.
-	epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-7174-1296092.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6
-	then
-		einfo "Applying 2.6 kernel patches"
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		epatch ${FILESDIR}/${PV}/conftest_koutput_includes.patch
-		# Fix a limitation on available video memory bug #71684
-		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1161283.patch
-		# New multi-agp support with newer -mm kernels
-		# http://lkml.org/lkml/2005/1/25/349
-		[[ -n $(grep agp_bridge_data "${KV_DIR}/include/linux/agp_backend.h") ]] && \
-			epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-agp_bridge_data.patch
-	fi
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[ -n "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# if greater than 2.6.5 use M= instead of SUBDIR=
-	convert_to_m ${S}/Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	dodoc ${S}/../../share/doc/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] && \
-		[ ! -e /dev/.devfsd ] && \
-		[ ! -e /dev/.udev ] && \
-		[ -x /sbin/NVmakedevices.sh ]
-	then
-		/sbin/NVmakedevices.sh >/dev/null 2>&1
-	fi
-
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
deleted file mode 100644
index d22da57a2bff..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild,v 1.4 2006/05/02 14:14:55 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-MODULE_NAMES="nvidia(video:${S})"
-BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	mtrr_check;
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	use x86 && epatch ${NV_PATCH_PREFIX}-x86-shutup-warnings.patch
-	use amd64 && epatch ${NV_PATCH_PREFIX}-amd64-shutup-warnings.patch
-
-	# Patches from Zander goes here
-	# (http://www.nvnews.net/vbulletin/forumdisplay.php?f=14, or possibly
-	#  archived here: http://www.minion.de/files/1.0-7167/)
-	epatch ${NV_PATCH_PREFIX}-1233959.patch
-	epatch ${NV_PATCH_PREFIX}-1237815.patch
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		epatch ${NV_PATCH_PREFIX}-conftest-koutput-includes.patch
-	fi
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	dodoc ${S}/../../share/doc/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [[ "${ROOT}" = "/" && ! -e /dev/.devfsd && \
-		  ! -e /dev/.udev && -x /sbin/NVmakedevices.sh ]] ; then
-		/sbin/NVmakedevices.sh >/dev/null 2>&1
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r2.ebuild
deleted file mode 100644
index 206697eb9967..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r2.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	  !x11-drivers/nvidia-legacy-drivers
-	  !x11-drivers/nvidia-drivers"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-MODULE_NAMES="nvidia(video:${S})"
-BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	mtrr_check;
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	use x86 && epatch ${NV_PATCH_PREFIX}-x86-shutup-warnings.patch
-	use amd64 && epatch ${NV_PATCH_PREFIX}-amd64-shutup-warnings.patch
-
-	# Patches from Zander goes here
-	# (http://www.nvnews.net/vbulletin/forumdisplay.php?f=14, or possibly
-	#  archived here: http://www.minion.de/files/1.0-7167/)
-	epatch ${NV_PATCH_PREFIX}-1233959.patch
-	epatch ${NV_PATCH_PREFIX}-1237815.patch
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		epatch ${NV_PATCH_PREFIX}-conftest-koutput-includes.patch
-	fi
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	dodoc ${S}/../../share/doc/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [[ "${ROOT}" = "/" && ! -e /dev/.devfsd && \
-		  ! -e /dev/.udev && -x /sbin/NVmakedevices.sh ]] ; then
-		/sbin/NVmakedevices.sh >/dev/null 2>&1
-	fi
-
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild
deleted file mode 100644
index d5579daf0e78..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild,v 1.2 2006/05/02 14:14:55 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg0"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	use x86 && epatch ${NV_PATCH_PREFIX//7174/7167}-x86-shutup-warnings.patch
-	use amd64 && epatch ${NV_PATCH_PREFIX//7174/7167}-amd64-shutup-warnings.patch
-
-	# Patches from Zander goes here
-	# (http://www.nvnews.net/vbulletin/forumdisplay.php?f=14, or possibly
-	#  archived here: http://www.minion.de/files/1.0-7167/)
-	#epatch ${NV_PATCH_PREFIX}-1233959.patch
-	#epatch ${NV_PATCH_PREFIX}-1237815.patch
-	epatch ${NV_PATCH_PREFIX}-1258475.diff
-	epatch ${NV_PATCH_PREFIX}-1296092.diff
-	epatch ${NV_PATCH_PREFIX}-1321905.diff
-	epatch ${NV_PATCH_PREFIX}-1361053.diff
-	epatch ${NV_PATCH_PREFIX}-1386866.diff
-	epatch ${NV_PATCH_PREFIX//7174/8178}-1444349.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		epatch ${NV_PATCH_PREFIX//7174/7167}-conftest-koutput-includes.patch
-	fi
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	dodoc ${S}/../../share/doc/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [[ "${ROOT}" = "/" && ! -e /dev/.devfsd && \
-		  ! -e /dev/.udev && -x /sbin/NVmakedevices.sh ]] ; then
-		/sbin/NVmakedevices.sh >/dev/null 2>&1
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r3.ebuild
deleted file mode 100644
index ff0d436bdfc6..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r3.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg0"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	  !x11-drivers/nvidia-legacy-drivers
-	  !x11-drivers/nvidia-drivers"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	use x86 && epatch ${NV_PATCH_PREFIX//7174/7167}-x86-shutup-warnings.patch
-	use amd64 && epatch ${NV_PATCH_PREFIX//7174/7167}-amd64-shutup-warnings.patch
-
-	# Patches from Zander goes here
-	# (http://www.nvnews.net/vbulletin/forumdisplay.php?f=14, or possibly
-	#  archived here: http://www.minion.de/files/1.0-7167/)
-	#epatch ${NV_PATCH_PREFIX}-1233959.patch
-	#epatch ${NV_PATCH_PREFIX}-1237815.patch
-	epatch ${NV_PATCH_PREFIX}-1258475.diff
-	epatch ${NV_PATCH_PREFIX}-1296092.diff
-	epatch ${NV_PATCH_PREFIX}-1321905.diff
-	epatch ${NV_PATCH_PREFIX}-1361053.diff
-	epatch ${NV_PATCH_PREFIX}-1386866.diff
-	epatch ${NV_PATCH_PREFIX//7174/8178}-1444349.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		epatch ${NV_PATCH_PREFIX//7174/7167}-conftest-koutput-includes.patch
-	fi
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	dodoc ${S}/../../share/doc/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [[ "${ROOT}" = "/" && ! -e /dev/.devfsd && \
-		  ! -e /dev/.udev && -x /sbin/NVmakedevices.sh ]] ; then
-		/sbin/NVmakedevices.sh >/dev/null 2>&1
-	fi
-
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7667-r1.ebuild
deleted file mode 100644
index e04c1d42f4ec..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7667-r1.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg0"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	  !x11-drivers/nvidia-legacy-drivers
-	  !x11-drivers/nvidia-drivers"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	# use x86 && epatch ${NV_PATCH_PREFIX//7174/7167}-x86-shutup-warnings.patch
-	# use amd64 && epatch ${NV_PATCH_PREFIX//7174/7167}-amd64-shutup-warnings.patch
-
-	# Patches from Zander goes here
-	# (http://www.nvnews.net/vbulletin/forumdisplay.php?f=14, or possibly
-	#  archived here: http://www.minion.de/files/1.0-7167/)
-	#epatch ${NV_PATCH_PREFIX}-1233959.patch
-	#epatch ${NV_PATCH_PREFIX}-1237815.patch
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		epatch ${NV_PATCH_PREFIX}-KERNEL_VERSION-moved.patch
-	fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-
-	# The device creation script
-	# This script appears to be gone.  Maybe NVIDIA is no longer supporting
-	# a static /dev.
-	#into /
-	#newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	# This script appears to be gone.  Maybe NVIDIA is no longer supporting
-	# a static /dev.
-	#if [[ "${ROOT}" = "/" && ! -e /dev/.devfsd && \
-	#	  ! -e /dev/.udev && -x /sbin/NVmakedevices.sh ]] ; then
-	#	/sbin/NVmakedevices.sh >/dev/null 2>&1
-	#fi
-
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild
deleted file mode 100644
index c1fc0aa6c294..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild,v 1.4 2006/05/02 14:14:55 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg0"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	# use x86 && epatch ${NV_PATCH_PREFIX//7174/7167}-x86-shutup-warnings.patch
-	# use amd64 && epatch ${NV_PATCH_PREFIX//7174/7167}-amd64-shutup-warnings.patch
-
-	# Patches from Zander goes here
-	# (http://www.nvnews.net/vbulletin/forumdisplay.php?f=14, or possibly
-	#  archived here: http://www.minion.de/files/1.0-7167/)
-	#epatch ${NV_PATCH_PREFIX}-1233959.patch
-	#epatch ${NV_PATCH_PREFIX}-1237815.patch
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		epatch ${NV_PATCH_PREFIX}-KERNEL_VERSION-moved.patch
-	fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-
-	# The device creation script
-	# This script appears to be gone.  Maybe NVIDIA is no longer supporting
-	# a static /dev.
-	#into /
-	#newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	# This script appears to be gone.  Maybe NVIDIA is no longer supporting
-	# a static /dev.
-	#if [[ "${ROOT}" = "/" && ! -e /dev/.devfsd && \
-	#	  ! -e /dev/.udev && -x /sbin/NVmakedevices.sh ]] ; then
-	#	/sbin/NVmakedevices.sh >/dev/null 2>&1
-	#fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild
deleted file mode 100644
index 781594d05a96..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild,v 1.3 2006/05/02 14:14:55 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg0"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	# use x86 && epatch ${NV_PATCH_PREFIX//7174/7167}-x86-shutup-warnings.patch
-	# use amd64 && epatch ${NV_PATCH_PREFIX//7174/7167}-amd64-shutup-warnings.patch
-
-	# Patches from Zander goes here
-	# (http://www.nvnews.net/vbulletin/forumdisplay.php?f=14, or possibly
-	#  archived here: http://www.minion.de/files/1.0-7167/)
-	epatch ${NV_PATCH_PREFIX}-1321905.diff
-	#epatch ${NV_PATCH_PREFIX}-1359015.diff
-	epatch ${NV_PATCH_PREFIX}-1361053.diff
-	epatch ${NV_PATCH_PREFIX}-1386866.diff
-	epatch ${NV_PATCH_PREFIX}-1392404.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		epatch ${NV_PATCH_PREFIX//7676/7667}-KERNEL_VERSION-moved.patch
-	fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-
-	# The device creation script
-	# This script appears to be gone.  Maybe NVIDIA is no longer supporting
-	# a static /dev.
-	#into /
-	#newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	# This script appears to be gone.  Maybe NVIDIA is no longer supporting
-	# a static /dev.
-	#if [[ "${ROOT}" = "/" && ! -e /dev/.devfsd && \
-	#	  ! -e /dev/.udev && -x /sbin/NVmakedevices.sh ]] ; then
-	#	/sbin/NVmakedevices.sh >/dev/null 2>&1
-	#fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r2.ebuild
deleted file mode 100644
index 1dc15e41b86d..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r2.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg0"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	  !x11-drivers/nvidia-legacy-drivers
-	  !x11-drivers/nvidia-drivers"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-	# Shutup pointer arith warnings
-	# use x86 && epatch ${NV_PATCH_PREFIX//7174/7167}-x86-shutup-warnings.patch
-	# use amd64 && epatch ${NV_PATCH_PREFIX//7174/7167}-amd64-shutup-warnings.patch
-
-	# Patches from Zander goes here
-	# (http://www.nvnews.net/vbulletin/forumdisplay.php?f=14, or possibly
-	#  archived here: http://www.minion.de/files/1.0-7167/)
-	epatch ${NV_PATCH_PREFIX}-1321905.diff
-	#epatch ${NV_PATCH_PREFIX}-1359015.diff
-	epatch ${NV_PATCH_PREFIX}-1361053.diff
-	epatch ${NV_PATCH_PREFIX}-1386866.diff
-	epatch ${NV_PATCH_PREFIX}-1392404.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		epatch ${NV_PATCH_PREFIX//7676/7667}-KERNEL_VERSION-moved.patch
-	fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-
-	# The device creation script
-	# This script appears to be gone.  Maybe NVIDIA is no longer supporting
-	# a static /dev.
-	#into /
-	#newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	# This script appears to be gone.  Maybe NVIDIA is no longer supporting
-	# a static /dev.
-	#if [[ "${ROOT}" = "/" && ! -e /dev/.devfsd && \
-	#	  ! -e /dev/.udev && -x /sbin/NVmakedevices.sh ]] ; then
-	#	/sbin/NVmakedevices.sh >/dev/null 2>&1
-	#fi
-
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild
deleted file mode 100644
index 8cde53dd11d8..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild,v 1.2 2006/05/02 14:14:55 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-
-	# Patches from Zander goes here
-	epatch ${NV_PATCH_PREFIX}-1423627.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	#if kernel_is 2 6 ; then
-	#	einfo "Applying 2.6 kernel patches"
-	#fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-	dodoc ${S}/../../share/doc/Copyrights
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r2.ebuild
deleted file mode 100644
index 96cdfc39c5d2..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r2.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	  !x11-drivers/nvidia-legacy-drivers
-	  !x11-drivers/nvidia-drivers"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-
-	# Patches from Zander goes here
-	epatch ${NV_PATCH_PREFIX}-1423627.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	#if kernel_is 2 6 ; then
-	#	einfo "Applying 2.6 kernel patches"
-	#fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-	dodoc ${S}/../../share/doc/Copyrights
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild
deleted file mode 100644
index db748c08ae6d..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild,v 1.3 2006/05/02 14:14:55 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-
-	# Patches from Zander goes here
-	epatch ${NV_PATCH_PREFIX}-U012206.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	#if kernel_is 2 6 ; then
-	#	einfo "Applying 2.6 kernel patches"
-	#fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-	dodoc ${S}/../../share/doc/Copyrights
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r4.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r4.ebuild
deleted file mode 100644
index e499a3c849ff..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r4.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	  !x11-drivers/nvidia-legacy-drivers
-	  !x11-drivers/nvidia-driver"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-
-	# Patches from Zander goes here
-	epatch ${NV_PATCH_PREFIX}-U012206.diff
-
-	# Now any patches specific to the 2.6 kernel should go here
-	#if kernel_is 2 6 ; then
-	#	einfo "Applying 2.6 kernel patches"
-	#fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-	dodoc ${S}/../../share/doc/Copyrights
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8756-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8756-r1.ebuild
deleted file mode 100644
index 625a980a0ff9..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8756-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8756-r1.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	  !x11-drivers/nvidia-legacy-drivers
-	  !x11-drivers/nvidia-drivers"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-
-	# Patches from Zander goes here
-
-	# Now any patches specific to the 2.6 kernel should go here
-	#if kernel_is 2 6 ; then
-	#	einfo "Applying 2.6 kernel patches"
-	#fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-	dodoc ${S}/../../share/doc/Copyrights
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild
deleted file mode 100644
index ca605f16a05b..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild,v 1.2 2006/05/02 14:14:55 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-
-	# Patches from Zander goes here
-
-	# Now any patches specific to the 2.6 kernel should go here
-	#if kernel_is 2 6 ; then
-	#	einfo "Applying 2.6 kernel patches"
-	#fi
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-	dodoc ${S}/../../share/doc/Copyrights
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8762-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8762-r1.ebuild
deleted file mode 100644
index d97abbf95818..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8762-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8762-r1.ebuild,v 1.1 2006/07/06 20:58:56 augustus Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils
-	  !x11-drivers/nvidia-legacy-drivers
-	  !x11-drivers/nvidia-drivers"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-
-	# Patches from Zander goes here
-
-	# Now any patches specific to the 2.6 kernel should go here
-	#if kernel_is 2 6 ; then
-	#	einfo "Applying 2.6 kernel patches"
-	#fi
-
-	# Fix building with post 2.6.17 kernels (I assume that it will be the
-	# case with 2.6.18-rc1, but its not out at this time)
-	# NB!!!! You need to check if this is still needed with next release
-	# azarah@gentoo.org (27 June 2006)
-	sed -i \
-	    -e 's:\(echo "\)\(#include.*\):\1#include <linux/autoconf.h>\n\t\2:g' \
-	    ${S}/conftest.sh
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-	dodoc ${S}/../../share/doc/Copyrights
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	ewarn ""
-	ewarn "The NVIDIA drivers found in media-video/nvidia-kernel and"
-	ewarn "media-video/nvidia-glx are being combined and moved to x11-drivers."
-	ewarn "There will be two new ebuilds available:"
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-drivers - The latest drivers from NVIDIA for"
-	ewarn "                                 video cards newer than GeForce 2 or"
-	ewarn "                                 Quadro 2 video cards."
-	ewarn ""
-	ewarn "    x11-drivers/nvidia-legacy-drivers - A special release of NVIDIA"
-	ewarn "                                 graphics drivers to support cards"
-	ewarn "                                 as old or older than the GeForce 2"
-	ewarn "                                 or Quadro 2 video cards."
-	ewarn ""
-	ewarn "Please test these new drivers packages on your system.  The packages"
-	ewarn "found in media-video will be phased out."
-	ewarn ""
-	ewarn "Note: the two package system (nvidia-kernel and nvidia-glx) is being"
-	ewarn "phased out to make driver installation more straight forward and to"
-	ewarn "aid in ebuild up keep."
-	ewarn ""
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8762.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8762.ebuild
deleted file mode 100644
index d5b2b749d579..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8762.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8762.ebuild,v 1.2 2006/06/27 18:04:52 azarah Exp $
-
-inherit eutils linux-mod
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-
-DESCRIPTION="Linux kernel module for the NVIDIA X11 driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-
-if use x86; then
-	PKG_V="${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="nostrip"
-IUSE=""
-
-RDEPEND="virtual/modutils"
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="nvidia(video:${S})"
-	BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}"
-	mtrr_check
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_kernel-1.0-${PV##*.}"
-
-	if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Add patches below, with a breif description.
-	cd ${S}
-	# Any general patches should go here
-
-	# Patches from Zander goes here
-
-	# Now any patches specific to the 2.6 kernel should go here
-	#if kernel_is 2 6 ; then
-	#	einfo "Applying 2.6 kernel patches"
-	#fi
-
-	# Fix building with post 2.6.17 kernels (I assume that it will be the
-	# case with 2.6.18-rc1, but its not out at this time)
-	# NB!!!! You need to check if this is still needed with next release
-	# azarah@gentoo.org (27 June 2006)
-	sed -i \
-	    -e 's:\(echo "\)\(#include.*\):\1#include <linux/autoconf.h>\n\t\2:g' \
-	    ${S}/conftest.sh
-
-	# Quiet down warnings the user do not need to see
-	sed -i \
-		-e 's:-Wpointer-arith::g' \
-		-e 's:-Wsign-compare::g' \
-		${S}/Makefile.kbuild
-
-	# If you set this then it's your own fault when stuff breaks :)
-	[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.*
-
-	# If greater than 2.6.5 use M= instead of SUBDIR=
-	cd ${S}; convert_to_m Makefile.kbuild
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# Add the aliases
-	sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia
-	insinto /etc/modules.d
-	newins ${WORKDIR}/nvidia nvidia
-
-	# Docs
-	# Bug #97768: Install README correctly and install Changelog.
-	newdoc ${S}/../../share/doc/README.txt README
-	dodoc ${S}/../../share/doc/NVIDIA_Changelog
-	dodoc ${S}/../../share/doc/Copyrights
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-}