2.6.0-test11 headers for people to play with typo-fix in 2.4.23 headers ebuild

4 files changed, 138 insertions, 5 deletions

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 933e75d6bd59..4f114ac8942e 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 41787d1779ef492d38b9fed79ce60fd5 ChangeLog 7468
+MD5 163ccf35024d7480e00dd9413794f201 ChangeLog 7464
 MD5 90a3df79392bb9607250e45e608472b3 linux-headers-2.2.20.ebuild 3924
 MD5 7289ac3b900fe7136758fdae230e74fb linux-headers-2.2.21_pre3.ebuild 4095
 MD5 b970d40b6384eb86cbeb120e6e0a5f0c linux-headers-2.4.16-r1.ebuild 5052
@@ -15,8 +15,8 @@ MD5 d0a25ca6955eb14a8baa4fee38cfc0f0 linux-headers-2.4.19.ebuild 4625
 MD5 5c17aece95a57713fa9ea390d5f48647 linux-headers-2.4.21-r1.ebuild 3888
 MD5 40b1a0224290f63ee44609d113442479 linux-headers-2.4.21.ebuild 3594
 MD5 732a9212e5a370154579a03d5838dfcb linux-headers-2.4.22.ebuild 3863
-MD5 ae05a015e542b362871411552bed0ede linux-headers-2.4.23.ebuild 3396
-MD5 fa8b0fb1679409296e2ea523b10bd4ba linux-headers-2.6.0_beta11.ebuild 3615
+MD5 d1e1405c1644214541150d85c3471d62 linux-headers-2.4.23.ebuild 3396
+MD5 36c06ea162f33ad13bb6f2b2c4f7222b linux-headers-2.6.0_beta11.ebuild 3735
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 07aeae7e5036a3ec3e06d29fd68e9cce files/digest-linux-headers-2.2.20 216
 MD5 167e790d7861e0ed3a31577b31a92968 files/digest-linux-headers-2.2.21_pre3 281
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
new file mode 100644
index 000000000000..373464497a51
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.0_beta11
@@ -0,0 +1 @@
+MD5 06ba5a7eeb924036633a7b33689b2c4f linux-2.6.0-test11.tar.bz2 33243689
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild
index 3a68b960ebc8..68ca61230dd0 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild
@@ -1,6 +1,6 @@
 # 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.4.23.ebuild,v 1.2 2003/11/29 04:48:35 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild,v 1.3 2003/12/08 03:50:27 kumba Exp $
 
 ETYPE="headers"
 inherit kernel
@@ -63,7 +63,7 @@ src_compile() {
 
 	# If this is sparc, then generate asm_offsets.h
 	if [ -n "`use sparc`" ]; then
-		make dep ARCH=${ARCH} || die "Failed to run 'make dep'"
+		make ARCH=${ARCH} dep || die "Failed to run 'make dep'"
 	fi
 }
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.0_beta11.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.0_beta11.ebuild
new file mode 100644
index 000000000000..3e41b343128f
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.6.0_beta11.ebuild
@@ -0,0 +1,132 @@
+# 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 $
+
+
+ETYPE="headers"
+inherit kernel
+
+OKV="${PV/_/-}"
+OKV="${OKV/beta/test}"
+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/`
+[ "$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
+	eerror "These headers are not appropriate for your architecture."
+	eerror "Please use sys-kernel/${ARCH/64/}-headers instead."
+	die
+fi
+
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Do Stuff
+	kernel_universal_unpack
+}
+
+src_compile() {
+
+	# Do normal src_compile stuff
+	kernel_src_compile
+
+	# 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 [ -n "`use sparc`" ]; 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
+
+		# Copy asm-sparc
+		cp -ax ${S}/include/asm-sparc/* ${D}/usr/include/asm-sparc
+
+		# If this is sparc64, then we need asm-sparc64 stuff too
+		if [ "${PROFILE_ARCH}" = "sparc64" ]; then
+			dodir /usr/include/asm-sparc64
+			cp -ax ${S}/include/asm-sparc64/* ${D}/usr/include/asm-sparc64
+		fi
+
+		# 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."
+}