Fix #86968.

Package-Manager: portage-2.0.51.19

3 files changed, 63 insertions, 44 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index b6f9c520fa67..433e6a6589a2 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,10 @@
 # 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.113 2005/04/06 04:47:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.114 2005/04/14 17:10:59 plasmaroo Exp $
+
+  14 Apr 2005; <plasmaroo@gentoo.org>
+  files/linux-headers-2.6.11-appCompat.patch:
+  Fix #86968.
 
   06 Apr 2005; Sven Wegener <swegener@gentoo.org> :
   Fixed digests for KV_EXTRA suport in kernel-2.eclass.
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 065042444006..4f26fb07691c 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,54 +1,44 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0cd28051f4bb7be96b6e5e06f74db009 linux-headers-2.6.8.1-r4.ebuild 1262
-MD5 93d61e502d62b73d3340cb8837b6d6b2 linux-headers-2.4.21-r1.ebuild 3945
+MD5 0b71f802dbd686cdd963d7576546cd8d ChangeLog 24854
+MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509
+MD5 c2c4eec01b604c30d0826e73ac02cac4 linux-headers-2.4.23.ebuild 3482
 MD5 35d9bc7b46a384d814fa9128d656eaec linux-headers-2.6.11.ebuild 1483
+MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
+MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
+MD5 1511502d78a6c1835eabffa20b9d91b0 linux-headers-2.6.8.1-r2.ebuild 1256
+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 0cd28051f4bb7be96b6e5e06f74db009 linux-headers-2.6.8.1-r4.ebuild 1262
 MD5 abc5561a3a28d6614bd2235022eaadce linux-headers-2.4.21.ebuild 3731
-MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
-MD5 c2c4eec01b604c30d0826e73ac02cac4 linux-headers-2.4.23.ebuild 3482
-MD5 ac78a2e51f08f5e6a70691b7684eb3da linux-headers-2.4.25.ebuild 3422
 MD5 ca0bdc7b61085861d6f601ac621fa85c linux-headers-2.4.26-r1.ebuild 441
-MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509
-MD5 1511502d78a6c1835eabffa20b9d91b0 linux-headers-2.6.8.1-r2.ebuild 1256
-MD5 4a641ba69cf3b95764d9ebdcd0d3641d ChangeLog 24754
+MD5 ac78a2e51f08f5e6a70691b7684eb3da linux-headers-2.4.25.ebuild 3422
 MD5 7d0d17d2cead1a311fc4e3350395b4cf linux-headers-2.4.22-r1.ebuild 4077
-MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
 MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820
-MD5 213c9243211da20b5a7611507539e99b linux-headers-2.4.22.ebuild 4029
-MD5 57e8b81485f8a1ba10d41dd7949d40a8 files/linux-headers-2.6.8.1-strict-ansi-fix.patch 4132
-MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
-MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r2 146
-MD5 fb33a0ba21375f190137b9f478ad9799 files/digest-linux-headers-2.6.8.1-r4 146
-MD5 64566ac83b9929cb29c658f140117ee0 files/linux-headers-2.6.10-generic-arm-prepare.patch 1022
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
-MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22-r1 67
 MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
+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 9101139b0720280f338a1823c281ee84 files/linux-headers-2.6.8.1-parisc-syscall.patch 413
-MD5 f265b3be3f242bd5c0d97d4f70a12194 files/unistd.h-i386-pic.patch 4393
-MD5 602f7309c0163c018627f06b5f1ace3a files/linux-headers-2.6.8.1-arm-float.patch 640
-MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
+MD5 c8281c30594a1e82aca0d11b4c47c596 files/linux-headers-2.6.11-appCompat.patch 73144
+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 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
-MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
-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 f21cffda2eeeba9dedb15d75e2417046 files/digest-linux-headers-2.6.11 146
-MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
-MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352
-MD5 38dc08daeadadcf95658c575365d577e files/linux-headers-2.6.11-appCompat.patch 72590
-MD5 bcc6c6ebdba1fe999e710f26c6f403ce files/linux-headers-2.6.8.1-appCompat.patch 60685
-MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
+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-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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCU/iSz7mlh8wQzGMRAntNAKCPTNIlBx8nKmAS3LB6K7qcPljIPwCgg7uF
-0sUD+km0fjs6qhvuPdSmuo4=
-=by73
------END PGP SIGNATURE-----
+MD5 64566ac83b9929cb29c658f140117ee0 files/linux-headers-2.6.10-generic-arm-prepare.patch 1022
+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/linux-headers-2.6.11-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
index d0acdc64e549..968eff965bb6 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.11-appCompat.patch
@@ -1375,9 +1375,9 @@ diff -urp linux-2.6.7/include/asm-parisc/processor.h linux-2.6.7-gentoo/include/
  #include <asm/system.h>
  #endif /* __ASSEMBLY__ */
  
-diff -up linux-2.6.10/include/linux/list.h linux-2.6.10-gentoo/include/linux/list.h
---- linux-2.6.10/include/linux/list.h	2004-08-20 19:54:37.000000000 +0100
-+++ linux-2.6.10-gentoo/linux/list.h	2004-08-24 17:52:07.416139368 +0100
+diff -up linux-2.6.11/include/linux/list.h linux-2.6.11-gentoo/include/linux/list.h
+--- linux-2.6.11/include/linux/list.h	2004-08-20 19:54:37.000000000 +0100
++++ linux-2.6.11-gentoo/linux/list.h	2004-08-24 17:52:07.416139368 +0100
 @@ -1,8 +1,6 @@
  #ifndef _LINUX_LIST_H
  #define _LINUX_LIST_H
@@ -1387,7 +1387,7 @@ diff -up linux-2.6.10/include/linux/list.h linux-2.6.10-gentoo/include/linux/lis
  #include <linux/stddef.h>
  #include <linux/prefetch.h>
  #include <asm/system.h>
-@@ -38,20 +36,30 @@ struct list_head {
+@@ -38,20 +36,39 @@ struct list_head {
  	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
  } while (0)
  
@@ -1399,6 +1399,15 @@ diff -up linux-2.6.10/include/linux/list.h linux-2.6.10-gentoo/include/linux/lis
 +	struct hlist_node *next, **pprev;
 +};
 +
++/**
++ * list_empty - tests whether a list is empty
++ * @head: the list to test.
++ */
++static inline int list_empty(const struct list_head *head)
++{
++       return head->next == head;
++}
++
 +#if defined(__KERNEL__) || defined(__LINUX_KEYBOARD_H)
 +
  /*
@@ -1512,6 +1521,22 @@ diff -up linux-2.6.10/include/linux/list.h linux-2.6.10-gentoo/include/linux/lis
  }
  
  /**
+@@ -244,15 +244,6 @@
+ }
+ 
+ /**
+- * list_empty - tests whether a list is empty
+- * @head: the list to test.
+- */
+-static inline int list_empty(const struct list_head *head)
+-{
+-	return head->next == head;
+-}
+-
+-/**
+  * list_empty_careful - tests whether a list is
+  * empty _and_ checks that no other CPU might be
+  * in the process of still modifying either member
 @@ -496,14 +504,6 @@ static inline void list_splice_init(stru
   * You lose the ability to access the tail in O(1).
   */