Removing older ebuilds where newer ebuilds in the same class have the same KEYWORDS or better, moving nvidia-2 to nvidia, since nothing uses the old file anymore, simplified sed by changing ${PACKAGE} to PACKAGE, and changed a newins to doins, since we were not renaming anything.

Package-Manager: portage-2.1.3.7

7 files changed, 10 insertions, 121 deletions

diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch
deleted file mode 100644
index 004cbd8ae224..000000000000
--- a/x11-drivers/nvidia-drivers/files/NVIDIA_kernel-2.6.19.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur NVIDIA.orig/usr/src/nv/nv.c NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv.c
---- NVIDIA.orig/usr/src/nv/nv.c	2006-10-17 01:31:37.000000000 -0400
-+++ NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv.c	2006-11-29 21:58:20.000000000 -0500
-@@ -252,7 +252,7 @@
- long          nv_kern_unlocked_ioctl(struct file *, unsigned int, unsigned long);
- long          nv_kern_compat_ioctl(struct file *, unsigned int, unsigned long);
- void          nv_kern_isr_bh(unsigned long);
--irqreturn_t   nv_kern_isr(int, void *, struct pt_regs *);
-+irqreturn_t   nv_kern_isr(int, void *);
- void          nv_kern_rc_timer(unsigned long);
- #if defined(NV_PM_SUPPORT_OLD_STYLE_APM)
- static int    nv_kern_apm_event(struct pm_dev *, pm_request_t, void *);
-@@ -2561,8 +2561,7 @@
-  */
- irqreturn_t nv_kern_isr(
-     int   irq,
--    void *arg,
--    struct pt_regs *regs
-+    void *arg
- )
- {
-     nv_linux_state_t *nvl = (void *) arg;
-diff -Naur NVIDIA.orig/usr/src/nv/nv-i2c.c NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-i2c.c
---- NVIDIA.orig/usr/src/nv/nv-i2c.c	2006-10-17 01:31:37.000000000 -0400
-+++ NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-i2c.c	2006-11-29 21:57:36.000000000 -0500
-@@ -23,8 +23,6 @@
- static struct i2c_algorithm nv_i2c_algo = {
-     .master_xfer      = nv_i2c_algo_xfer,
-     .smbus_xfer       = NULL,
--    .slave_send       = NULL,
--    .slave_recv       = NULL,
-     .algo_control     = nv_i2c_algo_control,
-     .functionality    = nv_i2c_algo_functionality,
- };
-diff -Naur NVIDIA.orig/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-linux.h
---- NVIDIA.orig/usr/src/nv/nv-linux.h	2006-10-17 01:31:37.000000000 -0400
-+++ NVIDIA-Linux-x86-1.0-8776-pkg1/usr/src/nv/nv-linux.h	2006-11-29 21:57:48.000000000 -0500
-@@ -14,7 +14,6 @@
- 
- #include "nv.h"
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/utsname.h>
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8776-r1 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8776-r1
deleted file mode 100644
index e42df39f7972..000000000000
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8776-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 6a8bb2e699a967b6b20dc24a96bf363d NVIDIA-FreeBSD-x86-1.0-8776.tar.gz 9448963
-RMD160 d646e511978ac77fddb6600eabdfc1ea32146e00 NVIDIA-FreeBSD-x86-1.0-8776.tar.gz 9448963
-SHA256 404f25862031d8f3036de33d2a0fafc3c54821a9a08832c1c1616c145d93baa5 NVIDIA-FreeBSD-x86-1.0-8776.tar.gz 9448963
-MD5 93ad45fe7b974a5a80348e1890f9b7c9 NVIDIA-Linux-x86-1.0-8776-pkg0.run 6479231
-RMD160 296dcc76c43fd65105f8d0c6f99295ee983b8872 NVIDIA-Linux-x86-1.0-8776-pkg0.run 6479231
-SHA256 0b25f9e407ea513cac8d600054d2dc28ca2e407caa535510210ad9fa5f45e8dc NVIDIA-Linux-x86-1.0-8776-pkg0.run 6479231
-MD5 9ff6453fd65a4fff758b36e34afa5141 NVIDIA-Linux-x86_64-1.0-8776-pkg2.run 9982646
-RMD160 5cba53392aa0fd27231d01883679e1a1dba7ee34 NVIDIA-Linux-x86_64-1.0-8776-pkg2.run 9982646
-SHA256 6fc8dedf782fdfe408dc0196531c301bb3bafac6878520537807118f3a2f9384 NVIDIA-Linux-x86_64-1.0-8776-pkg2.run 9982646
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9631-r1 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9631-r1
deleted file mode 100644
index c7692cc480b8..000000000000
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9631-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-RMD160 2034f9086ad44ae222199e4949195dffc67274f1 NVIDIA-FreeBSD-x86-1.0-9631.tar.gz 9667093
-SHA256 2b467da57bc3bb8e2216ce3d02909cf077da045ebcf294474b784cb521a5d550 NVIDIA-FreeBSD-x86-1.0-9631.tar.gz 9667093
-MD5 b0d721c962c4df1a028ae18416d7e862 NVIDIA-Linux-x86-1.0-9631-pkg0.run 6581907
-RMD160 7fc0b394e0a9fbb772e43136528dbd3c2b7ac81e NVIDIA-Linux-x86-1.0-9631-pkg0.run 6581907
-SHA256 d1a54248d55f2aecab735e40ae060928670a766a98dd652b2245ebd68085ca5a NVIDIA-Linux-x86-1.0-9631-pkg0.run 6581907
-MD5 64b88c6f405e7f2dd1607c0062c0c1f3 NVIDIA-Linux-x86_64-1.0-9631-pkg2.run 10233636
-RMD160 5e9c501fbfad27686651f64705854552be6c3f0c NVIDIA-Linux-x86_64-1.0-9631-pkg2.run 10233636
-SHA256 009d6e4171fa18580264ce0ace92c1c68f0702f009837f1214d77b6948223375 NVIDIA-Linux-x86_64-1.0-9631-pkg2.run 10233636
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9746-r1 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9746-r1
deleted file mode 100644
index 418cf845d6ec..000000000000
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9746-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 d6dd2fad4f6e05980c2fbb591b06fb99 NVIDIA-FreeBSD-x86-1.0-9746.tar.gz 11152524
-RMD160 8fe06d1a3af528c6fae9f94ff0e612d42e034ecd NVIDIA-FreeBSD-x86-1.0-9746.tar.gz 11152524
-SHA256 cf8be89d537423c0acc294e57cb659dae94463f6347f63c32b1de39c8051a5a7 NVIDIA-FreeBSD-x86-1.0-9746.tar.gz 11152524
-MD5 575f988468f2c34a302da3d21e282689 NVIDIA-Linux-x86-1.0-9746-pkg0.run 7733466
-RMD160 7968dba12e86ecf93470d2aa1442be0ca04c4bb0 NVIDIA-Linux-x86-1.0-9746-pkg0.run 7733466
-SHA256 11dd3fa562bb4695a65e69b45634b91d3fa6ab7181be5f0448afd3c7efce0756 NVIDIA-Linux-x86-1.0-9746-pkg0.run 7733466
-MD5 c0afc66e1c21a9a54ba6719b8edd3166 NVIDIA-Linux-x86_64-1.0-9746-pkg2.run 11743919
-RMD160 b3a050ea487e627cdf2e9ba8dab8a178be6d0bfc NVIDIA-Linux-x86_64-1.0-9746-pkg2.run 11743919
-SHA256 22f9f09a5ceca852c20f12690ac396738f26e150713b2e56cbb42e752454abf9 NVIDIA-Linux-x86_64-1.0-9746-pkg2.run 11743919
diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9755-r1 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9755-r1
deleted file mode 100644
index 0d2023e23ed1..000000000000
--- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9755-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 24c26e0b17da7c8b2a7c82ce835adb61 NVIDIA-FreeBSD-x86-1.0-9755.tar.gz 11207740
-RMD160 4ed7a96a36cd53acbe3d8fa4443634589da82635 NVIDIA-FreeBSD-x86-1.0-9755.tar.gz 11207740
-SHA256 c064786952f7f06a91f487dd7f1b8be5531cb56d2a624f3774e7776410326544 NVIDIA-FreeBSD-x86-1.0-9755.tar.gz 11207740
-MD5 991e03ceaff94fa8113ac04a541ec576 NVIDIA-Linux-x86-1.0-9755-pkg0.run 7750628
-RMD160 4a044add72957bfabfaac4fd19550dd4809873ee NVIDIA-Linux-x86-1.0-9755-pkg0.run 7750628
-SHA256 5bba34a15101872d8ca339af3d4c97c83cb2a0ef81ff68a563517bc20bd29cb2 NVIDIA-Linux-x86-1.0-9755-pkg0.run 7750628
-MD5 88eb6b856ab201dc00663165e10109f9 NVIDIA-Linux-x86_64-1.0-9755-pkg2.run 11768823
-RMD160 dbc5f34410294de21cadcd17216c45000a0464a1 NVIDIA-Linux-x86_64-1.0-9755-pkg2.run 11768823
-SHA256 eaa467d3cde6fe61feb0cbe911316742e03e841d18a94c531caffa42457be785 NVIDIA-Linux-x86_64-1.0-9755-pkg2.run 11768823
diff --git a/x11-drivers/nvidia-drivers/files/nvidia b/x11-drivers/nvidia-drivers/files/nvidia
index f6cfdd49a15d..7cf0f7c0785c 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia
+++ b/x11-drivers/nvidia-drivers/files/nvidia
@@ -4,7 +4,7 @@ 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.gz 
+# options see /usr/share/doc/PACKAGE/README 
 #
 #   To enable Side Band Adressing:  NVreg_EnableAGPSBA=1
 #
@@ -17,7 +17,7 @@ alias /dev/nvidiactl char-major-195
 # if you have hard lockups when starting X.
 #
 # See: Appendix I. Configuring your laptop
-# In /usr/share/doc/${PACKAGE}/README.gz for full details
+# In /usr/share/doc/PACKAGE/README for full details
 #
 # Choose the appropriate value for NVreg_Mobile from the table:
 #        Value		Meaning
@@ -30,3 +30,11 @@ alias /dev/nvidiactl char-major-195
 #        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-2 b/x11-drivers/nvidia-drivers/files/nvidia-2
deleted file mode 100644
index e3583c6ce6f3..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-2
+++ /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.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: Appendix I. Configuring your laptop
-# In /usr/share/doc/${PACKAGE}/README.gz 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