Also remove unused patches.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 21 insertions, 178 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index b528fbe660b8..b1fdded082d8 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.280 2012/05/06 08:36:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.281 2012/05/06 08:40:26 scarabeus Exp $
+
+  06 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/ati-drivers-2.6.39.patch,
+  -files/ati-drivers-fix_compilation-bug-297322.patch,
+  -files/ati-drivers-redefine-WARN.patch:
+  Also remove unused patches.
 
   06 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -ati-drivers-11.10.ebuild,
   -ati-drivers-11.11.ebuild, -ati-drivers-11.12-r1.ebuild,
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 42f1263aed44..1976d2a3b8f8 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -3,9 +3,6 @@ Hash: SHA1
 
 AUX amd-drivers-3.2.7.1.patch 560 RMD160 d3703be2c979c784af325072c7eb9d04f52754c5 SHA1 d1d45998ac2588670ead6e6a1ce6dd29fef0c808 SHA256 7cc315754a47fbda6bf36bcee01780da7c19535c4f6ec1cccc556e9a7b32d263
 AUX ati-drivers-12.2-redefine-WARN.patch 1316 RMD160 13d135adc00eee61665590a34a3c8f0dcd607b1b SHA1 65f979af2e1807cfbd98c7407940693a8f4f72b0 SHA256 f7d8ad3307823925cf8b4c6540db17a51553e48dd008793fc026803bb2aa1ced
-AUX ati-drivers-2.6.39.patch 3909 RMD160 5360585cfc3e30babcfee55598883d78120b913f SHA1 51f60012d03a42bff6ed703b0e29bc3ba07a0c63 SHA256 2cf957a44ae46d5b487b0eef7d303ca5b503064d51e5bdf1a781e2a792909cd5
-AUX ati-drivers-fix_compilation-bug-297322.patch 1114 RMD160 69d27b8e3b45f254d3ed71c47b6b28621868af91 SHA1 d51ca6418e9644035727eb63cbe0494111c9e9b2 SHA256 edbfc56eec848389c3dfdd94362322de41027b9813128d2d4f8e476d1d8581e3
-AUX ati-drivers-redefine-WARN.patch 1135 RMD160 b9fb1cd4e15b7fce101367f7335b86af55389e10 SHA1 086665af0fb661fd38d242e738699ef1b7c4c2b4 SHA256 16b7e5f1527d3a9e80acb036e5684049a0d280521cc247d535a354236f863b10
 AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
 AUX switchlibGL 1349 RMD160 d3c9f36fabf65b21f26456e303d8127779fd1bd2 SHA1 277a549afd62fdeae9f09022a8e55ceabf180f9f SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0
@@ -13,22 +10,22 @@ DIST amd-driver-installer-12-2-x86.x86_64.run 107213014 RMD160 b3966f0ad6c756f6d
 DIST amd-driver-installer-12-4-x86.x86_64.run 108360519 RMD160 78eae42f40f211bba8e62b9896146f5a4c1bdc0d SHA1 7db947ee20929ba24da03bad2624538cb55589b6 SHA256 7f3ba3d96eba30fc09aec03ba72f5482d3b192bb0ea63a5e7b79454b053cb63c
 EBUILD ati-drivers-12.2.ebuild 19130 RMD160 4a76e718a4fd0f5affbdcab6e3c1817caa3a370e SHA1 e60c741b5264d845ba91d027ef1261b1e7bb40f2 SHA256 462c4800a3f4b59c42f88f500421c57c671f3fbd6029c4cba922beca7de669f7
 EBUILD ati-drivers-12.4.ebuild 19645 RMD160 72e08ed1a8f187c79aeb7f26f703db2ca7e1f4bb SHA1 bd691f5b20e49633cc4c276ab678310151fd8c07 SHA256 f2ebcc52bf6058995cb3d3d7eb74f351e70d8d5ba712f57d5a581711ca2ce84b
