Changed the ordering of variables to adjust to new kernel.eclass behaviour and added a patch to close a bug.

7 files changed, 187 insertions, 13 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 135a7316045b..6c94c679d8f4 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,8 +1,16 @@
 # 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.27 2003/10/30 23:17:54 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.28 2003/11/16 18:26:58 kumba Exp $
 
 
+*linux-headers-2.4.21-r1 (16 Nov 2003)
+
+  16 Nov 2003; Joshua Kinard <kumba@gentoo.org>
+  linux-headers-2.4.21-r1.ebuild, linux-headers-2.4.21.ebuild,
+  linux-headers-2.4.22.ebuild, files/linux-headers-strict-ansi-fix.patch:
+  Changed the ordering of some variables to adjust to new kernel.eclass behavior.
+  Added a patch that fixes an issue regarding the use of gcc's -ansi flag.  Closes Bug #32246
+
 *linux-headers-2.4.22 (21 Sep 2003)
 
   30 Oct 2003; Joshua Kinard <kumba@gentoo.org> linux-headers-2.4.21.ebuild,
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index b270b6152e8c..fdee9072eb57 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 5eaaf843c99466e85147d5fd3c483697 ChangeLog 5958
+MD5 f2f5d3d263dc3768e888bd7cded25f8a ChangeLog 5958
 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
@@ -12,9 +12,9 @@ MD5 b854072fd0ae0ea776038247474d5fe5 linux-headers-2.4.18-r2.ebuild 4555
 MD5 ebb37a4bbba2124565be7130173a6f34 linux-headers-2.4.18.ebuild 3176
 MD5 db99dd305dd1be1b71632047b4e6f80c linux-headers-2.4.19-r1.ebuild 4794
 MD5 d0a25ca6955eb14a8baa4fee38cfc0f0 linux-headers-2.4.19.ebuild 4625
-MD5 21c6b397e8e13ff4b384a5db335bf32d linux-headers-2.4.21.ebuild 3583
-MD5 1860be7be7a1aaa013abbfee130ec420 linux-headers-2.4.22.ebuild 3856
-MD5 65517498d77bd4904d0e5710cf8f6114 linux-headers-2.4.21-r1.ebuild 3881
+MD5 70971f4d5b88819d16df7e0429855477 linux-headers-2.4.21.ebuild 3583
+MD5 6dc7197711014c23e65a8fbe7e78d9f8 linux-headers-2.4.22.ebuild 3856
+MD5 0e80a71b20c3271f68ca53d53c2a7a3e linux-headers-2.4.21-r1.ebuild 3883
 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.4.21-r1 b/sys-kernel/linux-headers/files/digest-linux-headers-2.4.21-r1
new file mode 100644
index 000000000000..4cf91697ea68
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.4.21-r1
@@ -0,0 +1 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
diff --git a/sys-kernel/linux-headers/files/linux-headers-strict-ansi-fix.patch b/sys-kernel/linux-headers/files/linux-headers-strict-ansi-fix.patch
new file mode 100644
index 000000000000..1e6a1f657308
--- /dev/null
+++ b/sys-kernel/linux-headers/files/linux-headers-strict-ansi-fix.patch
@@ -0,0 +1,21 @@
+--- linux-2.4.22/include/asm-i386/types.h	2003-11-10 07:38:32.000000000 +0200
++++ linux-2.4.22.ext/include/asm-i386/types.h	2003-11-10 07:48:42.000000000 +0200
+@@ -17,11 +17,15 @@
+ typedef __signed__ int __s32;
+ typedef unsigned int __u32;
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-typedef __signed__ long long __s64;
+-typedef unsigned long long __u64;
++#ifndef __GNUC__
++# ifndef __extension__
++#  define __extension__
++# endif
+ #endif
+ 
++__extension__ typedef __signed__ long long __s64;
++__extension__ typedef unsigned long long __u64;
++
+ /*
+  * These aren't exported outside the kernel to avoid name space clashes
+  */
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
new file mode 100644
index 000000000000..5e1d7ec28fc4
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21-r1.ebuild
@@ -0,0 +1,133 @@
+# 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.21-r1.ebuild,v 1.1 2003/11/16 18:26:58 kumba Exp $
+
+
+OKV=${PV/_/-}
+KV="${OKV}"
+S=${WORKDIR}/linux-${OKV}
+EXTRAVERSION=" "
+ETYPE="headers"
+inherit kernel
+
+# What's in this kernel?
+
+# INCLUDED:
+# 1) linux sources from kernel.org
+# 2) patch for big-endian machines to fix header issue (currently sparc only)
+
+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="-* amd64 ~sparc ~x86 -mips"
+
+
+# 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}
+
+	# Big Endian architectures need this patch in order to build certain programs properly
+	# Right now, this fix only affects sparc.  Other big-endian archs will need to edit this if they need it.
+	# Issue will be fixed in 2.4.23+ kernel series (issue has been fixed in 2.6.0).
+	# Closes Bug #26062
+	if [ -n "`use sparc`" ]; then
+		epatch ${FILESDIR}/bigendian-byteorder-fix.patch
+	fi
+
+
+	# 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 dep ARCH=sparc || 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."
+}
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
index b8403574202b..cc7eaecc1802 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
@@ -1,13 +1,14 @@
 # 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.21.ebuild,v 1.12 2003/10/30 23:17:54 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.13 2003/11/16 18:26:58 kumba Exp $
 
 
-ETYPE="headers"
-inherit kernel
 OKV=${PV/_/-}
+KV="${OKV}"
 S=${WORKDIR}/linux-${OKV}
-EXTRAVERSION=""
+EXTRAVERSION=" "
+ETYPE="headers"
+inherit kernel
 
 # What's in this kernel?
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
index 436da6dd83e7..1a7456e563a6 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
@@ -1,13 +1,14 @@
 # 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.22.ebuild,v 1.5 2003/10/30 23:17:54 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild,v 1.6 2003/11/16 18:26:58 kumba Exp $
 
 
-ETYPE="headers"
-inherit kernel
 OKV=${PV/_/-}
+KV="${OKV}"
 S=${WORKDIR}/linux-${OKV}
-EXTRAVERSION=""
+EXTRAVERSION=" "
+ETYPE="headers"
+inherit kernel
 
 # What's in this kernel?
 
@@ -52,6 +53,15 @@ src_unpack() {
 		epatch ${FILESDIR}/bigendian-byteorder-fix.patch
 	fi
 
+
+	# 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
 }