New headers revision, keyword masked.

5 files changed, 138 insertions, 6 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 190bcd2283e5..528f5b334c6e 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,12 @@
 # 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.51 2004/03/07 08:06:12 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.52 2004/03/07 08:41:25 kumba Exp $
+
+*linux-headers-2.4.25 (07 Mar 2004)
+
+  07 Mar 2004; Joshua Kinard <kumba@gentoo.org> linux-headers-2.4.23.ebuild,
+  linux-headers-2.4.25.ebuild:
+  New headers revision, keyword masked.
 
   07 Mar 2004; Joshua Kinard <kumba@gentoo.org>
   linux-headers-2.4.19-r1.ebuild:
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 77af4610d757..106f47e78ef7 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 4b80be462cf4b66051035ef3d1b432a1 ChangeLog 11461
+MD5 d781a34d1d213c19edcad2c928c1f643 ChangeLog 11647
 MD5 5aad4907c20fa590956de7b1a2d7940b linux-headers-2.2.20.ebuild 3919
 MD5 cfdef44dfa55b9d8f7fef25db8f02cec linux-headers-2.2.21_pre3.ebuild 4090
 MD5 c4d84a23943d7b0cecd3baf6c7b06680 linux-headers-2.4.16-r1.ebuild 5047
@@ -15,10 +15,11 @@ MD5 6f7564daf75852f1c3b50a7b586294bc linux-headers-2.4.19.ebuild 4620
 MD5 0bfc2ab50eda59905c768b0d13e0ab3f linux-headers-2.4.21-r1.ebuild 3887
 MD5 434a527a81552b011ec5ad591db3fa84 linux-headers-2.4.21.ebuild 3591
 MD5 e0213763ec7f52b581e0f3d78c72cf58 linux-headers-2.4.22.ebuild 3881
-MD5 2252de5a63b146b411742bfcc487611b linux-headers-2.4.23.ebuild 3411
+MD5 f0e2bfa522f637544a092213148fc9b1 linux-headers-2.4.23.ebuild 3413
 MD5 19415dce5c0292f8cd736aab42caffdf linux-headers-2.6.1.ebuild 4029
 MD5 66670455b1bddf50c8919429c9cfc092 linux-headers-2.6.3-r1.ebuild 4022
 MD5 9eaf2835f8242a58af89b897f1ee9438 metadata.xml 350
+MD5 2568fa1cfb5d9569b560ca173d6a05e3 linux-headers-2.4.25.ebuild 3399
 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
@@ -47,3 +48,4 @@ MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.p
 MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux-headers-2.6.3-appCompat.patch 17484
 MD5 598136365858338b26557b7587c6725f files/linux-headers-2.6.3-strict-ansi-fix.patch 4166
 MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
+MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.4.25 b/sys-kernel/linux-headers/files/digest-linux-headers-2.4.25
new file mode 100644
index 000000000000..9240858c4773
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.4.25
@@ -0,0 +1 @@
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
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 7d268b140915..3a069d8bea2a 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-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.4.23.ebuild,v 1.6 2004/03/04 04:12:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.23.ebuild,v 1.7 2004/03/07 08:41:25 kumba Exp $
 
 ETYPE="headers"
 inherit kernel
@@ -47,9 +47,9 @@ src_unpack() {
 	# This patch fixes an issue involving the use of gcc's -ansi flag and the __u64 datatype.
 	# It only patches asm-i386, so we only apply it if x86.  Unknown if this is needed for other archs.
 	# Closes Bug #32246
-	if [ -n "`use x86`" ]; then
+#	if [ -n "`use x86`" ]; then
 		epatch ${FILESDIR}/${PN}-strict-ansi-fix.patch
-	fi
+#	fi
 
 
 	# Do Stuff
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild
new file mode 100644
index 000000000000..f6979d02b9f4
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.4.25.ebuild
@@ -0,0 +1,123 @@
+# 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.4.25.ebuild,v 1.1 2004/03/07 08:41:25 kumba 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.4/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}
+
+	# This patch fixes an issue involving the use of gcc's -ansi flag and the __u64 datatype.
+	# It only patches asm-i386, so we only apply it if x86.  Unknown if this is needed for other archs.
+	# Closes Bug #32246
+	if [ -n "`use x86`" ]; then
+		epatch ${FILESDIR}/${PN}-strict-ansi-fix.patch
+	fi
+
+
+	# 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() {
+
+	# 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
+}
+
+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."
+}