-MISC ChangeLog 76448 RMD160 ae08c7fb86251c3c26ec6702f90e2e900f16b478 SHA1 cc027ae779e364303285daa59ab036325b470aab SHA256 21b4a745cc097aa9ba4a17eb500781d53a1b6aee1313a90e4ec4e8ee6b7dc80a
+MISC ChangeLog 76666 RMD160 388a641941d765179c67ac16aec4cae6d863f766 SHA1 8ae49bd3e1fc60949988dba5a77406f65498a866 SHA256 a12c122e03e1986d9c07ca9b57de6be4a156b17b8ac6c8f539802a57de327109
 MISC metadata.xml 789 RMD160 9a234fedd78ca28474f9f4bbdc52376838ed2dd9 SHA1 c07d53d61792d5a030b8bcabc4b55533ddb43778 SHA256 cc4c8b40b8c174fe8424badcd59ae5974b95c283a4c3dc59d1138b80dd010263
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPpjgFAAoJEOSiRoyO7jvo+CkQAKv2UA08ZMMdoYb6gsaVFB78
-fASUhijoW4V8jt9P+REi7d5n35saz16HhnO3+XXPm0vtxsJaVq3jhEWGvhodYbyc
-MJYLBQTPpr6m2+BQn7W5UABjnJHdDPjLC1z4j3a3b4x0JNc5fi4DMsygvb42kWGn
-Ih00Mp/CpmpVjSSsGY0Oqx60YQBKV7ir1JuROpHPrLRNiBgEoT70rNqlZqFVNTNQ
-209cB07H9+e/H2n9JoY0aqMYykl0EnB5bdh5yIy0ITYWA1JEEpURhb9na8hbfYi7
-1pfcIkUHaorbAurNePmHV/7opwG9xM3rRvmhnqJ2b23n1G3/xcycSCb6F0AS5AX+
-daZzGMERdKX5AEM9yts3qFmypeIkbtb6ks5TcoHqXUMY1ocPUge+Qd2ogGuauZQl
-KO1pjieh1G+7IJBuw8biEmLYiqVvmHJpWSe3saDMQRw8Nn2Hbl+3h62ruP9FiXRB
-kJ60XGe/JmHYB3nDy3SiWEXW3oEthwLfFZrZh4reKAS8bpl/aIOd/L+g8Cprfbpp
-jQAoDGGDYYK4BJ/dXZKQf963/JQ7A/qAcK57cJAgyZRLAszn2lCuqs9f1Lv02jj1
-keKH7DY1kSqI6xR4/Yw3arL6yPW8WYwILPSi4/O4sYSQkUSEHTVIk6eRiSkGXmEw
-YOyVqYx2rzRXNwuM9Fcd
-=4eXM
+iQIcBAEBAgAGBQJPpjkAAAoJEOSiRoyO7jvo8h4QAItHgcCJbE2wuPXi48vmv56N
+X+rM18FURHlVesndgqbijFleXfeYiL1MmApSTC7Inc0yYo2kqI1AM62zmA+mC8k2
+b6Lu+jZyTVoXTHTjam9pSr1JmJbz0jKu1Pzsme78umLxH1GbTKvEh0uY4+8yAyFo
+K84c4kIkDyyr2+sIsVcWW7IkEsOap6MoaNwZaQd/D5j+2dWQebcO3Xx5tvJsttIx
+M2j9ntOzcWsmu6FkOoFnhzowvkjIi4FP5wCFd2Q6HUN9stin+luSWYX0FM4X+Hef
+dt8iTtbhbYVKbdHmOt8Vgdjkg6DDK7EdFeunR9BxmYeZXYJtEAExqkQuWp1e1WWH
+f+YhPcZdYzLWC/vQ18XzcUZy8KBPSRjb8HT1WRLs9DzbTDMu2CXJ5sNCEAA9Zsza
+2AzFGE9dWMf7xKFqKuUHGOUbeIUalitGbjFNXJ2tHkbXexN2eXGUsZZFMAsSmrSK
+dVuuYbKP9V/R8dAt7qEEdzdTvAfdmMIqcm9Mdgb5SGF9ihE7Sld/30ECP0BIb/MR
+JHPHBlXMfFDLVwietZNmeZawGWv1kmCf8CxRehxDx+uSgqwv+SFa15Mqk9K39bEl
+Akjy03XEsFMBV7Qz56CSJ9jjZQyXfw4qM50LOOlGlpdzJ75z9p3+bt8c9YSL7WGo
+jAXfdXmu3gzAqOthCBM6
+=Aum5
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch
deleted file mode 100644
index 6f3940ca9b48..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.39.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Description: add support for missing kernel lock
-Author: Pascal Giard <evilynux@gmail.com>
-
-diff -Naur fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-04-27 21:30:08.000000000 +0200
-+++ fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-04-27 21:29:27.000000000 +0200
-@@ -1902,13 +1902,17 @@
- /** \brief Grab global kernel lock */
- void ATI_API_CALL KCL_GlobalKernelLock(void)
- {
-+#ifdef CONFIG_KERNEL_LOCK
-     lock_kernel();
-+#endif
- }
- 
- /** \brief Release global kernel lock */
- void ATI_API_CALL KCL_GlobalKernelUnlock(void)
- {
-+#ifdef CONFIG_KERNEL_LOCK
-     unlock_kernel();
-+#endif
- }
- 
- /*****************************************************************************/
-# Do not include smp_lock.h if the Kernel is built without BKL.
-# Closes: #619952
-
-diff -Naur fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/drmP.h fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/drmP.h
---- fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/drmP.h	2011-03-24 17:00:28.000000000 +0100
-+++ fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/drmP.h	2011-03-29 20:39:05.000000000 +0200
-@@ -57,7 +57,11 @@
- #include <linux/pci.h>
- #include <linux/version.h>
- #include <linux/sched.h>
-+/* with no Big Kernel Lock and linux 2.6.38
-+   and higher smp_lock.h is removed      */
-+#ifdef CONFIG_KERNEL_LOCK || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
- #include <linux/smp_lock.h>	/* For (un)lock_kernel */
-+#endif
- #include <linux/mm.h>
- #include <linux/pagemap.h>
- #if defined(__alpha__) || defined(__powerpc__)
-diff -Naur fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-11-3.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-03-29 20:37:04.000000000 +0200
-+++ fglrx-driver-11-3/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-03-29 20:39:05.000000000 +0200
-@@ -116,7 +116,16 @@
- #include <linux/pci.h>
- #include <linux/wait.h>
- #include <linux/miscdevice.h>
--#include <linux/smp_lock.h>
-+
-+/* with no Big Kernel Lock and linux 2.6.38
-+   and higher is smp_lock.h removed.
-+   instead of smp_lock.h is sched.h required    */
-+#ifdef CONFIG_KERNEL_LOCK || LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
-+#include <linux/smp_lock.h>	/* For (un)lock_kernel */
-+#else
-+#include <linux/sched.h>
-+#endif
-+
- // newer SuSE kernels need this
- #include <linux/highmem.h>
- 
-Description: Add Linux 2.6.39 support
- <linux/spinlock_types.h> had the following comment until 2.6.38:
- .
- /*
-  * SPIN_LOCK_UNLOCKED defeats lockdep state tracking and is hence
-  * deprecated.
-  * Please use DEFINE_SPINLOCK() or __SPIN_LOCK_UNLOCKED() as
-  * appropriate.
-  */
- #define SPIN_LOCK_UNLOCKED     __SPIN_LOCK_UNLOCKED(old_style_spin_init)
- .
- This definition got removed in 2.6.39. Restore it locally until it gets fixed
- upstream.
-Author: Miguel Colon <debian.micove@gmail.com>
-Forwarded: no
-Last-Update: 2011-03-30
-
-diff -Naur fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-11-4.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-04-27 21:48:43.000000000 +0200
-+++ fglrx-driver-11-4/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-04-27 21:49:36.000000000 +0200
-@@ -1060,7 +1060,12 @@
-     dev->pubdev.signature = FGL_DEVICE_SIGNATURE;
- 
-     for (i = 0; i < __KE_MAX_SPINLOCKS; i++)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
-         dev->spinlock[i] = SPIN_LOCK_UNLOCKED;
-+#else
-+        dev->spinlock[i] = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
-+#endif
-+
- 
-     for (i=0; i < __KE_MAX_SEMAPHORES; i++)
-         sema_init(&dev->struct_sem[i], 1);
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch b/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch
deleted file mode 100644
index e2af915a5d02..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-fix_compilation-bug-297322.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1441,7 +1441,9 @@
- todo !!!
- #endif
- 
--unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,
-+void __cmpxchg_wrong_size(void) {}
-+
-+unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,
-          unsigned long new, int size)
- {
- #ifndef __HAVE_ARCH_CMPXCHG
---- common/lib/modules/fglrx/build_mod/firegl_public.h
-+++ common/lib/modules/fglrx/build_mod/firegl_public.h
-@@ -441,7 +441,8 @@
- extern void ATI_API_CALL KCL_SIGNAL_BlockAll(int (*notifier)(void *priv), void *pPriv, __ke_sigset_t *pSigMask);
- extern void ATI_API_CALL KCL_SIGNAL_UnblockAll(void);
- 
--extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile void *ptr, unsigned long old,                      
-+extern void __cmpxchg_wrong_size(void);
-+extern unsigned long ATI_API_CALL __ke__cmpxchg(volatile unsigned long *ptr, unsigned long old,                      
-                       unsigned long new, int size);
- 
- #define __ke_cmpxchg(ptr,o,n)                        \
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch
deleted file mode 100644
index fe5ed2f8ee72..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-redefine-WARN.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig	2011-12-30 14:32:00.271391437 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.h	2011-12-30 15:48:21.647473696 +0100
-@@ -85,8 +85,8 @@
- #ifdef ERROR
- #undef ERROR
- #endif
--#ifdef WARN
--#undef WARN
-+#ifdef AMD_WARN
-+#undef AMD_WARN
- #endif
- #ifdef INFO
- #undef INFO
-@@ -122,7 +122,7 @@
- {
-     SPECIAL = 0,
-     ERROR  ,
--    WARN  ,
-+    AMD_WARN  ,
-     INFO ,
-     INFOEX,
-     TRACE,
-@@ -163,14 +163,14 @@
- {
-     {SPECIAL        ,   'S'},
-     {ERROR          ,   'E'},
--    {WARN           ,   'W'},
-+    {AMD_WARN       ,   'W'},
-     {INFO           ,   'I'},
-     {INFOEX         ,   'X'},
-     {TRACE          ,   'T'},
-     {PERFORMANCE    ,   'P'},
-     {DUMP           ,   'D'},
- };
--#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
-+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
- #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
- static module_map module_type_map[LOG_M_MAX] =
- {