Bump to 2.6.11; fix #85106.

Package-Manager: portage-2.0.51.19

5 files changed, 86 insertions, 67 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index c5b62c8fc89c..c3e6320e7b15 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.107 2005/03/06 18:32:44 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.108 2005/03/15 19:41:02 plasmaroo Exp $
+
+*linux-headers-2.6.11 (15 Mar 2005)
+
+  15 Mar 2005; <plasmaroo@gentoo.org> -linux-headers-2.6.10.ebuild,
+  +linux-headers-2.6.11.ebuild, -files/linux-headers-2.6.10-appCompat.patch,
+  +files/linux-headers-2.6.11-appCompat.patch:
+  Bump to 2.6.11; fix #85106.
 
   06 Mar 2005; <plasmaroo@gentoo.org>
   files/linux-headers-2.6.10-appCompat.patch:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index ed1e775f88ab..afb48233eb5d 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,42 +1,42 @@
-MD5 62c930194e3aa6e0150b903a77f7615e ChangeLog 23890
+MD5 52a4b16d1ea0e3fc8f45b42dfe3e18eb ChangeLog 24150
 MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509
-MD5 c28313e23ce24b05e25738a685a00cd4 linux-headers-2.4.26.ebuild 3351
-MD5 93d61e502d62b73d3340cb8837b6d6b2 linux-headers-2.4.21-r1.ebuild 3945
-MD5 abc5561a3a28d6614bd2235022eaadce linux-headers-2.4.21.ebuild 3731
-MD5 213c9243211da20b5a7611507539e99b linux-headers-2.4.22.ebuild 4029
 MD5 c2c4eec01b604c30d0826e73ac02cac4 linux-headers-2.4.23.ebuild 3482
+MD5 16f14edbbea68df6c80b316740d3b626 linux-headers-2.6.11.ebuild 1481
 MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
-MD5 ac78a2e51f08f5e6a70691b7684eb3da linux-headers-2.4.25.ebuild 3422
-MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820
-MD5 921f9a68d38778297cb92cb3aa61e428 linux-headers-2.6.8.1-r2.ebuild 1260
 MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
+MD5 921f9a68d38778297cb92cb3aa61e428 linux-headers-2.6.8.1-r2.ebuild 1260
+MD5 93d61e502d62b73d3340cb8837b6d6b2 linux-headers-2.4.21-r1.ebuild 3945
+MD5 c28313e23ce24b05e25738a685a00cd4 linux-headers-2.4.26.ebuild 3351
+MD5 213c9243211da20b5a7611507539e99b linux-headers-2.4.22.ebuild 4029
 MD5 e34ea6646a79a131e226f316f77e4043 linux-headers-2.6.8.1-r4.ebuild 1266
-MD5 d3190508855415a0e73f23dd30e9813f linux-headers-2.6.10.ebuild 1574
+MD5 abc5561a3a28d6614bd2235022eaadce linux-headers-2.4.21.ebuild 3731
+MD5 ac78a2e51f08f5e6a70691b7684eb3da linux-headers-2.4.25.ebuild 3422
 MD5 7d0d17d2cead1a311fc4e3350395b4cf linux-headers-2.4.22-r1.ebuild 4077
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820
+MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
+MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
+MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
+MD5 38dc08daeadadcf95658c575365d577e files/linux-headers-2.6.11-appCompat.patch 72590
+MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r4 146
+MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
 MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
-MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
-MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
-MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
-MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
-MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
 MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
+MD5 bcc6c6ebdba1fe999e710f26c6f403ce files/linux-headers-2.6.8.1-appCompat.patch 60685
+MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
+MD5 57e8b81485f8a1ba10d41dd7949d40a8 files/linux-headers-2.6.8.1-strict-ansi-fix.patch 4132
+MD5 602f7309c0163c018627f06b5f1ace3a files/linux-headers-2.6.8.1-arm-float.patch 640
+MD5 1eb60ece0c628f5be662591e738f31b0 files/digest-linux-headers-2.6.11 146
+MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
+MD5 9101139b0720280f338a1823c281ee84 files/linux-headers-2.6.8.1-parisc-syscall.patch 413
+MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 14c583e9ea29b2a3fc88349685cce2f4 files/linux-headers-soundcard-ppc64.patch 722
-MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r4 146
-MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
-MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
 MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r2 146
+MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22-r1 67
+MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
 MD5 6dd79a655f006aebb7206203f3654976 files/linux-headers-2.6.7-generic-arm-prepare.patch 978
