Old.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 7 insertions, 168 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index d972d8c3e8e5..e55012e8dbcf 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.438 2013/03/14 12:50:41 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.439 2013/03/14 16:45:49 jer Exp $
+
+  14 Mar 2013; Jeroen Roovers <jer@gentoo.org> -files/09nvidia,
+  -files/nvidia-drivers-190.53-2.6.33.patch,
+  -files/nvidia-blacklist-vga-pmu-registers-256-304.diff, -files/nvidia,
+  -files/nvidia-autostart.desktop:
+  Old.
 
   14 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> nvidia-drivers-304.84.ebuild,
   nvidia-drivers-310.40.ebuild, nvidia-drivers-313.26.ebuild:
diff --git a/x11-drivers/nvidia-drivers/files/09nvidia b/x11-drivers/nvidia-drivers/files/09nvidia
deleted file mode 100644
index 1fcbef41fc7c..000000000000
--- a/x11-drivers/nvidia-drivers/files/09nvidia
+++ /dev/null
@@ -1,2 +0,0 @@
-# Has to precede X11's own libraries!
-LDPATH=/opt/nvidia/lib
diff --git a/x11-drivers/nvidia-drivers/files/nvidia b/x11-drivers/nvidia-drivers/files/nvidia
deleted file mode 100644
index 7cf0f7c0785c..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia
+++ /dev/null
@@ -1,40 +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 
-# options see /usr/share/doc/PACKAGE/README 
-#
-#   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: Appendix I. Configuring your laptop
-# In /usr/share/doc/PACKAGE/README for full details
-#
-# Choose the appropriate value for NVreg_Mobile from the table:
-#        Value		Meaning
-#        ----------	--------------------------------------------------
-#        0xFFFFFFFF	let the kernel module autodetect the correct value
-#        1		Dell laptops
-#        2		non-Compal Toshiba laptops
-#        3		all other laptops
-#        4		Compal Toshiba laptops
-#        5		Gateway laptops
-#
-#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3
-
-
-# !!! SECURITY WARNING !!!
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
-# WHAT YOU ARE DOING.
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop b/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop
deleted file mode 100644
index f6d05644e4d7..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=NVIDIA X Server Settings
-Comment=Configure NVIDIA X Server Settings
-Exec=sh -c "/opt/bin/nvidia-settings --load-config-only"
-Terminal=false
-Icon=nvidia-settings
-Categories=System;Settings;
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff b/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff
deleted file mode 100644
index 9cfde6a3b440..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur kernel/nv.h kernel/nv.h
---- kernel/nv.h	2012-08-02 18:19:37.000000000 -0700
-+++ kernel/nv.h 2012-08-02 18:19:37.000000000 -0700
-@@ -448,7 +448,20 @@
- 
- #define IS_BLACKLISTED_REG_OFFSET(nv, offset, length)                          \
-              ((IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1000, 0x1000, offset, length)) ||\
--             (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length)))
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x84000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x85000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x86000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x87000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x89000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0xa0000, 0x20000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x104000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x105000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x10a000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c2000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c3000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x618000, 0x2000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x627000, 0x1000, offset, length)) ||\
-+              (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length)))
- 
- /* duplicated from nvos.h for external builds */
- #ifndef NVOS_AGP_CONFIG_DISABLE_AGP
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
deleted file mode 100644
index 75daad33ec6a..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: usr/src/nv/conftest.sh
-===================================================================
---- usr/src/nv/conftest.sh	
-+++ usr/src/nv/conftest.sh	2010-01-06 12:10:56.000000000 +0530
-@@ -32,14 +32,14 @@
-     # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
-     # the kernel as a stand-alone kernel.
-     #
--    FILE="linux/autoconf.h"
-+    FILE="generated/autoconf.h"
- 
-     if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-         #
-         # We are looking at a configured source tree; verify
-         # that it's not a Xen kernel.
-         #
--        echo "#include <linux/autoconf.h>
-+        echo "#include <generated/autoconf.h>
-         #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
-         #error CONFIG_XEN defined!
-         #endif
-@@ -111,7 +111,12 @@
-     fi
- }
- 
--CONFTEST_PREAMBLE="#include <linux/autoconf.h>
-+CONFTEST_PREAMBLE="#include <linux/version.h>
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+    #include <generated/autoconf.h>
-+    #else
-+    #include <linux/autoconf.h>
-+    #endif
-     #if defined(CONFIG_XEN) && \
-         defined(CONFIG_XEN_INTERFACE_VERSION) &&  !defined(__XEN_INTERFACE_VERSION__)
-     #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
-@@ -1294,7 +1299,7 @@
-                 echo "";
-             fi
-         fi
--        exit $RET
-+#        exit $RET
-     ;;
- 
-     get_uname)
-@@ -1316,11 +1321,11 @@
-             # tree or at headers shipped for a specific kernel.
-             # Determine the kernel version using a compile check.
-             #
--            FILE="linux/utsrelease.h"
-+            FILE="generated/utsrelease.h"
- 
-             if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-                 echo "$CONFTEST_PREAMBLE
--                #include <linux/utsrelease.h>
-+                #include <generated/utsrelease.h>
-                 int main() {
-                     printf(\"%s\", UTS_RELEASE);
-                     return 0;
-@@ -1375,7 +1380,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        FILE="linux/autoconf.h"
-+        FILE="generated/autoconf.h"
- 
-         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-             #
-@@ -1429,7 +1434,7 @@
-         #
-         RET=1
-         VERBOSE=$6
--        FILE="linux/autoconf.h"
-+        FILE="generated/autoconf.h"
- 
-         if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
-             #
-Index: usr/src/nv/nvacpi.c
-===================================================================
---- usr/src/nv/nvacpi.c	
-+++ usr/src/nv/nvacpi.c	2010-01-06 12:10:56.000000000 +0530
-@@ -49,6 +49,10 @@
- };
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
-+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
-+#endif
-+
- static struct acpi_driver *nv_acpi_driver;
- static acpi_handle nvif_handle = NULL;
- static acpi_handle dsm_handle  = NULL;
-