Fix #130026, #130032.

(Portage version: 2.1_pre7-r5)

3 files changed, 17 insertions, 15 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index d36258be8f79..3380ac579a8d 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.171 2006/04/09 17:12:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.172 2006/04/18 15:39:32 plasmaroo Exp $
+
+  18 Apr 2006; <plasmaroo@gentoo.org> linux-headers-2.6.16.ebuild:
+  Fix #130026, #130032.
 
   09 Apr 2006; Markus Rothe <corsair@gentoo.org>
   linux-headers-2.6.11-r4.ebuild:
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.16 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.16
index 16d4211f1a8d..bda19003bcc8 100644
--- a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.16
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.16
@@ -1,6 +1,6 @@
-MD5 a1b4d2015eaca07d3b9b50c205ae7cb3 gentoo-headers-2.6.16-1.tar.bz2 22325
-RMD160 f5ed9fc7fd661ce6284a39ac7ffb8dd3f6fe4a78 gentoo-headers-2.6.16-1.tar.bz2 22325
-SHA256 1555ea967a4f8d854e953194615b8f7e19db8095afa7ac06ea921e7d7682a015 gentoo-headers-2.6.16-1.tar.bz2 22325
+MD5 ecda73e445c13696ed7621b6a3c6e29a gentoo-headers-2.6.16-2.tar.bz2 22914
+RMD160 dbb8c791620298dcfe43da1be4f416b5faf8c16f gentoo-headers-2.6.16-2.tar.bz2 22914
+SHA256 9a1231c082edd75a69bee500bf61dce703a2cf969181a105161e1564fde9786f gentoo-headers-2.6.16-2.tar.bz2 22914
 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
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.16.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.16.ebuild
index 37265ad36261..d106729a5eab 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.16.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.16.ebuild
@@ -1,17 +1,17 @@
 # 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.16.ebuild,v 1.1 2006/03/25 22:05:29 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.16.ebuild,v 1.2 2006/04/18 15:39:32 plasmaroo Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
 inherit eutils kernel-2 multilib
 detect_version
 
-PATCHES_V='1'
+PATCHES_V='2'
 
 SRC_URI="${KERNEL_URI} mirror://gentoo/linux-2.6.11-m68k-headers.patch.bz2
 	http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-headers/gentoo-headers-${PV}-${PATCHES_V}.tar.bz2"
-KEYWORDS="-*" # -ppc -ppc64
+KEYWORDS="-*"
 
 DEPEND="ppc? ( gcc64? ( sys-devel/gcc-powerpc64 ) )
 		sparc? ( gcc64? ( sys-devel/gcc-sparc64 ) )"
@@ -23,7 +23,7 @@ wrap_headers_fix() {
 	do
 		echo -n " $1/"
 		cd ${S}/include/$1
-		headers___fix $(find . -mindepth 1 -type f -print)
+		headers___fix $(find . -type f -print)
 		shift
 	done
 	echo
@@ -38,16 +38,15 @@ src_unpack() {
 	# m68k for now (dont want to break other arches)
 	[[ $(tc-arch) == "m68k" ]] && epatch "${DISTDIR}"/linux-2.6.11-m68k-headers.patch.bz2
 
-	# Fixes ... all the mv magic is to keep sed from dumping
+	# Get headers to bootstrap on PPC
+	if use ppc; then
+		cp arch/powerpc/configs/pmac32_defconfig arch/powerpc/configs/ppc_defconfig
+	fi
+
+	# Fixes ... all the wrapper magic is to keep sed from dumping
 	# ugly warnings about how it can't work on a directory.
 	cd "${S}"/include
 	einfo "Applying automated fixes:"
 	wrap_headers_fix asm-* linux
 	einfo "... done"
-
-	# 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
-	fi
 }