Fix #89770, #91507, #92816.

Package-Manager: portage-2.0.51.22

3 files changed, 64 insertions, 40 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 466b890b24cb..54b842daa491 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.125 2005/05/18 20:16:19 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.126 2005/05/24 14:01:38 plasmaroo Exp $
+
+  24 May 2005; <plasmaroo@gentoo.org>
+  files/linux-headers-2.6.11-appCompat.patch:
+  Fix #89770, #91507, #92816.
 
   18 May 2005; Sven Wegener <swegener@gentoo.org>
   linux-headers-2.4.21.ebuild, linux-headers-2.4.21-r1.ebuild,
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index d43b1533dab2..3aa7aeff647f 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,44 +1,44 @@
-MD5 bf7a46c9120e942352df3c938a4ecb40 ChangeLog 26385
-MD5 31e90cfffdf977c955d107db8553d1db linux-headers-2.4.26.ebuild 3354
+MD5 5994187cf7145fe4100c43cb216d8752 ChangeLog 26501
 MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509
-MD5 952afa5ec1d18abb7dcf9d4e26970d5a linux-headers-2.4.21-r1.ebuild 3947
-MD5 cd10168775609812266f3f571928cde1 linux-headers-2.4.21.ebuild 3733
-MD5 772d16ab14120bf4ed224c143f267b3e linux-headers-2.4.22.ebuild 4031
 MD5 1e3350e5596cd13bde8ea8ad3cac169c linux-headers-2.4.23.ebuild 3484
+MD5 9f71ae4df8f88b889b9d7bd4c77b44c5 linux-headers-2.6.11.ebuild 1529
 MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
-MD5 74742da16e7d510e5397f5bb1676d3b2 linux-headers-2.4.25.ebuild 3424
-MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820
-MD5 1511502d78a6c1835eabffa20b9d91b0 linux-headers-2.6.8.1-r2.ebuild 1256
 MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
+MD5 1511502d78a6c1835eabffa20b9d91b0 linux-headers-2.6.8.1-r2.ebuild 1256
+MD5 952afa5ec1d18abb7dcf9d4e26970d5a linux-headers-2.4.21-r1.ebuild 3947
+MD5 31e90cfffdf977c955d107db8553d1db linux-headers-2.4.26.ebuild 3354
+MD5 772d16ab14120bf4ed224c143f267b3e linux-headers-2.4.22.ebuild 4031
 MD5 0cd28051f4bb7be96b6e5e06f74db009 linux-headers-2.6.8.1-r4.ebuild 1262
-MD5 9f71ae4df8f88b889b9d7bd4c77b44c5 linux-headers-2.6.11.ebuild 1529
-MD5 795577bd3aa9ec75d64f69d71d3ee535 linux-headers-2.4.22-r1.ebuild 4080
+MD5 cd10168775609812266f3f571928cde1 linux-headers-2.4.21.ebuild 3733
 MD5 f229fe4d523bc5e7004c58b70ceab3bf linux-headers-2.4.26-r1.ebuild 456
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 74742da16e7d510e5397f5bb1676d3b2 linux-headers-2.4.25.ebuild 3424
+MD5 795577bd3aa9ec75d64f69d71d3ee535 linux-headers-2.4.22-r1.ebuild 4080
+MD5 681c761c0afe60e1022ac44d37d3370a linux-headers-2.0.40.ebuild 1820
+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 fd99ea996297859386993dda27286ca5 files/linux-headers-2.6.11-appCompat.patch 79363
+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 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 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 4647983fb9197fa1eb1ab15bbc7d29d7 files/linux-headers-2.6.8.1-appCompat.patch 62589
+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 93ad098bff308bd5e945bb2a48c437d1 files/linux-headers-2.6.11-appCompat.patch 78846
-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 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-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 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
+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
+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 0c71dfc1f1fb..82d7c63ac7d2 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
@@ -398,7 +398,7 @@ diff -ur linux-2.6.0/include/linux/types.h linux-2.6.0/include/linux.gentoo/type
  #endif /* __KERNEL__ */
  
  #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-@@ -176,16 +157,16 @@
+@@ -176,16 +157,22 @@
  typedef __u16 __bitwise __be16;
  typedef __u32 __bitwise __le32;
  typedef __u32 __bitwise __be32;
@@ -415,6 +415,12 @@ diff -ur linux-2.6.0/include/linux/types.h linux-2.6.0/include/linux.gentoo/type
  	char			f_fpack[6];
  };
 +#endif
++
++/* Fix bad upstream jojo in XEmacs; bug #82690. Temporary fix only warning until upstream fixes
++   things... */
++#ifdef register
++#undef register
++#endif
  
  #endif /* _LINUX_TYPES_H */
 diff -ur linux-2.6.8.1/include/asm-generic/siginfo.h linux-2.6.8.1-gentoo/include/asm-generic/siginfo.h
@@ -1047,8 +1053,16 @@ diff -ur linux-2.6.8.1/include/linux/compiler.h linux-2.6.8.1-gentoo/include/lin
  /*
   * Allow us to mark functions as 'deprecated' and have gcc emit a nice
   * warning for each use, in hopes of speeding the functions removal.
-@@ -124,4 +139,10 @@
- #define noinline
+@@ -137,12 +134,14 @@
+ # define __attribute_const__	/* unimplemented */
+ #endif
+ 
+-#ifndef noinline
+-#define noinline
+-#endif
+-
+ #ifndef __always_inline
+ #define __always_inline inline
  #endif
  
 +#ifdef __cplusplus
@@ -2039,16 +2053,11 @@ diff -urp linux-2.6.10/include/linux/types.h linux-2.6.10-gentoo/include/linux/t
 diff -urp linux-2.6.10/include/asm-i386/thread_info.h linux-2.6.10-gentoo/include/asm-i386/thread_info.h
 --- linux-2.6.10/include/asm-i386/thread_info.h	2005-02-08 21:30:49.000000000 +0000
 +++ linux-2.6.10-gentoo/asm-i386/thread_info.h	2005-02-08 21:27:03.000000000 +0000
-@@ -7,8 +7,12 @@
+@@ -7,8 +7,7 @@
  #ifndef _ASM_THREAD_INFO_H
  #define _ASM_THREAD_INFO_H
  
 -#ifdef __KERNEL__
-+/* Fix bad upstream jojo in XEmacs; bug #82690. Temporary fix only warning until upstream fixes
-+   things... */
-+#ifdef register
-+#undef register
-+#endif
  
  #include <linux/config.h>
  #include <linux/compiler.h>
@@ -2540,3 +2549,14 @@ diff -ur linux-2.6.11/include/asm-ia64/thread_info.h linux-2.6.11-gentoo/include
  #define ELF_ARCH	EM_CRIS
  
  #define USE_ELF_CORE_DUMP
+--- linux-2.6.11/include/linux/i2c-dev.h	2005-04-28 22:30:29.000000000 +0100
++++ linux-2.6.11-gentoo/include/linux/i2c-dev.h	2005-05-24 14:48:01.000000000 +0100
+@@ -24,6 +24,8 @@
+ #ifndef _LINUX_I2C_DEV_H
+ #define _LINUX_I2C_DEV_H
+ 
++#include <linux/compiler.h>
++#include <linux/i2c.h>
+ #include <linux/types.h>
+ 
+ /* Some IOCTL commands are defined in <linux/i2c.h> */