More cleanup

(Portage version: 2.1.6.11/cvs/Linux x86_64)

3 files changed, 0 insertions, 179 deletions

diff --git a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
deleted file mode 100644
index 3819b23b5c66..000000000000
--- a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh-orig	2007-12-23 22:48:55.873089378 -0600
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2007-12-23 22:49:59.246421379 -0600
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`who| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
diff --git a/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a304ec4..000000000000
--- a/x11-drivers/ati-drivers/files/8.532/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+        su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch b/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch
deleted file mode 100644
index 2a2a4f2cb753..000000000000
--- a/x11-drivers/ati-drivers/files/8.542/ati-drivers-2.6.27.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- firegl_public.c	2008-09-19 10:57:09.000000000 +0200
-+++ firegl_public.c	2008-09-19 10:55:57.000000000 +0200
-@@ -199,6 +199,12 @@
- #define preempt_enable()
- #endif
- 
-+/* Since 2.6.27 smp_call_function doesn't have a nonatomic/retry argument */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, wait)
-+#else
-+#define SMP_CALL_FUNCTION(func, info, retry, wait) smp_call_function(func, info, retry, wait)
-+#endif
- // ============================================================
- /* globals */
- 
-@@ -250,7 +256,7 @@
- const char BUILD_KERNEL_HAS_MODVERSIONS_CLEARED;
- #endif
- 
--#ifdef __SMP__
-+#ifdef CONFIG_SMP
- const unsigned long __ke_SMP_State = 1;
- const char BUILD_KERNEL_HAS_SMP_SET;
- #else
-@@ -2516,8 +2522,8 @@
- {
- /*Some kernel developer removed the export of symbol "flush_tlb_page" on 2.6.25 x86_64 SMP kernel.
-   Define a simple version here.*/
--#if defined(__x86_64__) && defined(__SMP__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
--    on_each_cpu(KCL_flush_tlb_one, &va, 1, 1);
-+#if defined(__x86_64__) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) 
-+    on_each_cpu(KCL_flush_tlb_one, &va, 1);
- #else
-     flush_tlb_page(vma, va);
- #endif
-@@ -2902,7 +2908,7 @@
- 
- /*****************************************************************************/
- 
--#ifdef __SMP__
-+#ifdef CONFIG_SMP
- static atomic_t cpus_waiting;
- 
- static void deferred_flush(void* contextp)
-@@ -2918,13 +2924,13 @@
- 	while (atomic_read(&cpus_waiting) > 0)
- 		barrier();
- }
--#endif /* __SMP__ */
-+#endif /* CONFIG_SMP */
- 
- int ATI_API_CALL __ke_flush_cache(void)
- {
--#ifdef __SMP__
-+#ifdef CONFIG_SMP
-     /* write back invalidate all other CPUs (exported by kernel) */
--	if (smp_call_function(deferred_flush, NULL, 1, 0) != 0)
-+	if (SMP_CALL_FUNCTION(deferred_flush, NULL, 1, 0) != 0)
- 		panic("timed out waiting for the other CPUs!\n");
- 
-     /* invalidate this CPU */
-@@ -2938,7 +2944,7 @@
- 
- 	while (atomic_read(&cpus_waiting) > 0)
- 		barrier();
--#else /* !__SMP__ */
-+#else /* !CONFIG_SMP */
- #if defined(__i386__) || defined(__x86_64__)
- 	asm volatile ("wbinvd":::"memory");
- #elif defined(__alpha__) || defined(__sparc__)
-@@ -2946,7 +2952,7 @@
- #else
- #error "Please define flush_cache for your architecture."
- #endif
--#endif /* !__SMP__ */
-+#endif /* !CONFIG_SMP */
- 
-     //for kernel 2.6.25, tlb_flush has been included when calling set_pages_*.
-     #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
-@@ -4654,7 +4660,7 @@
-    }
- 
- #ifdef CONFIG_SMP
--   if (smp_call_function(KCL_setup_pat, NULL, 0, 1) != 0)
-+   if (SMP_CALL_FUNCTION(KCL_setup_pat, NULL, 0, 1) != 0)
-        return 0;
- #endif
-    KCL_setup_pat(NULL);
-@@ -4673,7 +4679,7 @@
-     }
- 
- #ifdef CONFIG_SMP
--    if (smp_call_function(KCL_restore_pat, NULL, 0, 1) != 0)
-+    if (SMP_CALL_FUNCTION(KCL_restore_pat, NULL, 0, 1) != 0)
-        return;
- #endif
-     KCL_restore_pat(NULL);