-MD5 57e8b81485f8a1ba10d41dd7949d40a8 files/linux-headers-2.6.8.1-strict-ansi-fix.patch 4132
-MD5 bcc6c6ebdba1fe999e710f26c6f403ce files/linux-headers-2.6.8.1-appCompat.patch 60685
-MD5 602f7309c0163c018627f06b5f1ace3a files/linux-headers-2.6.8.1-arm-float.patch 640
-MD5 bb50e8794730d77fb61b30366324587d files/digest-linux-headers-2.6.10 146
-MD5 107d66012e836df72bfbd6be9332127c files/linux-headers-2.6.10-appCompat.patch 72160
 MD5 64566ac83b9929cb29c658f140117ee0 files/linux-headers-2.6.10-generic-arm-prepare.patch 1022
-MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22-r1 67
-MD5 9101139b0720280f338a1823c281ee84 files/linux-headers-2.6.8.1-parisc-syscall.patch 413
-MD5 f265b3be3f242bd5c0d97d4f70a12194 files/unistd.h-i386-pic.patch 4393
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352
+MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
+MD5 f265b3be3f242bd5c0d97d4f70a12194 files/unistd.h-i386-pic.patch 4393
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.10 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11
index 8372638227d6..7e21ce282b32 100644
--- a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.10
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11
@@ -1,2 +1,2 @@
-MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
 MD5 27787cb0712944ae182c1faffc33f5e4 linux-2.6.10-m68k-headers.patch.bz2 12399
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.10-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
index 910f252d8e09..d0acdc64e549 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.10-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
@@ -443,34 +443,33 @@ diff -ur linux-2.6.8.1/include/asm-generic/siginfo.h linux-2.6.8.1-gentoo/includ
  #endif
  
  /*
-@@ -238,7 +240,7 @@
+@@ -242,6 +244,7 @@
+ #define SIGEV_PAD_SIZE	((SIGEV_MAX_SIZE/sizeof(int)) - 3)
  #endif
  
- #ifndef HAVE_ARCH_SIGEVENT_T
--
 +#ifndef _SIGNAL_H
  typedef struct sigevent {
  	sigval_t sigev_value;
  	int sigev_signo;
-@@ -253,7 +255,7 @@
+@@ -256,7 +259,7 @@
  		} _sigev_thread;
  	} _sigev_un;
  } sigevent_t;
 -
 +#endif
- #endif
- 
  #define sigev_notify_function	_sigev_un._sigev_thread._function
-diff -ur linux-2.6.0/include/linux/jiffies.h linux-2.6.0/include/linux.gentoo/jiffies.h
---- linux-2.6.0/include/linux/jiffies.h	2004-01-19 20:18:36.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/jiffies.h	2004-01-19 20:01:11.000000000 +0000
+ #define sigev_notify_attributes	_sigev_un._sigev_thread._attribute
+ #define sigev_notify_thread_id	 _sigev_un._tid
+diff -ur linux-2.6.11/include/linux/jiffies.h linux-2.6.11/include/linux.gentoo/jiffies.h
+--- linux-2.6.11/include/linux/jiffies.h	2004-01-19 20:18:36.000000000 +0000
++++ linux-2.6.11/include/linux.gentoo/jiffies.h	2004-01-19 20:01:11.000000000 +0000
 @@ -13,15 +13,15 @@
   * without holding read_lock_irq(&xtime_lock).
   * get_jiffies_64() will do this for you as appropriate.
   */
--extern u64 jiffies_64;
-+extern __u64 jiffies_64;
- extern unsigned long volatile jiffies;
+-extern u64 __jiffy_data jiffies_64;
++extern __u64 __jiffy_data jiffies_64;
+ extern unsigned long volatile __jiffy_data jiffies;
  
  #if (BITS_PER_LONG < 64)
 -u64 get_jiffies_64(void);
