Version bumped, and added a patch to make some applications which didn't compile to compile.

6 files changed, 249 insertions, 12 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index abca80ab43d9..ee4907b2b9f5 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.36 2003/12/11 21:15:24 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.37 2003/12/24 12:09:59 plasmaroo Exp $
+
+*linux-headers-2.6.0 (24 Dec 2003)
+
+  24 Dec 2003; <plasmaroo@gentoo.org> linux-headers-2.6.0.ebuild,
+  linux-headers-2.6.0_beta11.ebuild,
+  files/linux-headers-2.6.0-appCompat.patch:
+  Version bump - this version has been patched to support some applications
+  which did not compile on 2.6. Please report any bugs to http://bugs.gentoo.org
+  or plasmaroo@gentoo.org
 
   11 Dec 2003; <plasmaroo@gentoo.org>
   files/linux-headers-strict-ansi-fix.patch:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 5b2b7013b558..bac2243a7e29 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 ff6655cf7f0f9757a1c1293ee39ca830 ChangeLog 8617
+MD5 5edd7e3ab141ba8d286c0360a37c814a ChangeLog 8617
 MD5 d6b0bfcaa29c53a2a4c2dc25217b29f6 linux-headers-2.2.20.ebuild 3921
 MD5 c6a2e4e73e3abeb46863357f5ba192ed linux-headers-2.4.17-r5.ebuild 4251
 MD5 d1e1405c1644214541150d85c3471d62 linux-headers-2.4.23.ebuild 3396
@@ -9,7 +9,7 @@ MD5 5c17aece95a57713fa9ea390d5f48647 linux-headers-2.4.21-r1.ebuild 3888
 MD5 22bc91e645c0b6309611f1a4d12e0412 linux-headers-2.4.16-r1.ebuild 5049
 MD5 732a9212e5a370154579a03d5838dfcb linux-headers-2.4.22.ebuild 3863
 MD5 0da559c76fd274ce325b786e101ab03a linux-headers-2.4.19-r1.ebuild 4800
-MD5 fdd2c6abd0dd3c3ff33d635c15f6d170 linux-headers-2.6.0.ebuild 3791
+MD5 f8f274321fbb00ab80f7fc85994f553e linux-headers-2.6.0.ebuild 3788
 MD5 e92a42061f868f9d2be14edaad669e63 linux-headers-2.4.18.ebuild 3173
 MD5 40b1a0224290f63ee44609d113442479 linux-headers-2.4.21.ebuild 3594
 MD5 5b8b9d5469f190029664ede84a51c68b linux-headers-2.4.16-r3.ebuild 6100
@@ -24,7 +24,7 @@ MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
 MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18-r2 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
 MD5 0d7bb77bc61a34b15bef6328c9279cb2 files/digest-linux-headers-2.4.19-r1 67
