Version bump.

4 files changed, 133 insertions, 15 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 2804eba86b33..b47a30aaa9f3 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.57 2004/04/03 16:30:50 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.58 2004/04/06 23:55:50 plasmaroo Exp $
+
+*linux-headers-2.6.5 (07 Apr 2004)
+
+  07 Apr 2004; <plasmaroo@gentoo.org> +linux-headers-2.6.5.ebuild:
+  Version bump.
 
   03 Apr 2004; Jason Wever <weeve@gentoo.org> linux-headers-2.4.23.ebuild:
   Stable on sparc.
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.5 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.5
new file mode 100644
index 000000000000..2ae7b101da38
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.5
@@ -0,0 +1 @@
+MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.4-appCompat.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.4-appCompat.patch
index 303618a5e5a0..907bbd6e6ac5 100644
--- a/sys-kernel/linux-headers/files/linux-headers-2.6.4-appCompat.patch
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.4-appCompat.patch
@@ -579,20 +579,6 @@ diff -ur linux-2.6.4/include/linux/compiler-gcc3.h linux-2.6.4-gentoo/include/li
  #endif
 +
 +#endif /* __KERNEL__ */
-diff -ur linux-2.6.4/include/linux/fb.h linux-2.6.4-gentoo/include/linux/fb.h
---- linux-2.6.4/include/linux/fb.h	2004-03-13 13:04:57.989940488 +0000
-+++ linux-2.6.4-gentoo/include/linux/fb.h	2004-03-13 13:17:54.987818856 +0000
-@@ -380,8 +380,8 @@
- 	u32 access_align;	/* alignment per read/write		*/
- 	u32 flags;		/* see FB_PIXMAP_*			*/
- 				/* access methods			*/
--	void (*outbuf)(struct fb_info *info, u8 *addr, u8 *src, unsigned int size);
--	u8   (*inbuf) (struct fb_info *info, u8 *addr);
-+	void (*outbuf)(struct fb_info *info, __u8 *addr, __u8 *src, unsigned int size);
-+	u8   (*inbuf) (struct fb_info *info, __u8 *addr);
- };
- 
-     /*
 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
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild
new file mode 100644
index 000000000000..f82f1445a159
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2004 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.5.ebuild,v 1.1 2004/04/06 23:55:50 plasmaroo Exp $
+
+ETYPE="headers"
+inherit kernel
+
+OKV="${PV/_/-}"
+KV="${OKV}"
+S=${WORKDIR}/linux-${OKV}
+EXTRAVERSION=""
+
+# What's in this kernel?
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+
+DESCRIPTION="Linux ${OKV} headers from kernel.org"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
+LICENSE="GPL-2"
+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/  -e s/i386_64/x86_64/`
+[ "$ARCH" == "sparc" -a "$PROFILE_ARCH" == "sparc64" ] && ARCH=sparc64
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# Do Stuff
+	kernel_universal_unpack
+
+	# User-space patches for various things
+	epatch ${FILESDIR}/${PN}-2.6.4-appCompat.patch
+	epatch ${FILESDIR}/linux-headers-2.6.3-strict-ansi-fix.patch
+	epatch ${FILESDIR}/linux-headers-2.6.0-sysctl_h-compat.patch
+	epatch ${FILESDIR}/linux-headers-2.6.0-fb.patch
+
+}
+
+src_compile() {
+
+	# Compile the default configuration
+	MY_ARCH=${ARCH}
+	unset ${ARCH}
+	make defconfig
+	ARCH=${MY_ARCH}
+
+	# If this is sparc, then generate asm_offsets.h
+	if [ -n "`use sparc`" ]; then
+		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
+	fi
+
+}
+
+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 sparc, then we need to place asm_offsets.h in the proper location(s)
+	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
+
+		# We don't need /usr/include/asm, generate-asm-sparc will take care of this
+		rm -Rf ${D}/usr/include/asm
+
+		# We do need empty directories, though...
+		dodir /usr/include/asm
+		dodir /usr/include/asm-sparc
+		dodir /usr/include/asm-sparc64
+
+		# Copy asm-sparc and asm-sparc64
+		cp -ax ${S}/include/asm-sparc/* ${D}/usr/include/asm-sparc
+		cp -ax ${S}/include/asm-sparc64/* ${D}/usr/include/asm-sparc64
+
+		# Check if generate-asm-sparc exists
+		if [ -a "${FILESDIR}/generate-asm-sparc" ]; then
+
+			# Just incase generate-asm-sparc isn't executable, make it so
+			if [ ! -x "${FILESDIR}/generate-asm-sparc" ]; then
+				chmod +x ${FILESDIR}/generate-asm-sparc
+			fi
+
+			# Generate /usr/include/asm for sparc systems
+			${FILESDIR}/generate-asm-sparc ${D}/usr/include
+		else
+			eerror "${FILESDIR}/generate-asm-sparc doesn't exist!"
+			die
+		fi
+	fi
+
+	# 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_preinst() {
+	kernel_pkg_preinst
+}
+
+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."
+}