Added an ebuild for 2.4.28 and cleaned out some older versions no longer needed.

(Portage version: 2.0.51-r15)

21 files changed, 46 insertions, 1365 deletions

diff --git a/sys-kernel/mips-headers/ChangeLog b/sys-kernel/mips-headers/ChangeLog
index cbf36d167d37..61f6fc897944 100644
--- a/sys-kernel/mips-headers/ChangeLog
+++ b/sys-kernel/mips-headers/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-kernel/mips-headers
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.24 2004/10/02 05:49:51 kumba Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/ChangeLog,v 1.25 2005/02/06 04:48:42 kumba Exp $
+
+*mips-headers-2.4.28 (05 Feb 2005)
+
+  05 Feb 2005; Joshua Kinard <kumba@gentoo.org>
+  -files/mips-headers-2.6.0-fb.patch,
+  -files/mips-headers-2.6.0-sysctl_h-compat.patch,
+  -files/mips-headers-2.6.3-strict-ansi-fix.patch,
+  -files/mips-headers-2.6.6-appCompat.patch,
+  -files/mips-headers-2.6.6-spaces_h-kernel.patch,
+  -files/mips-patches-gcc-makefile-fix.patch, -mips-headers-2.4.21-r1.ebuild,
+  -mips-headers-2.4.21-r2.ebuild, mips-headers-2.4.22-r1.ebuild,
+  mips-headers-2.4.23.ebuild, -mips-headers-2.4.25.ebuild,
+  +mips-headers-2.4.28.ebuild, -mips-headers-2.6.6-r1.ebuild:
+  Added an ebuild for 2.4.28 and cleaned out some older versions no longer
+  needed.
 
   01 Oct 2004; Joshua Kinard <kumba@gentoo.org> mips-headers-2.6.8.1.ebuild:
   Wrong keyword, move to ~mips.
diff --git a/sys-kernel/mips-headers/Manifest b/sys-kernel/mips-headers/Manifest
index b7f372d8a06f..46ff20c769de 100644
--- a/sys-kernel/mips-headers/Manifest
+++ b/sys-kernel/mips-headers/Manifest
@@ -1,26 +1,14 @@
-MD5 5ef253665dd24dd60bb482acc3f6d4e0 ChangeLog 5352
+MD5 8f14a993537506698f507c6e8d5d6cf0 ChangeLog 6022
 MD5 a79e966514d7aa3b003e25a207766f97 metadata.xml 417
-MD5 bf75617f93eb72af2eadd739b7081093 mips-headers-2.4.21-r1.ebuild 1358
-MD5 10102cf5e4f84e50e4ee08f691607937 mips-headers-2.4.21-r2.ebuild 1260
-MD5 a01d6ad764679bbe9ed3473097d122ae mips-headers-2.4.21-r3.ebuild 1443
-MD5 9cab0c6fa541f55bca68b82dc516b1c1 mips-headers-2.4.22-r1.ebuild 1915
-MD5 155e3f184046841bd9d49c9986ec52c1 mips-headers-2.4.23.ebuild 1717
-MD5 cbe74c305e6226ff772c4d92cba7046a mips-headers-2.4.25.ebuild 1717
-MD5 c2c93c8e48a0000556f7199c02f47578 mips-headers-2.6.6-r1.ebuild 3674
-MD5 f718a02f8a16c040557f2cb8eba3a848 mips-headers-2.6.8.1.ebuild 4912
+MD5 0f90089ebd1df8fa39db0532f7205ec9 mips-headers-2.4.21-r3.ebuild 1443
+MD5 8dbda0da70b3949bafa985767c066840 mips-headers-2.4.22-r1.ebuild 1897
+MD5 4f6feda884c67f4e6d73b121baa3517f mips-headers-2.4.23.ebuild 1708
+MD5 d8a8b7d1a6f1a72f91c3c8fb2664f904 mips-headers-2.6.8.1.ebuild 4912
+MD5 270c2d79292bda6894dc5f54a6bcb18d mips-headers-2.4.28.ebuild 1722
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 747353be86040c7e4c49b553f3467b7c files/digest-mips-headers-2.4.21-r1 160
-MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r2 145
+MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
 MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-headers-2.4.21-r3 145
 MD5 98354eb02ecc6b8d0463a68eba698a85 files/digest-mips-headers-2.4.22-r1 144
 MD5 b7b1f3cc3d41e54d5a23057bc0c83fb5 files/digest-mips-headers-2.4.23 144
-MD5 8562fc546fe46ec1c6a192ad3d61532d files/digest-mips-headers-2.4.25 143
-MD5 47f57c5b40dfb04d3bdbc16989a2d151 files/digest-mips-headers-2.6.6-r1 142
-MD5 8a065c0dc3b8fac8747de35f1af75a2c files/mips-headers-2.6.0-fb.patch 386
-MD5 a73786f0b9dda7e9ebacb91a192384f9 files/mips-headers-2.6.0-sysctl_h-compat.patch 352
-MD5 598136365858338b26557b7587c6725f files/mips-headers-2.6.3-strict-ansi-fix.patch 4166
-MD5 cb8280b584baf48a15e342e96099eeb9 files/mips-headers-2.6.6-appCompat.patch 26265
-MD5 a9f74b71da391afa8399922824c8fc72 files/mips-headers-2.6.6-spaces_h-kernel.patch 498
-MD5 054c3c8e9c8804a13c79d01ec52793ed files/mips-patches-gcc-makefile-fix.patch 915
-MD5 3ec0bd6b14384ef98b64cb997030f3cc files/mipscvs-2.4.22-20030825-makefile-fix.patch 1344
 MD5 6b509f4a052aeb7f0d2f5e13aab68896 files/digest-mips-headers-2.6.8.1 304