-MD5 55c15636c670aabd4eca632d04f7e788 files/linux-headers-2.6.0-appCompat.patch 7044
+MD5 4a847d42d42c9f278e6b70151fca335a files/linux-headers-2.6.0-appCompat.patch 7572
 MD5 b1f0fb91c6c3d60ac2f1f1d6893e145a files/digest-linux-headers-2.4.18 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
 MD5 eb4cae8b5b8fddbb2c950fdb70fbedb3 files/digest-linux-headers-2.4.17-r5 145
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.0 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.0
new file mode 100644
index 000000000000..7c2469b8a392
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.0
@@ -0,0 +1 @@
+MD5 c9e73737002521a347d2e6617beb56cc linux-2.6.0.tar.bz2 33255278
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.0_beta11 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.0_beta11
deleted file mode 100644
index 373464497a51..000000000000
--- a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.0_beta11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06ba5a7eeb924036633a7b33689b2c4f linux-2.6.0-test11.tar.bz2 33243689
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch
new file mode 100644
index 000000000000..faf7d4b3c2d6
--- /dev/null
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch
@@ -0,0 +1,230 @@
+diff -Naur linux-2.6.0/include/linux/blockgroup_lock.h linux-2.6.0/include/linux.plasmaroo/blockgroup_lock.h
+--- linux-2.6.0/include/linux/blockgroup_lock.h	2003-12-18 02:58:16.000000000 +0000
++++ linux-2.6.0/include/linux.plasmaroo/blockgroup_lock.h	2003-12-24 11:54:58.000000000 +0000
+@@ -5,7 +5,7 @@
+  */
+ 
+ #include <linux/config.h>
+-#include <linux/spinlock.h>
++#include <linux/spinlock_wrapper.h>
+ #include <linux/cache.h>
+ 
+ #ifdef CONFIG_SMP
+diff -Naur linux-2.6.0/include/linux/ext2_fs_sb.h linux-2.6.0/include/linux.plasmaroo/ext2_fs_sb.h
+--- linux-2.6.0/include/linux/ext2_fs_sb.h	2003-12-18 02:59:35.000000000 +0000
++++ linux-2.6.0/include/linux.plasmaroo/ext2_fs_sb.h	2003-12-24 11:55:01.000000000 +0000
+@@ -18,6 +18,7 @@
+ 
+ #include <linux/blockgroup_lock.h>
+ #include <linux/percpu_counter.h>
++#include <linux/redefine_types.h>
+ 
+ /*
+  * second extended-fs super-block data in memory
+diff -Naur linux-2.6.0/include/linux/fb.h linux-2.6.0/include/linux.plasmaroo/fb.h
+--- linux-2.6.0/include/linux/fb.h	2003-12-18 02:58:39.000000000 +0000
++++ linux-2.6.0/include/linux.plasmaroo/fb.h	2003-12-24 11:55:01.000000000 +0000
+@@ -2,9 +2,7 @@
+ #define _LINUX_FB_H
+ 
+ #include <linux/tty.h>
+-#include <linux/workqueue.h>
+ #include <asm/types.h>
+-#include <asm/io.h>
+ 
+ /* Definitions of frame buffers						*/
+ 
+@@ -331,6 +329,8 @@
+ #define FB_PIXMAP_IO      4     /* memory is iomapped       */
+ #define FB_PIXMAP_SYNC    256   /* set if GPU can DMA       */
+ 
++#ifdef __KERNEL__
++
+ struct fb_pixmap {
+         __u8  *addr;                      /* pointer to memory             */  
+ 	__u32 size;                       /* size of buffer in bytes       */
+@@ -344,7 +344,9 @@
+ 	spinlock_t lock;                  /* spinlock                      */
+ 	atomic_t count;
+ };
+-#ifdef __KERNEL__
++
++#include <linux/workqueue.h>
++#include <asm/io.h>
+ 
+ #include <linux/fs.h>
+ #include <linux/init.h>
+diff -Naur linux-2.6.0/include/linux/fs.h linux-2.6.0/include/linux.plasmaroo/fs.h
+--- linux-2.6.0/include/linux/fs.h	2003-12-18 02:58:29.000000000 +0000
++++ linux-2.6.0/include/linux.plasmaroo/fs.h	2003-12-24 11:54:58.000000000 +0000
+@@ -17,7 +17,15 @@
+ #include <linux/dcache.h>
+ #include <linux/stat.h>
+ #include <linux/cache.h>
+-#include <linux/radix-tree.h>
++
++/* This should fix any ``sys-fs'' items getting spinlocks.
++   $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.1 2003/12/24 12:09:59 plasmaroo Exp $ 
++*/
++
++#ifdef __KERNEL__
++	#include <linux/radix-tree.h>
++#endif
++
+ #include <linux/kobject.h>
+ #include <asm/atomic.h>
+ 
+diff -Naur linux-2.6.0/include/linux/isdn.h linux-2.6.0/include/linux.plasmaroo/isdn.h
+--- linux-2.6.0/include/linux/isdn.h	2003-12-18 02:59:58.000000000 +0000
++++ linux-2.6.0/include/linux.plasmaroo/isdn.h	2003-12-24 11:55:00.000000000 +0000
+@@ -14,7 +14,13 @@
+ #define __ISDN_H__
+ 
+ #include <linux/ioctl.h>
+-#include <linux/isdn/fsm.h>
++
++/* This should sort out ``ligtop'' from getting spinlocks.
++   $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.1 2003/12/24 12:09:59 plasmaroo Exp $
++*/
++#ifdef __KERNEL__
++	#include <linux/isdn/fsm.h>
++#endif
+ 
+ #ifdef CONFIG_COBALT_MICRO_SERVER
+ /* Save memory */
+diff -Naur linux-2.6.0/include/linux/msdos_fs.h linux-2.6.0/include/linux.plasmaroo/msdos_fs.h
+--- linux-2.6.0/include/linux/msdos_fs.h	2003-12-18 02:59:18.000000000 +0000
++++ linux-2.6.0/include/linux.plasmaroo/msdos_fs.h	2003-12-24 11:55:00.000000000 +0000
+@@ -4,7 +4,14 @@
+ /*
+  * The MS-DOS filesystem constants/structures
+  */
+-#include <linux/buffer_head.h>
++
++/* This should sort out any problems with ``dosfstools''.
++   $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.1 2003/12/24 12:09:59 plasmaroo Exp $
++*/
++#ifdef __KERNEL
++	#include <linux/buffer_head.h>
++#endif
++
+ #include <linux/string.h>
+ #include <asm/byteorder.h>
+ 
+diff -Naur linux-2.6.0/include/linux/percpu_counter.h linux-2.6.0/include/linux.plasmaroo/percpu_counter.h
+--- linux-2.6.0/include/linux/percpu_counter.h	2003-12-18 02:58:56.000000000 +0000
++++ linux-2.6.0/include/linux.plasmaroo/percpu_counter.h	2003-12-24 11:55:00.000000000 +0000
+@@ -5,10 +5,13 @@
+  */
+ 
+ #include <linux/config.h>
+-#include <linux/spinlock.h>
+-#include <linux/smp.h>
++#include <linux/spinlock_wrapper.h>
+ #include <linux/threads.h>
+ 
++/* <smp.h> was removed as it brought in spinlocks and other
++   bad things - no functionality is lost as all the necessary
++   SMP data is still available. */
++
+ #ifdef CONFIG_SMP
+ 
+ struct __percpu_counter {
+diff -Naur linux-2.6.0/include/linux/redefine_types.h linux-2.6.0/include/linux.plasmaroo/redefine_types.h
+--- linux-2.6.0/include/linux/redefine_types.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.0/include/linux.plasmaroo/redefine_types.h	2003-12-24 11:55:01.000000000 +0000
+@@ -0,0 +1,46 @@
++/* This is a short macro to redefine any types which weren't included
++   further down the tree as __KERNEL__ might have been unset. 
++
++   $>  find $path -name types.h -maxdepth 2 | xargs cat | grep \#ifndef | grep \
++       TYPES | sed 's/ifndef/undef/'
++
++   plasmaroo@gentoo.org - This is an "as-is" Public Domain Item with 
++                          no warranty of any kind */
++
++#ifndef __KERNEL__
++	#define __KERNEL__
++	#define __KERNEL_WAS_DEFINED__
++#endif
++
++#undef __ASSEMBLY__ 
++#undef _ALPHA_TYPES_H
++#undef __ASM_ARM_TYPES_H
++#undef _ASM_TYPES_H
++#undef __UM_TYPES_H
++#undef _LINUX_TYPES_H
++#undef __BIT_TYPES_DEFINED__
++#undef _ASM_IA64_TYPES_H
++#undef _S390_TYPES_H
++#undef _PPC_TYPES_H
++#undef __ASM_SH_TYPES_H
++#undef _SPARC64_TYPES_H
++#undef _ASM_TYPES_H
++#undef _SPARC_TYPES_H
++#undef _LINUX_RXRPC_TYPES_H
++#undef _PARISC_TYPES_H
++#undef __ASM_ARM_TYPES_H
++#undef _X86_64_TYPES_H
++#undef _ALPHA_TYPES_H
++#undef _M68K_TYPES_H
++#undef __V850_TYPES_H__
++#undef _ETRAX_TYPES_H
++#undef _M68K_TYPES_H
++#undef _I386_TYPES_H
++#undef _H8300_TYPES_H
++#undef _PPC64_TYPES_H
++
++#include <asm/types.h>
++
++#ifdef __KERNEL_WAS_DEFINED__
++	#undef __KERNEL__
++#endif
+diff -Naur linux-2.6.0/include/linux/spinlock_wrapper.h linux-2.6.0/include/linux.plasmaroo/spinlock_wrapper.h
+--- linux-2.6.0/include/linux/spinlock_wrapper.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.0/include/linux.plasmaroo/spinlock_wrapper.h	2003-12-24 11:54:57.000000000 +0000
+@@ -0,0 +1,26 @@
++#ifndef __LINUX_SPINLOCK_H_WRAPPER
++#define __LINUX_SPINLOCK_H_WRAPPER
++
++#include <linux/preempt.h>
++
++#define SPINLOCK_MAGIC  0x1D244B3C
++typedef struct {
++	unsigned long magic;
++	volatile unsigned long lock;
++	volatile unsigned int babble;
++	const char *module;
++	char *owner;
++	int oline;
++} spinlock_t;
++
++#define spin_lock_init(x) \
++	do { \
++		(x)->magic = SPINLOCK_MAGIC; \
++		(x)->lock = 0; \
++		(x)->babble = 5; \
++		(x)->module = __FILE__; \
++		(x)->owner = NULL; \
++		(x)->oline = 0; \
++	} while (0)
++
++#endif
+diff -Naur linux-2.6.0/include/linux/videodev.h linux-2.6.0/include/linux.plasmaroo/videodev.h
+--- linux-2.6.0/include/linux/videodev.h	2003-12-18 03:00:03.000000000 +0000
++++ linux-2.6.0/include/linux.plasmaroo/videodev.h	2003-12-24 11:54:59.000000000 +0000
+@@ -3,7 +3,13 @@
+ 
+ #include <linux/types.h>
+ #include <linux/version.h>
+-#include <linux/device.h>
++
++/* Should sort out ``DirectFB''.
++   $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/files/linux-headers-2.6.0-appCompat.patch,v 1.1 2003/12/24 12:09:59 plasmaroo Exp $
++*/
++#ifdef __KERNEL__
++	#include <linux/device.h>
++#endif
+ 
+ #define HAVE_V4L2 1
+ #include <linux/videodev2.h>
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.0_beta11.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.0.ebuild
index 3e41b343128f..4e55d4a163de 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.0_beta11.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.0.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.0_beta11.ebuild,v 1.1 2003/12/08 03:50:27 kumba Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.0.ebuild,v 1.1 2003/12/24 12:09:59 plasmaroo Exp $
 
 ETYPE="headers"
 inherit kernel
 
 OKV="${PV/_/-}"
-OKV="${OKV/beta/test}"
 KV="${OKV}"
 S=${WORKDIR}/linux-${OKV}
 EXTRAVERSION=""
@@ -25,13 +23,11 @@ SLOT="0"
 PROVIDE="virtual/kernel virtual/os-headers"
 KEYWORDS="-*"
 
-
 # Figure out what architecture we are, and set ARCH appropriately
 ARCH="$(uname -m)"
 ARCH=`echo $ARCH | sed -e s/[i].86/i386/ -e s/x86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/amd64/x86_64/`
 [ "$ARCH" == "sparc" -a "$PROFILE_ARCH" == "sparc64" ] && ARCH=sparc64
 
-
 # Archs which have their own separate header packages, add a check here
 # and redirect the user to them
 if [ "${ARCH}" = "mips" ] || [ "${ARCH}" = "mips64" ]; then
@@ -40,8 +36,6 @@ if [ "${ARCH}" = "mips" ] || [ "${ARCH}" = "mips64" ]; then
 	die
 fi
 
-
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -59,6 +53,10 @@ src_compile() {
 	if [ -n "`use sparc`" ]; then
 		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
+
+	# User-space patches for various things
+	epatch ${FILESDIR}/${P}-appCompat.patch
+
 }
 
 src_install() {