@@ -1914,26 +1913,6 @@ diff -urp linux-2.6.10/include/asm-i386/semaphore.h linux-2.6.10-gentoo/include/
  #include <linux/linkage.h>
  
  /*
-diff -urp linux-2.6.10/include/linux/mmzone.h linux-2.6.10-gentoo/include/linux/mmzone.h
---- linux-2.6.10/include/linux/mmzone.h	2005-02-08 21:01:47.000000000 +0000
-+++ linux-2.6.10-gentoo/include/linux/mmzone.h	2005-02-08 20:45:13.000000000 +0000
-@@ -1,6 +1,8 @@
- #ifndef _LINUX_MMZONE_H
- #define _LINUX_MMZONE_H
- 
-+extern int numnodes;
-+
- #ifdef __KERNEL__
- #ifndef __ASSEMBLY__
- 
-@@ -270,7 +272,6 @@ typedef struct pglist_data {
- #define node_present_pages(nid)	(NODE_DATA(nid)->node_present_pages)
- #define node_spanned_pages(nid)	(NODE_DATA(nid)->node_spanned_pages)
- 
--extern int numnodes;
- extern struct pglist_data *pgdat_list;
- 
- void __get_zone_counts(unsigned long *active, unsigned long *inactive,
 diff -urp linux-2.6.10/include/linux/prio_tree.h linux-2.6.10-gentoo/include/linux/prio_tree.h
 --- linux-2.6.10/include/linux/prio_tree.h	2005-02-08 21:01:47.000000000 +0000
 +++ linux-2.6.10-gentoo/include/linux/prio_tree.h	2005-02-08 20:15:28.000000000 +0000
@@ -2329,3 +2308,37 @@ diff -urp linux-2.6.10/include/linux/if_ppp.h linux-2.6.10-gentoo/include/linux/
  /* Constants used for fbio SunOS compatibility */
  /* (C) 1996 Miguel de Icaza */
  
+--- linux-2.6.10/include/linux/byteorder/little_endian.h.orig	2005-03-07 01:19:49.000000000 +0100
++++ linux-2.6.10/include/linux/byteorder/little_endian.h	2005-03-07 01:20:22.000000000 +0100
+@@ -40,6 +40,7 @@
+ #define __cpu_to_be16(x) ((__force __be16)__swab16((x)))
+ #define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x))
+ 
++#ifndef __STRICT_ANSI__
+ static inline __le64 __cpu_to_le64p(const __u64 *p)
+ {
+ 	return (__force __le64)*p;
+@@ -48,6 +49,7 @@
+ {
+ 	return (__force __u64)*p;
+ }
++#endif /* !__STRICT_ANSI__ */
+ static inline __le32 __cpu_to_le32p(const __u32 *p)
+ {
+ 	return (__force __le32)*p;
+@@ -64,6 +66,7 @@
+ {
+ 	return (__force __u16)*p;
+ }
++#ifndef __STRICT_ANSI__
+ static inline __be64 __cpu_to_be64p(const __u64 *p)
+ {
+ 	return (__force __be64)__swab64p(p);
+@@ -72,6 +75,7 @@
+ {
+ 	return __swab64p((__u64 *)p);
+ }
++#endif /* !__STRICT_ANSI__ */
+ static inline __be32 __cpu_to_be32p(const __u32 *p)
+ {
+ 	return (__force __be32)__swab32p(p);
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.10.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11.ebuild
index 8907653ed6ee..9446ea935c71 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.10.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.10.ebuild,v 1.5 2005/03/10 23:01:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11.ebuild,v 1.1 2005/03/15 19:41:02 plasmaroo Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
@@ -8,16 +8,15 @@ inherit kernel-2 eutils
 detect_version
 
 SRC_URI="${KERNEL_URI} mirror://gentoo/linux-2.6.10-m68k-headers.patch.bz2"
-KEYWORDS="-* ~amd64 ~arm ~hppa ~ia64 ~m68k ~sparc ~s390 ~sh ~x86" # Untested, by using this you are agreeing to file bugs to plasmaroo, aren't you? :-)
+KEYWORDS="-*" # Not tested to be fully stable, if things break file bugs to plasmaroo please...
 
 UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.6.0-sysctl_h-compat.patch
 	${FILESDIR}/${PN}-2.6.0-fb.patch
 	${FILESDIR}/${PN}-2.6.8.1-strict-ansi-fix.patch
 	${FILESDIR}/${P}-appCompat.patch
-	${FILESDIR}/${P}-generic-arm-prepare.patch
-	${FILESDIR}/${PN}-soundcard-ppc64.patch
-	${FILESDIR}/${PN}-2.6.8.1-parisc-syscall.patch"
+	${FILESDIR}/${PN}-2.6.10-generic-arm-prepare.patch
+	${FILESDIR}/${PN}-soundcard-ppc64.patch"
 
 src_unpack() {
 	tc-arch-kernel