+MD5 8f5959efd5bf8e2a54ccaf533cec3daf files/digest-mips-headers-2.4.28 144
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21-r1 b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21-r1
deleted file mode 100644
index 4abcc4f1fb31..000000000000
--- a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 24fd546e8cdd7b332d442111178be09b linux-mips-2.4.21-20030705.tar.bz2 28403236
-MD5 212d82e9deaf51ae8c319d2d11e3a271 mips-patches-2.4.21-20030705.tar.bz2 1255
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21-r2 b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21-r2
deleted file mode 100644
index 9e16838f5d98..000000000000
--- a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.21-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 aea17fa0a6fc0bef9847b8713d4c3923 mipscvs-2.4.21-20030803.diff.bz2 1011871
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.25 b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.25
deleted file mode 100644
index 48974bc96022..000000000000
--- a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.25
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
-MD5 10b3bc2866a95e483f19093c980d9786 mipscvs-2.4.25-20040222.diff.bz2 89680
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.4.28 b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.28
new file mode 100644
index 000000000000..ad79e4abd4bc
--- /dev/null
+++ b/sys-kernel/mips-headers/files/digest-mips-headers-2.4.28
@@ -0,0 +1,2 @@
+MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
+MD5 e5c0438a7e9c0677d6b8432e84bbb844 mipscvs-2.4.28-20050105.diff.bz2 246203
diff --git a/sys-kernel/mips-headers/files/digest-mips-headers-2.6.6-r1 b/sys-kernel/mips-headers/files/digest-mips-headers-2.6.6-r1
deleted file mode 100644
index 88daf62c7354..000000000000
--- a/sys-kernel/mips-headers/files/digest-mips-headers-2.6.6-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
-MD5 28229f4685c0109735f7eceb3ea78f31 mipscvs-2.6.6-20040604.diff.bz2 418820
diff --git a/sys-kernel/mips-headers/files/mips-headers-2.6.0-fb.patch b/sys-kernel/mips-headers/files/mips-headers-2.6.0-fb.patch
deleted file mode 100644
index 398240a6390e..000000000000
--- a/sys-kernel/mips-headers/files/mips-headers-2.6.0-fb.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur linux-2.6.0-orig/include/linux/fb.h linux-2.6.0/include/linux/fb.h
---- linux-2.6.0-orig/include/linux/fb.h	2003-12-18 03:58:39.000000000 +0100
-+++ linux-2.6.0/include/linux/fb.h	2004-01-22 19:12:10.765346576 +0100
-@@ -5,6 +5,7 @@
- #include <linux/workqueue.h>
- #include <asm/types.h>
- #include <asm/io.h>
-+#include <asm/atomic.h>
- 
- /* Definitions of frame buffers						*/
- 
diff --git a/sys-kernel/mips-headers/files/mips-headers-2.6.0-sysctl_h-compat.patch b/sys-kernel/mips-headers/files/mips-headers-2.6.0-sysctl_h-compat.patch
deleted file mode 100644
index 14b248e4f314..000000000000
--- a/sys-kernel/mips-headers/files/mips-headers-2.6.0-sysctl_h-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 1/include/linux/sysctl.h	2003-05-18 22:12:39.000000000 +0200
-+++ 2/include/linux/sysctl.h	2003-05-18 22:13:58.000000000 +0200
-@@ -35,6 +35,10 @@
- 				   the largest acceptable value for the nlen
- 				   member of a struct __sysctl_args to have? */
- 
-+#ifndef __user
-+#define __user
-+#endif
-+
- struct __sysctl_args {
- 	int __user *name;
- 	int nlen;
diff --git a/sys-kernel/mips-headers/files/mips-headers-2.6.3-strict-ansi-fix.patch b/sys-kernel/mips-headers/files/mips-headers-2.6.3-strict-ansi-fix.patch
deleted file mode 100644
index bfcd7269c1d6..000000000000
--- a/sys-kernel/mips-headers/files/mips-headers-2.6.3-strict-ansi-fix.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- linux-2.6.0/include/asm-i386/byteorder.h	2003-07-10 21:11:31.000000000 +0100
-+++ linux-2.6.0/include/asm-i386/byteorder.h	2003-12-26 22:58:17.000000000 +0000
-@@ -1,6 +1,8 @@
- #ifndef _I386_BYTEORDER_H
- #define _I386_BYTEORDER_H
- 
-+#define __attribute_const__	__attribute__((__const__))
-+
- #include <asm/types.h>
- #include <linux/compiler.h>
- 
-@@ -43,13 +43,13 @@
- 	} v;
- 	v.u = val;
- #ifdef CONFIG_X86_BSWAP
--	asm("bswapl %0 ; bswapl %1 ; xchgl %0,%1" 
-+	__asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1" 
- 	    : "=r" (v.s.a), "=r" (v.s.b) 
- 	    : "0" (v.s.a), "1" (v.s.b)); 
- #else
--   v.s.a = ___arch__swab32(v.s.a); 
-+	v.s.a = ___arch__swab32(v.s.a); 
- 	v.s.b = ___arch__swab32(v.s.b); 
--	asm("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b));
-+	__asm__("xchgl %0,%1" : "=r" (v.s.a), "=r" (v.s.b) : "0" (v.s.a), "1" (v.s.b));
- #endif
- 	return v.u;	
- } 
---- linux-2.6.0/include/asm-i386/types.h	2003-07-10 21:11:00.000000000 +0100
-+++ linux-2.6.0/include/asm-i386/types.h	2003-12-26 23:09:38.000000000 +0000
-@@ -19,10 +19,14 @@
- typedef __signed__ int __s32;
- typedef unsigned int __u32;
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--typedef __signed__ long long __s64;
--typedef unsigned long long __u64;
--#endif
-+#ifndef __GNUC__
-+# ifndef __extension__
-+#  define __extension__
-+# endif /* __extension__ */
-+#endif /* __GNUC__ */
-+
-+__extension__ typedef __signed__ long long __s64;
-+__extension__ typedef unsigned long long __u64;
- 
- #endif /* __ASSEMBLY__ */
- 
---- linux-2.6.3/include/linux/byteorder/swab.h	2004-02-20 00:20:05.000000000 +0000
-+++ linux-2.6.3/include/linux/byteorder/swab.h	2004-02-22 16:47:24.000000000 +0000
-@@ -15,6 +15,7 @@
-  *
-  */
- 
-+#define __attribute_const__	__attribute__((__const__))
- #include <linux/compiler.h>
- 
- /* casts are necessary for constants, because we never know how for sure
---- linux-2.6.3/include/asm-x86_64/byteorder.h	2004-02-17 19:58:49.000000000 -0800
-+++ linux-2.6.3/include/asm-x86_64/byteorder.h	2004-02-28 18:49:20.000000000 -0800
-@@ -1,6 +1,8 @@
- #ifndef _X86_64_BYTEORDER_H
- #define _X86_64_BYTEORDER_H
- 
-+#define __attribute_const__	__attribute__((__const__))
-+
- #include <asm/types.h>
- #include <linux/compiler.h>
- 
---- linux-2.6.3/include/asm-x86_64/semaphore.h	2004-02-17 19:57:11.000000000 -0800
-+++ linux-2.6.3/include/asm-x86_64/semaphore.h	2004-02-28 18:49:20.000000000 -0800
-@@ -3,8 +3,6 @@
- 
- #include <linux/linkage.h>
- 
--#ifdef __KERNEL__
--
- /*
-  * SMP- and interrupt-safe semaphores..
-  *
-@@ -215,5 +213,4 @@
- 		:"D" (sem)
- 		:"memory");
- }
--#endif /* __KERNEL__ */
- #endif
---- linux-2.6.3/include/asm-x86_64/signal.h	2004-02-17 19:57:12.000000000 -0800
-+++ linux-2.6.3/include/asm-x86_64/signal.h	2004-02-28 18:49:20.000000000 -0800
-@@ -32,7 +32,9 @@
- /* Here we must cater to libcs that poke about in kernel headers.  */
- 
- #define NSIG		32
-+#ifndef __sigset_t_defined
- typedef unsigned long sigset_t;
-+#endif
- 
- #endif /* __KERNEL__ */
- #endif
-@@ -142,22 +144,26 @@
- #define SIG_IGN	((__sighandler_t)1)	/* ignore signal */
- #define SIG_ERR	((__sighandler_t)-1)	/* error return from signal */
- 
-+#ifndef _SIGNAL_H			/* added by KMO */
- struct sigaction {
- 	__sighandler_t sa_handler;
- 	unsigned long sa_flags;
- 	void (*sa_restorer)(void);
- 	sigset_t sa_mask;		/* mask last for extensibility */
- };
-+#endif					/* added by KMO */
- 
- struct k_sigaction {
- 	struct sigaction sa;
- };
- 
-+#ifndef _SIGNAL_H			/* added by KMO */
- typedef struct sigaltstack {
- 	void *ss_sp;
- 	int ss_flags;
- 	size_t ss_size;
- } stack_t;
-+#endif					/* added by KMO */
- 
- #ifdef __KERNEL__
- #include <asm/sigcontext.h>
---- linux-2.6.3/include/asm-x86_64/types.h	2004-02-17 19:59:16.000000000 -0800
-+++ linux-2.6.3/include/asm-x86_64/types.h	2004-02-28 18:49:21.000000000 -0800
-@@ -19,8 +19,14 @@
- typedef __signed__ int __s32;
- typedef unsigned int __u32;
- 
--typedef __signed__ long long __s64;
--typedef unsigned long long  __u64;
-+#ifndef __GNUC__
-+# ifndef __extension__
-+#  define __extension__
-+# endif /* __extension__ */
-+#endif /* __GNUC__ */
-+
-+__extension__ typedef __signed__ long long __s64;
-+__extension__ typedef unsigned long long  __u64;
- 
- #endif /* __ASSEMBLY__ */
- 
diff --git a/sys-kernel/mips-headers/files/mips-headers-2.6.6-appCompat.patch b/sys-kernel/mips-headers/files/mips-headers-2.6.6-appCompat.patch
deleted file mode 100644
index 85b8947455eb..000000000000
--- a/sys-kernel/mips-headers/files/mips-headers-2.6.6-appCompat.patch
+++ /dev/null
@@ -1,883 +0,0 @@
-Authors: Tim Yamin <plasmaroo@gentoo.org>
-         Mike Frysinger <vapier@gentoo.org>
-         Martin Schlemmer <azarah@gentoo.org>
-
-This patch neatens up the 2.6.0 headers for user-space usage and allows backward
-compatibility on a variety of applications which are designed for 2.4 headers.
-
-diff -ur linux-2.6.0/include/linux/bitmap.h linux-2.6.0/include/linux.gentoo/bitmap.h
---- linux-2.6.0/include/linux/bitmap.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/bitmap.h	2003-12-27 19:19:31.000000000 +0000
-@@ -1,6 +1,7 @@
- #ifndef __LINUX_BITMAP_H
- #define __LINUX_BITMAP_H
- 
-+#ifdef __KERNEL__
- #ifndef __ASSEMBLY__
- 
- #include <linux/config.h>
-@@ -155,5 +156,5 @@
- #endif
- 
- #endif /* __ASSEMBLY__ */
--
-+#endif /* __KERNEL__ */
- #endif /* __LINUX_BITMAP_H */
-diff -ur linux-2.6.0/include/linux/buffer_head.h linux-2.6.0/include/linux.gentoo/buffer_head.h
---- linux-2.6.0/include/linux/buffer_head.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/buffer_head.h	2003-12-27 19:19:31.000000000 +0000
-@@ -34,6 +34,8 @@
- 
- #define MAX_BUF_PER_PAGE (PAGE_CACHE_SIZE / 512)
- 
-+#ifdef __KERNEL__
-+
- struct page;
- struct buffer_head;
- struct address_space;
-@@ -283,6 +285,8 @@
- 		__wait_on_buffer(bh);
- }
- 
-+#endif /* __KERNEL__ */
-+
- static inline void lock_buffer(struct buffer_head *bh)
- {
- 	while (test_set_buffer_locked(bh))
-diff -ur linux-2.6.0/include/linux/compiler-gcc2.h linux-2.6.0/include/linux.gentoo/compiler-gcc2.h
---- linux-2.6.0/include/linux/compiler-gcc2.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/compiler-gcc2.h	2003-12-27 19:19:31.000000000 +0000
-@@ -12,7 +12,9 @@
- # define __builtin_expect(x, expected_value) (x)
- #endif
- 
-+#ifndef __attribute_used__
- #define __attribute_used__	__attribute__((__unused__))
-+#endif
- 
- /*
-  * The attribute `pure' is not implemented in GCC versions earlier
-diff -ur linux-2.6.1/include/linux/cpumask.h linux-2.6.1/include/linux.gentoo/cpumask.h
---- linux-2.6.1/include/linux/cpumask.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.1/include/linux.gentoo/cpumask.h	2003-12-27 19:19:31.000000000 +0000
-@@ -1,6 +1,8 @@
- #ifndef __LINUX_CPUMASK_H
- #define __LINUX_CPUMASK_H
- 
-+#ifdef __KERNEL__
-+
- #include <linux/threads.h>
- #include <asm/cpumask.h>
- #include <asm/bug.h>
-@@ -68,4 +70,5 @@
- 		cpu < NR_CPUS;						\
- 		cpu = next_online_cpu(cpu,map))
- 
-+#endif /* __KERNEL__ */
- #endif /* __LINUX_CPUMASK_H */
-diff -ur linux-2.6.0/include/linux/ext2_fs_sb.h linux-2.6.0/include/linux.gentoo/ext2_fs_sb.h
---- linux-2.6.0/include/linux/ext2_fs_sb.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/ext2_fs_sb.h	2003-12-27 19:19:31.000000000 +0000
-@@ -46,9 +46,9 @@
- 	int s_inode_size;
- 	int s_first_ino;
- 	spinlock_t s_next_gen_lock;
--	u32 s_next_generation;
-+	__u32 s_next_generation;
- 	unsigned long s_dir_count;
--	u8 *s_debts;
-+	__u8 *s_debts;
- 	struct percpu_counter s_freeblocks_counter;
- 	struct percpu_counter s_freeinodes_counter;
- 	struct percpu_counter s_dirs_counter;
-diff -ur linux-2.6.0/include/linux/list.h linux-2.6.0/include/linux.gentoo/list.h
---- linux-2.6.0/include/linux/list.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/list.h	2003-12-27 19:19:31.000000000 +0000
-@@ -584,7 +584,6 @@
- 	     pos && ({ n = pos->next; 1; }) && 				 \
- 		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
- 	     pos = n)
--#else
--#warning "don't include kernel headers in userspace"
-+
- #endif /* __KERNEL__ */
- #endif
-diff -ur linux-2.6.0/include/linux/mod_devicetable.h linux-2.6.0/include/linux.gentoo/mod_devicetable.h
---- linux-2.6.0/include/linux/mod_devicetable.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/mod_devicetable.h	2003-12-27 19:19:31.000000000 +0000
-@@ -10,7 +10,6 @@
- #ifdef __KERNEL__
- #include <linux/types.h>
- typedef unsigned long kernel_ulong_t;
--#endif
- 
- #define PCI_ANY_ID (~0)
- 
-@@ -147,5 +146,5 @@
- #define CCW_DEVICE_ID_MATCH_DEVICE_TYPE		0x04
- #define CCW_DEVICE_ID_MATCH_DEVICE_MODEL	0x08
- 
--
-+#endif /* __KERNEL__ */
- #endif /* LINUX_MOD_DEVICETABLE_H */
-diff -ur linux-2.6.6/include/linux/radix-tree.h linux-2.6.6/include/linux.gentoo/radix-tree.h
---- linux-2.6.6/include/linux/radix-tree.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.6/include/linux.gentoo/radix-tree.h	2003-12-27 19:19:31.000000000 +0000
-@@ -44,6 +44,8 @@
- 	(root)->rnode = NULL;						\
- } while (0)
- 
-+#ifdef __KERNEL__
-+
- int radix_tree_insert(struct radix_tree_root *, unsigned long, void *);
- void *radix_tree_lookup(struct radix_tree_root *, unsigned long);
- void *radix_tree_delete(struct radix_tree_root *, unsigned long);
-@@ -68,4 +70,5 @@
- 	preempt_enable();
- }
- 
-+#endif /* __KERNEL__ */
- #endif /* _LINUX_RADIX_TREE_H */
-diff -ur linux-2.6.0/include/linux/smp.h linux-2.6.0/include/linux.gentoo/smp.h
---- linux-2.6.0/include/linux/smp.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/smp.h	2003-12-27 19:19:31.000000000 +0000
-@@ -6,6 +6,8 @@
-  *		Alan Cox. <alan@redhat.com>
-  */
- 
-+
-+#ifdef __KERNEL__
- #include <linux/config.h>
- 
- #ifdef CONFIG_SMP
-@@ -112,4 +114,5 @@
- #define put_cpu()		preempt_enable()
- #define put_cpu_no_resched()	preempt_enable_no_resched()
- 
-+#endif /* __KERNEL__ */
- #endif /* __LINUX_SMP_H */
-diff -ur linux-2.6.0/include/linux/spinlock.h linux-2.6.0/include/linux.gentoo/spinlock.h
---- linux-2.6.0/include/linux/spinlock.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/spinlock.h	2003-12-27 19:19:31.000000000 +0000
-@@ -183,6 +183,7 @@
- #define _raw_write_trylock(lock) ({ (void)(lock); (1); })
- 
- #endif /* !SMP */
-+#ifdef __KERNEL__
- 
- /*
-  * Define the various spin_lock and rw_lock methods.  Note we define these
-@@ -465,4 +466,5 @@
- #endif
- }
- 
-+#endif /* __KERNEL__ */
- #endif /* __LINUX_SPINLOCK_H */
-diff -ur linux-2.6.0/include/linux/time.h linux-2.6.0/include/linux.gentoo/time.h
---- linux-2.6.0/include/linux/time.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/time.h	2003-12-27 19:19:31.000000000 +0000
-@@ -4,24 +4,31 @@
- #include <asm/param.h>
- #include <linux/types.h>
- 
-+#ifndef _SYS_TIME_H
- #ifndef _STRUCT_TIMESPEC
-+#ifndef __timespec_defined
- #define _STRUCT_TIMESPEC
- struct timespec {
- 	time_t	tv_sec;		/* seconds */
- 	long	tv_nsec;	/* nanoseconds */
- };
-+#endif /* __timespec_defined */
- #endif /* _STRUCT_TIMESPEC */
- 
-+#ifndef _STRUCT_TIMEVAL
- struct timeval {
- 	time_t		tv_sec;		/* seconds */
- 	suseconds_t	tv_usec;	/* microseconds */
- };
-+#endif /* _STRUCT_TIMEVAL */
- 
- struct timezone {
- 	int	tz_minuteswest;	/* minutes west of Greenwich */
- 	int	tz_dsttime;	/* type of dst correction */
- };
- 
-+#endif /* _SYS_TIME_H */
-+
- #ifdef __KERNEL__
- 
- #include <linux/spinlock.h>
-@@ -281,6 +281,8 @@
-  * machines were long is 32-bit! (However, as time_t is signed, we
-  * will already get problems at other places on 2038-01-19 03:14:08)
-  */
-+
-+#ifndef _TIME_H
- static inline unsigned long
- mktime (unsigned int year, unsigned int mon,
- 	unsigned int day, unsigned int hour,
-@@ -298,6 +300,7 @@
- 	  )*60 + min /* now have minutes */
- 	)*60 + sec; /* finally seconds */
- }
-+#endif
- 
- extern struct timespec xtime;
- extern struct timespec wall_to_monotonic;
-@@ -351,15 +358,19 @@
- #define	ITIMER_VIRTUAL	1
- #define	ITIMER_PROF	2
- 
-+#ifndef _TIME_H
- struct  itimerspec {
-         struct  timespec it_interval;    /* timer period */
-         struct  timespec it_value;       /* timer expiration */
- };
-+#endif /* _TIME_H */
- 
-+#ifndef _SYS_TIME_H
- struct	itimerval {
- 	struct	timeval it_interval;	/* timer interval */
- 	struct	timeval it_value;	/* current value */
- };
-+#endif /* _SYS_TIME_H */
- 
- 
- /*
-diff -ur linux-2.6.0/include/linux/workqueue.h linux-2.6.0/include/linux.gentoo/workqueue.h
---- linux-2.6.0/include/linux/workqueue.h	2003-12-27 19:22:38.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/workqueue.h	2003-12-27 19:19:31.000000000 +0000
-@@ -5,6 +5,8 @@
- #ifndef _LINUX_WORKQUEUE_H
- #define _LINUX_WORKQUEUE_H
- 
-+#ifdef __KERNEL__
-+
- #include <linux/timer.h>
- #include <linux/linkage.h>
- 
-@@ -73,5 +75,7 @@
- 	return del_timer_sync(&work->timer);
- }
- 
-+#endif /* __KERNEL__ */
-+
- #endif
- 
-diff -ur linux-2.6.0/include/asm-i386/mpspec.h linux-2.6.0/include/asm-i386/mpspec.h
---- linux-2.6.0/include/asm-i386/mpspec.h	2004-01-19 20:18:36.000000000 +0000
-+++ linux-2.6.0/include/asm-i386/mpspec.h	2004-01-19 20:01:11.000000000 +0000
-@@ -3,7 +3,7 @@
- 
- #include <linux/cpumask.h>
- #include <asm/mpspec_def.h>
--#include <mach_mpspec.h>
-+#include <asm/mach-generic/mach_mpspec.h>
- 
- extern int mp_bus_id_to_type [MAX_MP_BUSSES];
- extern int mp_bus_id_to_node [MAX_MP_BUSSES];
-diff -ur linux-2.6.0/include/asm-i386/processor.h linux-2.6.0/include/asm-i386/processor.h
---- linux-2.6.0/include/asm-i386/processor.h	2004-01-19 20:18:36.000000000 +0000
-+++ linux-2.6.0/include/asm-i386/processor.h	2004-01-19 20:01:11.000000000 +0000
-@@ -8,7 +8,9 @@
- #define __ASM_I386_PROCESSOR_H
- 
- #include <asm/vm86.h>
-+#ifdef __KERNEL__
- #include <asm/math_emu.h>
-+#endif
- #include <asm/segment.h>
- #include <asm/page.h>
- #include <asm/types.h>
-diff -ur linux-2.6.0/include/asm-i386/semaphore.h linux-2.6.0/include/asm-i386/semaphore.h
---- linux-2.6.0/include/asm-i386/semaphore.h	2004-01-19 20:18:36.000000000 +0000
-+++ linux-2.6.0/include/asm-i386/semaphore.h	2004-01-19 20:01:11.000000000 +0000
-@@ -3,8 +3,6 @@
- 
- #include <linux/linkage.h>
- 
--#ifdef __KERNEL__
--
- /*
-  * SMP- and interrupt-safe semaphores..
-  *
-@@ -214,4 +212,3 @@
- }
- 
- #endif
--#endif
-diff -ur linux-2.6.0/include/asm-i386/signal.h linux-2.6.0/include/asm-i386/signal.h
---- linux-2.6.0/include/asm-i386/signal.h	2004-01-19 20:18:36.000000000 +0000
-+++ linux-2.6.0/include/asm-i386/signal.h	2004-01-19 20:01:11.000000000 +0000
-@@ -26,7 +26,9 @@
- /* Here we must cater to libcs that poke about in kernel headers.  */
- 
- #define NSIG		32
-+#ifndef __sigset_t_defined
- typedef unsigned long sigset_t;
-+#endif
- 
- #endif /* __KERNEL__ */
- 
-@@ -155,6 +157,7 @@
- #else
- /* Here we must cater to libcs that poke about in kernel headers.  */
- 
-+#ifndef _SIGNAL_H
- struct sigaction {
- 	union {
- 	  __sighandler_t _sa_handler;
-@@ -164,17 +167,20 @@
- 	unsigned long sa_flags;
- 	void (*sa_restorer)(void);
- };
-+#endif
- 
- #define sa_handler	_u._sa_handler
- #define sa_sigaction	_u._sa_sigaction
- 
- #endif /* __KERNEL__ */
- 
-+#ifndef _SIGNAL_H
- typedef struct sigaltstack {
- 	void *ss_sp;
- 	int ss_flags;
- 	size_t ss_size;
- } stack_t;
-+#endif
- 
- #ifdef __KERNEL__
- #include <asm/sigcontext.h>
-diff -ur linux-2.6.0/include/asm-i386/smp.h linux-2.6.0/include/asm-i386/smp.h
---- linux-2.6.0/include/asm-i386/smp.h	2004-01-19 20:18:36.000000000 +0000
-+++ linux-2.6.0/include/asm-i386/smp.h	2004-01-19 20:01:11.000000000 +0000
-@@ -70,7 +70,7 @@
- #ifdef APIC_DEFINITION
- extern int hard_smp_processor_id(void);
- #else
--#include <mach_apicdef.h>
-+#include <asm/mach-generic/mach_apicdef.h>
- static inline int hard_smp_processor_id(void)
- {
- 	/* we don't want to mark this access volatile - bad code generation */
-diff -ur linux-2.6.0/include/linux/types.h linux-2.6.0/include/linux.gentoo/types.h
---- linux-2.6.0/include/linux/types.h	2004-01-19 20:18:36.000000000 +0000
-+++ linux-2.6.0/include/linux.gentoo/types.h	2004-01-19 20:01:11.000000000 +0000
-@@ -19,12 +19,24 @@
- 
- typedef __u32 __kernel_dev_t;
- 
-+#ifndef _SYS_SELECT_H
- typedef __kernel_fd_set		fd_set;
-+#endif
-+#ifndef __dev_t_defined
- typedef __kernel_dev_t		dev_t;
-+#endif
-+#ifndef __ino_t_defined
- typedef __kernel_ino_t		ino_t;
-+#endif
-+#ifndef __mode_t_defined
- typedef __kernel_mode_t		mode_t;
-+#endif
-+#ifndef __nlink_t_defined
- typedef __kernel_nlink_t	nlink_t;
-+#endif
-+#ifndef __off_t_defined
- typedef __kernel_off_t		off_t;
-+#endif
- typedef __kernel_pid_t		pid_t;
- typedef __kernel_daddr_t	daddr_t;
- typedef __kernel_key_t		key_t;
-@@ -34,7 +46,9 @@
- 
- #ifdef __KERNEL__
- typedef __kernel_uid32_t	uid_t;
-+#define __uid_t_defined
- typedef __kernel_gid32_t	gid_t;
-+#define __gid_t_defined
- typedef __kernel_uid16_t        uid16_t;
- typedef __kernel_gid16_t        gid16_t;
- 
-@@ -49,7 +63,9 @@
-  */
- #else
- typedef __kernel_uid_t		uid_t;
-+#define __uid_t_defined
- typedef __kernel_gid_t		gid_t;
-+#define __gid_t_defined
- #endif /* __KERNEL__ */
- 
- #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-diff -ur linux-2.6.0/include/asm-generic/siginfo.h linux-2.6.0/include/asm-generic/siginfo.h
---- linux-2.6.0/include/asm-generic/siginfo.h	2004-01-19 20:18:36.000000000 +0000
-+++ linux-2.6.0/include/asm-generic/siginfo.h	2004-01-19 20:01:11.000000000 +0000
-@@ -4,10 +4,12 @@
- #include <linux/compiler.h>
- #include <linux/types.h>
- 
-+#ifndef _SIGNAL_H
- typedef union sigval {
- 	int sival_int;
- 	void *sival_ptr;
- } sigval_t;
-+#endif
- 
- /*
-  * This is the size (including padding) of the part of the
-@@ -31,7 +33,7 @@
- #endif
- 
- #ifndef HAVE_ARCH_SIGINFO_T
--
-+#ifndef _SIGNAL_H
- typedef struct siginfo {
- 	int si_signo;
- 	int si_errno;
-@@ -86,7 +88,7 @@
- 		} _sigpoll;
- 	} _sifields;
- } siginfo_t;
--
-+#endif
- #endif
- 
- /*
-@@ -238,7 +240,7 @@
- #endif
- 
- #ifndef HAVE_ARCH_SIGEVENT_T
--
-+#ifndef _SIGNAL_H
- typedef struct sigevent {
- 	sigval_t sigev_value;
- 	int sigev_signo;
-@@ -253,7 +255,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
-@@ -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;
- 
- #if (BITS_PER_LONG < 64)
--u64 get_jiffies_64(void);
-+__u64 get_jiffies_64(void);
- #else
--static inline u64 get_jiffies_64(void)
-+static inline __u64 get_jiffies_64(void)
- {
--	return (u64)jiffies;
-+	return (__u64)jiffies;
- }
- #endif
- 
-diff -ur linux-2.6.0/include/linux/i2c.h linux-2.6.0/include/linux.gentoo/i2c.h
---- linux-2.6.0/include/linux/i2c.h	2004-02-07 13:29:15.099504640 -0500
-+++ linux-2.6.0/include/linux.gentoo/i2c.h	2004-02-07 13:35:53.956869104 -0500
-@@ -28,10 +28,18 @@
- #ifndef _LINUX_I2C_H
- #define _LINUX_I2C_H
- 
--#include <linux/module.h>
--#include <linux/types.h>
-+#ifdef __KERNEL__
-+#	include <linux/module.h>
-+#	include <linux/types.h>
-+#else
-+#	define __KERNEL__
-+#	include <linux/types.h>
-+#	undef __KERNEL__
-+#endif
- #include <linux/i2c-id.h>
-+#ifdef __KERNEL__
- #include <linux/device.h>	/* for struct device */
- #include <asm/semaphore.h>
-+#endif
- 
- /* --- General options ------------------------------------------------	*/
-@@ -109,6 +117,7 @@
-  * events.
-  */
- 
-+#ifdef __KERNEL__
- struct i2c_driver {
- 	struct module *owner;
- 	char name[32];
-@@ -268,6 +277,7 @@
- {
- 	dev_set_drvdata (&dev->dev, data);
- }
-+#endif
- 
- /*flags for the driver struct: */
- #define I2C_DF_NOTIFY	0x01		/* notify on bus (de/a)ttaches 	*/
-@@ -599,11 +609,13 @@
- #define i2c_is_isa_adapter(adapptr) \
-         ((adapptr)->algo->id == I2C_ALGO_ISA)
- 
-+#ifdef __KERNEL__
- /* Tiny delay function used by the i2c bus drivers */
- static inline void i2c_delay(signed long timeout)
- {
- 	set_current_state(TASK_INTERRUPTIBLE);
- 	schedule_timeout(timeout);
- }
-+#endif
- 
- #endif /* _LINUX_I2C_H */
-diff -ur linux-2.6.3/include/linux/usbdevice_fs.h linux-2.6.3/include/linux/usbdevice_fs.h
---- linux-2.6.3/include/linux/usbdevice_fs.h	2004-02-22 16:52:07.000000000 +0000
-+++ linux-2.6.3/include/linux/usbdevice_fs.h	2004-02-22 22:10:45.000000000 +0000
-@@ -31,6 +31,7 @@
- #ifndef _LINUX_USBDEVICE_FS_H
- #define _LINUX_USBDEVICE_FS_H
- 
-+#include <linux/compiler.h>
- #include <linux/types.h>
- 
- /* --------------------------------------------------------------------- */
-
-diff -ur linux-2.6.4/include/asm-i386/ipc.h linux-2.6.4-gentoo/include/asm-i386/ipc.h
---- linux-2.6.4/include/asm-i386/ipc.h	2004-03-13 13:05:04.000026816 +0000
-+++ linux-2.6.4-gentoo/include/asm-i386/ipc.h	2004-03-13 13:11:56.486319368 +0000
-@@ -6,6 +6,8 @@
-  *
-  * See arch/i386/kernel/sys_i386.c for ugly details..
-  */
-+
-+#include <linux/compiler.h>
- struct ipc_kludge {
- 	struct msgbuf __user *msgp;
- 	long msgtyp;
-diff -ur linux-2.6.4/include/linux/compiler-gcc3.h linux-2.6.4-gentoo/include/linux/compiler-gcc3.h
---- linux-2.6.4/include/linux/compiler-gcc3.h	2004-03-13 13:04:57.718981680 +0000
-+++ linux-2.6.4-gentoo/include/linux/compiler-gcc3.h	2004-03-13 13:15:55.937917192 +0000
-@@ -3,6 +3,8 @@
- /* These definitions are for GCC v3.x.  */
- #include <linux/compiler-gcc.h>
- 
-+#ifdef __KERNEL__
-+
- #if __GNUC_MINOR__ >= 1
- # define inline		__inline__ __attribute__((always_inline))
- # define __inline__	__inline__ __attribute__((always_inline))
-@@ -25,3 +27,5 @@
- #if __GNUC_MINOR__ >= 1
- #define  noinline __attribute__((noinline))
- #endif
-+
-+#endif /* __KERNEL__ */
-diff -ur linux-2.6.4/include/linux/mroute.h linux-2.6.4-gentoo/include/linux/mroute.h
---- linux-2.6.4/include/linux/mroute.h	2004-03-13 13:04:54.084534200 +0000
-+++ linux-2.6.4-gentoo/include/linux/mroute.h	2004-03-13 13:14:04.356880088 +0000
-@@ -1,6 +1,7 @@
- #ifndef __LINUX_MROUTE_H
- #define __LINUX_MROUTE_H
- 
-+#include <linux/types.h>
- #include <linux/sockios.h>
- #include <linux/in.h>
- 
-diff -ur linux-2.6.6/include/asm-ppc/signal.h linux-2.6.6-gentoo/include/asm-ppc/signal.h
---- linux-2.6.6/include/asm-ppc/signal.h	2004-06-02 18:30:17.329072696 +0100
-+++ linux-2.6.6-gentoo/include/asm-ppc/signal.h	2004-06-02 18:35:04.093477880 +0100
-@@ -17,9 +17,11 @@
- 
- typedef unsigned long old_sigset_t;		/* at least 32 bits */
- 
-+#ifndef __sigset_t_defined
- typedef struct {
- 	unsigned long sig[_NSIG_WORDS];
- } sigset_t;
-+#endif
- 
- #define SIGHUP		 1
- #define SIGINT		 2
-@@ -125,28 +127,51 @@
- #define SIG_ERR	((__sighandler_t)-1)	/* error return from signal */
- 
- struct old_sigaction {
-+#ifdef __USE_POSIX199309
-+#	ifdef sa_handler
-+#		undef sa_handler
-+#	endif
-+#	ifdef sa_sigaction
-+#		undef sa_sigaction
-+#	endif
-+	union
-+	{
-+		/* Used if SA_SIGINFO is not set.  */
-+			__sighandler_t sa_handler;
-+		/* Used if SA_SIGINFO is set.  */
-+			void (*sa_sigaction) (int, siginfo_t *, void *);
-+	}
-+	__sigaction_handler;
-+#	define sa_handler	__sigaction_handler.sa_handler
-+#	define sa_sigaction	__sigaction_handler.sa_sigaction
-+#else
- 	__sighandler_t sa_handler;
-+#endif
- 	old_sigset_t sa_mask;
- 	unsigned long sa_flags;
- 	void (*sa_restorer)(void);
- };
- 
-+#ifndef _SIGNAL_H
- struct sigaction {
- 	__sighandler_t sa_handler;
- 	unsigned long sa_flags;
- 	void (*sa_restorer)(void);
- 	sigset_t sa_mask;		/* mask last for extensibility */
- };
-+#endif
- 
- struct k_sigaction {
- 	struct sigaction sa;
- };
- 
-+#ifndef _SIGNAL_H
- typedef struct sigaltstack {
- 	void *ss_sp;
- 	int ss_flags;
- 	size_t ss_size;
- } stack_t;
-+#endif
- 
- #ifdef __KERNEL__
- #include <asm/sigcontext.h>
-diff -ur linux-2.6.6/include/asm-x86_64/processor.h linux-2.6.6-gentoo/include/asm-x86_64/processor.h
---- linux-2.6.6/include/asm-x86_64/processor.h	2004-06-02 19:25:24.000000000 +0100
-+++ linux-2.6.6-gentoo/include/asm-x86_64/processor.h	2004-06-02 19:24:31.000000000 +0100
-@@ -189,17 +189,17 @@
- #define INVALID_IO_BITMAP_OFFSET 0x8000
- 
- struct i387_fxsave_struct {
--	u16	cwd;
--	u16	swd;
--	u16	twd;
--	u16	fop;
--	u64	rip;
--	u64	rdp; 
--	u32	mxcsr;
--	u32	mxcsr_mask;
--	u32	st_space[32];	/* 8*16 bytes for each FP-reg = 128 bytes */
--	u32	xmm_space[64];	/* 16*16 bytes for each XMM-reg = 128 bytes */
--	u32	padding[24];
-+	__u16	cwd;
-+	__u16	swd;
-+	__u16	twd;
-+	__u16	fop;
-+	__u64	rip;
-+	__u64	rdp; 
-+	__u32	mxcsr;
-+	__u32	mxcsr_mask;
-+	__u32	st_space[32];	/* 8*16 bytes for each FP-reg = 128 bytes */
-+	__u32	xmm_space[64];	/* 16*16 bytes for each XMM-reg = 128 bytes */
-+	__u32	padding[24];
- } __attribute__ ((aligned (16)));
- 
- union i387_union {
-@@ -207,16 +207,16 @@
- };
- 
- struct tss_struct {
--	u32 reserved1;
--	u64 rsp0;	
--	u64 rsp1;
--	u64 rsp2;
--	u64 reserved2;
--	u64 ist[7];
--	u32 reserved3;
--	u32 reserved4;
--	u16 reserved5;
--	u16 io_bitmap_base;
-+	__u32 reserved1;
-+	__u64 rsp0;	
-+	__u64 rsp1;
-+	__u64 rsp2;
-+	__u64 reserved2;
-+	__u64 ist[7];
-+	__u32 reserved3;
-+	__u32 reserved4;
-+	__u16 reserved5;
-+	__u16 io_bitmap_base;
- 	/*
- 	 * The extra 1 is there because the CPU will access an
- 	 * additional byte beyond the end of the IO permission
-@@ -252,7 +252,7 @@
- 	int		ioperm;
- 	unsigned long	*io_bitmap_ptr;
- /* cached TLS descriptors. */
--	u64 tls_array[GDT_ENTRY_TLS_ENTRIES];
-+	__u64 tls_array[GDT_ENTRY_TLS_ENTRIES];
- };
- 
- #define INIT_THREAD  {}
-diff -ur linux-2.6.6/include/asm-x86_64/system.h linux-2.6.6-gentoo/include/asm-x86_64/system.h
---- linux-2.6.6/include/asm-x86_64/system.h	2004-06-02 19:25:27.000000000 +0100
-+++ linux-2.6.6-gentoo/include/asm-x86_64/system.h	2004-06-02 19:25:17.000000000 +0100
-@@ -5,6 +5,30 @@
- #include <linux/kernel.h>
- #include <asm/segment.h>
- 
-+/*
-+ * Alternative inline assembly with input.
-+ * 
-+ * Pecularities:
-+ * No memory clobber here. 
-+ * Argument numbers start with 1.
-+ * Best is to use constraints that are fixed size (like (%1) ... "r")
-+ * If you use variable sized constraints like "m" or "g" in the 
-+ * replacement maake sure to pad to the worst case length.
-+ */
-+#define alternative_input(oldinstr, newinstr, feature, input)		\
-+	asm volatile ("661:\n\t" oldinstr "\n662:\n"			\
-+		      ".section .altinstructions,\"a\"\n"		\
-+		      "  .align 8\n"					\
-+		      "  .quad 661b\n"            /* label */		\
-+		      "  .quad 663f\n"		  /* new instruction */	\
-+		      "  .byte %c0\n"             /* feature bit */	\
-+		      "  .byte 662b-661b\n"       /* sourcelen */	\
-+		      "  .byte 664f-663f\n"       /* replacementlen */	\
-+		      ".previous\n"					\
-+		      ".section .altinstr_replacement,\"ax\"\n"		\
-+		      "663:\n\t" newinstr "\n664:\n"   /* replacement */ \
-+		      ".previous" :: "i" (feature), input)
-+
- #ifdef __KERNEL__
- 
- #ifdef CONFIG_SMP
-@@ -114,30 +138,6 @@
- 		      ".previous" :: "i" (feature) : "memory")  
- 
- /*
-- * Alternative inline assembly with input.
-- * 
-- * Pecularities:
-- * No memory clobber here. 
-- * Argument numbers start with 1.
-- * Best is to use constraints that are fixed size (like (%1) ... "r")
-- * If you use variable sized constraints like "m" or "g" in the 
-- * replacement maake sure to pad to the worst case length.
-- */
--#define alternative_input(oldinstr, newinstr, feature, input)		\
--	asm volatile ("661:\n\t" oldinstr "\n662:\n"			\
--		      ".section .altinstructions,\"a\"\n"		\
--		      "  .align 8\n"					\
--		      "  .quad 661b\n"            /* label */		\
--		      "  .quad 663f\n"		  /* new instruction */	\
--		      "  .byte %c0\n"             /* feature bit */	\
--		      "  .byte 662b-661b\n"       /* sourcelen */	\
--		      "  .byte 664f-663f\n"       /* replacementlen */	\
--		      ".previous\n"					\
--		      ".section .altinstr_replacement,\"ax\"\n"		\
--		      "663:\n\t" newinstr "\n664:\n"   /* replacement */ \
--		      ".previous" :: "i" (feature), input)
--
--/*
-  * Clear and set 'TS' bit respectively
-  */
- #define clts() __asm__ __volatile__ ("clts")
-diff -ur linux-2.6.6/include/linux/socket.h linux-2.6.6-gentoo/include/linux/socket.h
---- linux-2.6.6/include/linux/socket.h	2004-05-25 17:47:07.000000000 +0100
-+++ linux-2.6.6-gentoo/include/linux/socket.h	2004-06-02 21:19:49.000000000 +0100
-@@ -16,6 +16,10 @@
- 				/* _SS_MAXSIZE value minus size of ss_family */
- } __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */
- 
-+#ifndef _SYS_SOCKET_H
-+typedef unsigned short	sa_family_t;
-+#endif
-+
- #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
- 
- #include <linux/config.h>		/* for CONFIG_COMPAT */
-@@ -26,8 +30,6 @@
- #include <linux/types.h>		/* pid_t			*/
- #include <linux/compiler.h>		/* __user			*/
- 
--typedef unsigned short	sa_family_t;
--
- /*
-  *	1003.1g requires sa_family_t and that sa_data is char.
-  */
-diff -ur linux-2.6.6/include/linux/audit.h linux-2.6.6-gentoo/include/linux/audit.h
---- linux-2.6.6/include/linux/audit.h	2004-05-25 17:47:07.000000000 +0100
-+++ linux-2.6.6-gentoo/include/linux/audit.h	2004-06-02 21:19:21.000000000 +0100
-@@ -97,6 +97,7 @@
- #define AUDIT_FAIL_PANIC	2
- 
- #ifndef __KERNEL__
-+#include <linux/netlink.h>
- struct audit_message {
- 	struct nlmsghdr nlh;
- 	char		data[1200];
-diff -ur linux-2.6.6/include/asm-x86_64/sigcontext.h linux-2.6.6-gentoo/include/asm-x86_64/sigcontext.h
---- linux-2.6.6/include/asm-x86_64/sigcontext.h	2004-05-25 17:47:07.000000000 +0100
-+++ linux-2.6.6-gentoo/include/asm-x86_64/sigcontext.h	2004-06-02 22:04:52.000000000 +0100
-@@ -6,6 +6,8 @@
- /* FXSAVE frame */
- /* Note: reserved1/2 may someday contain valuable data. Always save/restore
-    them when you change signal frames. */
-+
-+#ifndef _SIGNAL_H
- struct _fpstate {
- 	__u16	cwd;
- 	__u16	swd;
-@@ -52,3 +54,4 @@
- };
- 
- #endif
-+#endif
-diff -ur linux-2.6.6/include/linux/gfp.h linux-2.6.6-gentoo/include/linux/gfp.h
---- linux-2.6.6/include/linux/gfp.h	2004-04-04 04:36:52.000000000 +0100
-+++ linux-2.6.6-gentoo/include/linux/gfp.h	2004-05-11 19:51:06.412779200 +0100
-@@ -48,6 +48,7 @@
- 
- #define GFP_DMA		__GFP_DMA
- 
-+#ifdef __KERNEL__
- 
- /*
-  * There is only one page-allocator function, and two main namespaces to
-@@ -96,4 +97,5 @@
- 
- void page_alloc_init(void);
- 
-+#endif /* __KERNEL__ */
- #endif /* __LINUX_GFP_H */
-diff -ur linux-2.6.6/include/linux/percpu.h linux-2.6.6-gentoo/include/linux/percpu.h
---- linux-2.6.6/include/linux/percpu.h	2004-04-04 04:38:14.000000000 +0100
-+++ linux-2.6.6-gentoo/include/linux/percpu.h	2004-05-11 19:33:00.987788880 +0100
-@@ -1,5 +1,6 @@
- #ifndef __LINUX_PERCPU_H
- #define __LINUX_PERCPU_H
-+#include <linux/gfp.h>
- #include <linux/spinlock.h> /* For preempt_disable() */
- #include <linux/slab.h> /* For kmalloc() */
- #include <linux/smp.h>
-diff -ur linux-2.6.6/include/linux/percpu_counter.h linux-2.6.6-gentoo/include/linux/percpu_counter.h
---- linux-2.6.6/include/linux/percpu_counter.h	2004-04-04 04:37:23.000000000 +0100
-+++ linux-2.6.6-gentoo/include/linux/percpu_counter.h	2004-05-11 19:46:31.423583912 +0100
-@@ -4,6 +4,7 @@
-  * WARNING: these things are HUGE.  4 kbytes per counter on 32-way P4.
-  */
- 
-+#include <linux/preempt.h>
- #include <linux/config.h>
- #include <linux/spinlock.h>
- #include <linux/smp.h>
-
diff --git a/sys-kernel/mips-headers/files/mips-headers-2.6.6-spaces_h-kernel.patch b/sys-kernel/mips-headers/files/mips-headers-2.6.6-spaces_h-kernel.patch
deleted file mode 100644
index 951e9b6d88bb..000000000000
--- a/sys-kernel/mips-headers/files/mips-headers-2.6.6-spaces_h-kernel.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: include/asm-mips/page.h
-===================================================================
-RCS file: /home/cvs/linux/include/asm-mips/page.h,v
-retrieving revision 1.41
-diff -u -r1.41 page.h
---- include/asm-mips/page.h	18 Mar 2004 22:54:01 -0000	1.41
-+++ include/asm-mips/page.h	7 Jun 2004 04:19:34 -0000
-@@ -10,10 +10,11 @@
- #define _ASM_PAGE_H
- 
- #include <linux/config.h>
--#include <spaces.h>
- 
- #ifdef __KERNEL__
- 
-+#include <spaces.h>
-+
- /*
-  * PAGE_SHIFT determines the page size
-  */
diff --git a/sys-kernel/mips-headers/files/mips-patches-gcc-makefile-fix.patch b/sys-kernel/mips-headers/files/mips-patches-gcc-makefile-fix.patch
deleted file mode 100644
index 18bd1e135426..000000000000
--- a/sys-kernel/mips-headers/files/mips-patches-gcc-makefile-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- arch/mips/Makefile.orig	2003-08-03 18:24:17.000000000 -0400
-+++ arch/mips/Makefile	2003-08-03 18:25:59.000000000 -0400
-@@ -69,7 +69,7 @@ ifdef CONFIG_CPU_VR41XX
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R4X00
--GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips3 -mabi=32 -Wa,--trap
- endif
- ifdef CONFIG_CPU_TX49XX
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
-@@ -81,14 +81,14 @@ ifdef CONFIG_CPU_MIPS64
- GCCFLAGS	+= -mcpu=r4600 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R5000
--GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips4 -mabi=32 -Wa,--trap
- endif
- ifdef CONFIG_CPU_R5432
- GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
- endif
- ifdef CONFIG_CPU_NEVADA
- # Cannot use -mmad with currently recommended tools
--GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
-+GCCFLAGS	+= -mips4 -mabi=32 -Wa,--trap
- endif
- ifdef CONFIG_CPU_RM7000
- GCCFLAGS	+= -mcpu=r5000 -mips2 -Wa,--trap
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild
deleted file mode 100644
index 3848fbcd49fd..000000000000
--- a/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r1.ebuild,v 1.11 2004/07/15 03:53:05 agriffis Exp $
-
-ETYPE="headers"
-inherit kernel
-
-OKV=${PV/_/-}
-CVSDATE=20030705
-EXTRAVERSION=-mipscvs-${CVSDATE}
-KV="${OKV}${EXTRAVERSION}"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# 1) linux-mips.org CVS snapshot from 05 Jul 2003
-# 2) patch off linux-mips ML to fix r4k cache handling
-# 3) patch to fix arch/mips/Makefile to pass appropriate CFLAGS
-
-DESCRIPTION="Linux-Mips CVS headers for MIPS-based machines"
-SRC_URI="mirror://gentoo/linux-mips-${OKV}-${CVSDATE}.tar.bz2
-		mirror://gentoo/mips-patches-${OKV}-${CVSDATE}.tar.bz2"
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="0"
-PROVIDE="virtual/os-headers"
-KEYWORDS="-* mips"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${S}
-	cd ${S}
-
-	# Fix R4K Cache Handling
-	cat ${WORKDIR}/mips-patches-r4k-cache-fix.patch | patch -p1
-
-	# Determine the gcc version and patch arch/mips/Makefile appropriately
-	GCCVER=$(gcc -dumpversion | cut -d. -f1,2)
-	case ${GCCVER} in
-		3.2) cat ${WORKDIR}/mips-patches-gcc32-makefile-fix.patch | patch -p0;;
-		3.3) cat ${WORKDIR}/mips-patches-gcc33-makefile-fix.patch | patch -p0;;
-	esac
-
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
deleted file mode 100644
index f754731b3344..000000000000
--- a/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r2.ebuild,v 1.11 2004/07/15 03:53:05 agriffis Exp $
-
-ETYPE="headers"
-inherit kernel
-
-OKV=${PV/_/-}
-CVSDATE=20030803
-EXTRAVERSION=-mipscvs-${CVSDATE}
-KV="${OKV}${EXTRAVERSION}"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 03 Aug 2003
-# 3) patch to fix arch/mips/Makefile to pass appropriate CFLAGS
-
-DESCRIPTION="Linux-Mips CVS headers for MIPS-based machines"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
-HOMEPAGE="http://www.linux-mips.org/"
-SLOT="0"
-PROVIDE="virtual/os-headers"
-KEYWORDS="-* mips"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${S}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	cat ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff | patch -p1
-
-	# Big Endian Fix
-	cat ${FILESDIR}/bigendian-byteorder-fix.patch | patch -p1
-
-	# Patch arch/mips/Makefile for gcc
-	cat ${FILESDIR}/mips-patches-gcc-makefile-fix.patch | patch -p0
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild
index d5752647c647..c96877ad4120 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild,v 1.8 2004/06/24 22:58:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.21-r3.ebuild,v 1.9 2005/02/06 04:48:42 kumba Exp $
 
 ETYPE="headers"
 inherit kernel
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
index bec78dd6d077..257b2aebcbf8 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild,v 1.14 2004/07/15 03:53:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.22-r1.ebuild,v 1.15 2005/02/06 04:48:42 kumba Exp $
 
 ETYPE="headers"
 inherit kernel
@@ -32,10 +32,10 @@ src_unpack() {
 	cd ${S}
 
 	# Update the vanilla sources with linux-mips CVS changes
-	cat ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff | patch -p1
+	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
 	# Big Endian Fix
-	cat ${FILESDIR}/bigendian-byteorder-fix.patch | patch -p1
+	epatch ${FILESDIR}/bigendian-byteorder-fix.patch
 
 	# Patch arch/mips/Makefile for gcc
 	cat ${FILESDIR}/mipscvs-${OKV}-${CVSDATE}-makefile-fix.patch | patch -p0
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild
index c4840c0421e5..fbe86a6eb255 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild,v 1.4 2004/07/15 03:53:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.23.ebuild,v 1.5 2005/02/06 04:48:42 kumba Exp $
 
 ETYPE="headers"
 inherit kernel
@@ -33,7 +33,7 @@ src_unpack() {
 	cd ${S}
 
 	# Update the vanilla sources with linux-mips CVS changes
-	cat ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff | patch -p1
+	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/mips-headers/mips-headers-2.4.25.ebuild b/sys-kernel/mips-headers/mips-headers-2.4.28.ebuild
index 06f4b1e0b0fe..66e7f8db080c 100644
--- a/sys-kernel/mips-headers/mips-headers-2.4.25.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.4.28.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.25.ebuild,v 1.3 2004/07/15 03:53:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.4.28.ebuild,v 1.1 2005/02/06 04:48:42 kumba Exp $
 
 ETYPE="headers"
 inherit kernel
 
-OKV=${PV/_/-}
-CVSDATE=20040222
-EXTRAVERSION=-mipscvs-${CVSDATE}
+OKV="${PV/_/-}"
+CVSDATE="20050105"
+EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-S=${WORKDIR}/linux-${KV}
+S="${WORKDIR}/linux-${KV}"
 
 # What's in this kernel?
 
@@ -24,7 +24,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 HOMEPAGE="http://www.linux-mips.org/"
 SLOT="0"
 PROVIDE="virtual/os-headers"
-KEYWORDS="-*"
+KEYWORDS="-* ~mips"
 IUSE=""
 
 src_unpack() {
@@ -33,7 +33,7 @@ src_unpack() {
 	cd ${S}
 
 	# Update the vanilla sources with linux-mips CVS changes
-	cat ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff | patch -p1
+	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
 
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/mips-headers/mips-headers-2.6.6-r1.ebuild b/sys-kernel/mips-headers/mips-headers-2.6.6-r1.ebuild
deleted file mode 100644
index 914b55d0562f..000000000000
--- a/sys-kernel/mips-headers/mips-headers-2.6.6-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.6.6-r1.ebuild,v 1.1 2004/08/30 22:59:20 kumba Exp $
-
-ETYPE="headers"
-inherit kernel eutils
-
-OKV=${PV/_/-}
-CVSDATE="20040604"
-EXTRAVERSION=-mipscvs-${CVSDATE}
-COBALTPATCHVER="1.4"
-KV="${OKV}${EXTRAVERSION}"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# 1) linux sources from kernel.org
-# 2) linux-mips.org CVS snapshot diff from 04 Jun 2004
-
-DESCRIPTION="Linux Headers from Linux-Mips CVS, dated ${CVSDATE}"
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-		mirror://gentoo/mipscvs-${OKV}-${CVSDATE}.diff.bz2"
-HOMEPAGE="http://www.linux-mips.org/"
-LICENSE="GPL-2"
-SLOT="0"
-PROVIDE="virtual/os-headers"
-KEYWORDS="-*"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/linux-${OKV} ${S}
-	cd ${S}
-
-	# Update the vanilla sources with linux-mips CVS changes
-	epatch ${WORKDIR}/mipscvs-${OKV}-${CVSDATE}.diff
-
-	# Cobalt Patches
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		echo -e ""
-		einfo ">>> Patching kernel for Cobalt support ..."
-		for x in ${WORKDIR}/cobalt-patches-26xx-${COBALTPATCHVER}/*.patch; do
-			epatch ${x}
-		done
-	fi
-
-	# Do Stuff
-	kernel_universal_unpack
-
-	# User-space patches for various things
-	epatch ${FILESDIR}/${PN}-2.6.6-appCompat.patch
-	epatch ${FILESDIR}/${PN}-2.6.3-strict-ansi-fix.patch
-	epatch ${FILESDIR}/${PN}-2.6.0-sysctl_h-compat.patch
-	epatch ${FILESDIR}/${PN}-2.6.0-fb.patch
-
-	epatch ${FILESDIR}/${PN}-2.6.6-spaces_h-kernel.patch
-}
-
-src_compile() {
-	local my_defconfig hcflags
-
-	# Avoid issues w/ ARCH
-	set_arch_to_kernel
-
-	# Imported from linux26-headers
-	# autoconf.h isnt generated unless it already exists. plus, we have no guarentee that 
-	# any headers are installed on the system...
-	[ -f ${ROOT}/usr/include/linux/autoconf.h ] || touch ${S}/include/linux/autoconf.h
-
-	# CFLAGS for the kernel defconfig
-	hcflags="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/"
-
-	# Set the right defconfig
-	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-		my_defconfig="cobalt_defconfig"
-	else
-		# SGI Machine?
-		case "$(uname -i)" in
-			"SGI Indy"|"SGI Indigo2"|"SGI IP22")	my_defconfig="ip22_defconfig" ;;
-			"SGI Origin"|"SGI IP27")		my_defconfig="ip27_defconfig" ;;
-			"SGI Octane"|"SGI IP30")		my_defconfig="ip30_defconfig" ;;
-			"SGI O2"|"SGI IP32")			my_defconfig="ip32_defconfig" ;;
-		esac
-	fi
-
-	# Run defconfig
-	make ${my_defconfig} HOSTCFLAGS="${hcflags}"
-
-	# "Prepare" certain files
-	make prepare HOSTCFLAGS="${hcflags}"
-
-	# Back to normal
-	set_arch_to_portage
-}
-
-src_install() {
-	# XXX Bug in Kernel.eclass requires this fix for now.
-	# XXX Remove when kernel.eclass is fixed.
-	# XXX 2.4 kernels symlink 'asm' to 'asm-${ARCH}' in include/
-	# XXX 2.6 kernels don't, however.  So we fix this here so kernel.eclass can find the include/asm folder
-	if [ "`KV_to_int ${OKV}`" -ge "`KV_to_int 2.6.0`" ]; then
-		ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm
-	fi
-
-	# Do normal src_install stuff
-	kernel_src_install
-
-	# If this is 2.5 or 2.6 headers, then we need asm-generic too
-	if [ "`KV_to_int ${OKV}`" -ge "`KV_to_int 2.6.0`" ]; then
-		dodir /usr/include/asm-generic
-		cp -ax ${S}/include/asm-generic/* ${D}/usr/include/asm-generic
-	fi
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-
-	einfo "Kernel headers are usually only used when recompiling glibc, as such, following the installation"
-	einfo "of newer headers, it is advised that you re-merge glibc as follows:"
-	einfo "emerge glibc"
-	einfo "Failure to do so will cause glibc to not make use of newer features present in the updated kernel"
-	einfo "headers."
-}
diff --git a/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild b/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild
index c5379ff8a614..9dbdc75a173c 100644
--- a/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild
+++ b/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild,v 1.3 2004/10/02 05:49:51 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-headers/mips-headers-2.6.8.1.ebuild,v 1.4 2005/02/06 04:48:42 kumba Exp $
 
 
 # Eclass stuff