fixup building with gcc-4.1 hosts and superh and some other obscure stuff

(Portage version: 2.1_pre7-r5)

2 files changed, 19 insertions, 10 deletions

diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r4 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r4
index f98435faa1c0..d65d4e4764e3 100644
--- a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r4
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r4
@@ -1,4 +1,12 @@
-MD5 85d53ce597754425a317b25e63e83882 gentoo-headers-2.6.11-9.tar.bz2 21486
+MD5 215998d10621efc7c132b0f28fb9badc gentoo-headers-2.6.11-10.tar.bz2 21945
+RMD160 931ed9455f70674168610971378b854ab00f6f35 gentoo-headers-2.6.11-10.tar.bz2 21945
+SHA256 7e0de6169d0abb7feef5b2f39c302e362f3c4544286427df11d0002f2f04a22d gentoo-headers-2.6.11-10.tar.bz2 21945
 MD5 0880556aadd7dc0b77258dcf4ea9b88b linux-2.6.11-m68k-headers.patch.bz2 12090
+RMD160 d3fc9886b6d2d17b01e37638fc831e1c29d7bdf7 linux-2.6.11-m68k-headers.patch.bz2 12090
+SHA256 0050ad1f1135289e004e45c952d81a58aa6bf947c57b6c31976ae518fb98be86 linux-2.6.11-m68k-headers.patch.bz2 12090
 MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+RMD160 c11918b5db60eb25c42b70eb376106c879678940 linux-2.6.11.tar.bz2 37075679
+SHA256 1fa39c202efe168bfeb0ddd74c8e4814f77da7dc78993e47826bad9173b95808 linux-2.6.11.tar.bz2 37075679
 MD5 8bc41818e91c0fbe6122b2088278a29f linux-2.6.12.1-blackfin.patch.bz2 237386
+RMD160 0c3a76aec152c43ef7f1b6130a1a43e59829cf92 linux-2.6.12.1-blackfin.patch.bz2 237386
+SHA256 7f7d34e07a5581ee120a5847bc21e98ded02df1cfa86856514cfe467a1a4ae8c linux-2.6.12.1-blackfin.patch.bz2 237386
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild
index 5c7111a5cd28..497b890d10de 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild,v 1.12 2006/04/09 17:12:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild,v 1.13 2006/04/11 00:26:53 vapier Exp $
 
 ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
+H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa ia64 m68k nios2 ppc ppc64 s390 sh sparc x86"
 inherit eutils kernel-2
 detect_version
 
-PATCHES_V='9'
+PATCHES_V='10'
 
 SRC_URI="${KERNEL_URI} mirror://gentoo/linux-2.6.11-m68k-headers.patch.bz2
 	mirror://gentoo/linux-2.6.12.1-blackfin.patch.bz2
@@ -24,15 +24,16 @@ kernel-2_hook_premake() {
 	# cris is slightly incomplete so lets fake it enough to get headers
 	mkdir -p arch/cris/boot
 	touch arch/cris/boot/Makefile
-}
-
-src_unpack() {
-	kernel-2_src_unpack
 
 	# This should always be used but it has a bunch of hunks which
 	# apply to include/linux/ which i'm unsure of so only use with
-	# m68k for now (dont want to break other arches)
+	# specific targets for now (dont want to break other arches)
 	[[ $(tc-arch) == "m68k" ]] && epatch "${DISTDIR}"/linux-2.6.11-m68k-headers.patch.bz2
+	[[ $(tc-arch) == "nios2" ]] && epatch "${DISTDIR}"/linux-2.6.11-nios2-headers.patch.bz2
+}
+
+src_unpack() {
+	kernel-2_src_unpack
 
 	# Fixes ... all the mv magic is to keep sed from dumping
 	# ugly warnings about how it can't work on a directory.
@@ -51,6 +52,6 @@ src_unpack() {
 	# Apply patch for spinlick.h only with 32bit userland on ppc64.
 	# Will add to the main patchball when plasmaroo returns.
 	if use ppc && [[ ${PROFILE_ARCH} == "ppc64" ]]; then
-		epatch ${FILESDIR}/2.6.11-ppc64-32ul-spinlock.patch
+		epatch "${FILESDIR}"/2.6.11-ppc64-32ul-spinlock.patch
 	fi
 }