Fix #84353, #89387.

Package-Manager: portage-2.0.51.19

3 files changed, 48 insertions, 5 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index c18bd929ffca..3370b3682001 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.115 2005/04/18 22:00:04 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.116 2005/04/19 23:34:45 plasmaroo Exp $
+
+  20 Apr 2005; <plasmaroo@gentoo.org>
+  files/linux-headers-2.6.11-appCompat.patch:
+  Fix #84353, #89387.
 
   18 Apr 2005; <plasmaroo@gentoo.org>
   files/linux-headers-2.6.11-appCompat.patch:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 5c763c76d102..7d86f96a2371 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 d9e87ea8545e08ce50154c79196be47e ChangeLog 24953
+MD5 24c2104f56338cde6d2dec631d302c40 ChangeLog 25060
 MD5 b3099588e509bea5bf8c12f2b3882f58 linux-headers-2.2.26.ebuild 2509
 MD5 c2c4eec01b604c30d0826e73ac02cac4 linux-headers-2.4.23.ebuild 3482
 MD5 e9a0370039c1d4fe1b0f7c0be1eef478 linux-headers-2.6.11.ebuild 1522
@@ -18,7 +18,7 @@ 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 f8840ddd764c72ccd658cc168a621ca5 files/linux-headers-2.6.11-appCompat.patch 73301
+MD5 f2325e7a77a6c1e7bdbef48ea85be4ee files/linux-headers-2.6.11-appCompat.patch 74767
 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
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 6db0ceb1c4d7..f500f50f5237 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
@@ -2232,6 +2232,45 @@ diff -urp linux-2.6.10/include/linux/if_fddi.h linux-2.6.10-gentoo/include/linux
  /*
   *  Define max and min legal sizes.  The frame sizes do not include
   *  4 byte FCS/CRC (frame check sequence).
+diff -urp linux-2.6.11/include/linux/keyboard.h linux-2.6.11-gentoo/include/linux/keyboard.h
+--- linux-2.6.11/include/linux/keyboard.h	2004-11-20 16:54:35.000000000 +0000
++++ linux-2.6.11-gentoo/include/linux/keyboard.h	2005-02-12 19:19:51.244852928 +0000
+@@ -1,6 +1,16 @@
+ #ifndef __LINUX_KEYBOARD_H
+ #define __LINUX_KEYBOARD_H
+ 
++#ifndef __le64
++#ifdef _LINUX_TYPES_H
++#undef _LINUX_TYPES_H
++#warning Gentoo Linux Headers Warning: GNU Libc Linux Headers Override Detected.
++#warning Gentoo Linux Headers Warning: This is bad. Removing override and continuing.
++#warning Gentoo Linux Headers Warning: If your compilation dies here, mention this when
++#warning Gentoo Linux Headers Warning: filing a bug!
++#include <linux/types.h>
++#endif
++#endif
+ #include <linux/wait.h>
+ 
+ #define KG_SHIFT	0
+diff -urp linux-2.6.11/include/asm-parisc/thread_info.h linux-2.6.11-gentoo/include/asm-parisc/thread_info.h
+--- linux-2.6.11/include/asm-parisc/thread_info.h	2004-11-20 16:54:35.000000000 +0000
++++ linux-2.6.11-gentoo/include/asm-parisc/thread_info.h	2005-02-12 19:19:51.244852928 +0000
+@@ -1,8 +1,6 @@
+ #ifndef _ASM_PARISC_THREAD_INFO_H
+ #define _ASM_PARISC_THREAD_INFO_H
+ 
+-#ifdef __KERNEL__
+-
+ #ifndef __ASSEMBLY__
+ #include <asm/processor.h>
+ 
+@@ -75,6 +73,4 @@
+ #define _TIF_USER_WORK_MASK     (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | \
+                                  _TIF_NEED_RESCHED)
+ 
+-#endif /* __KERNEL__ */
+-
+ #endif /* _ASM_PARISC_THREAD_INFO_H */
 --- linux-2.6.10/include/asm-sparc/processor.h	2004-12-11 15:49:24.522603912 -0800
 +++ linux-2.6.10-gentoo/include/asm-sparc/processor.h	2004-12-11 15:49:18.865463928 -0800
 @@ -44,11 +44,13 @@
@@ -2338,8 +2377,8 @@ 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
+--- linux-2.6.11/include/linux/byteorder/little_endian.h.84353	2005-03-07 01:19:49.000000000 +0100
++++ linux-2.6.11-gentoo/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))