Fix #100703, #114767.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 116 insertions, 2 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 569ec7492eed..42535268e969 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.154 2005/12/19 21:18:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.155 2005/12/22 00:52:16 plasmaroo Exp $
+
+*linux-headers-2.6.11-r4 (21 Dec 2005)
+
+  21 Dec 2005; <plasmaroo@gentoo.org> +linux-headers-2.6.11-r4.ebuild,
+  +linux-headers-2.6.15_rc6.ebuild:
+  Fix #100703, #114767.
 
   19 Dec 2005; <plasmaroo@gentoo.org> linux-headers-2.6.11-r3.ebuild:
   Fix #112722, #115708.
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 50279cae2ecd..e03c1bf70baf 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,9 +1,10 @@
-MD5 8ba225a9de5ac03b9f95f85b53547129 ChangeLog 30580
+MD5 4bfd459df83e9e4dc81cdb692a3d0fb2 ChangeLog 30752
 MD5 1c43697b46cd87859708b7601424a258 linux-headers-2.2.26.ebuild 2502
 MD5 35c5f3bbb5efdf7b8c5fc97d27f32393 linux-headers-2.4.23.ebuild 3470
 MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
 MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
 MD5 6cf8a3d5b351f3a78641e8cd3979ffff linux-headers-2.6.11-r2.ebuild 1694
+MD5 b2c56fc3ef405d0283aa9cbe5d0ff796 linux-headers-2.6.11-r4.ebuild 1802
 MD5 83dfc41af41e560a10c1f0ed5c2a8c11 linux-headers-2.4.21-r1.ebuild 3933
 MD5 6a3b45eded92aace1a5df1a478fa977b linux-headers-2.4.26.ebuild 3340
 MD5 c29c48dc661695aeebaf78abbe8a81c3 linux-headers-2.4.22.ebuild 4017
@@ -14,6 +15,7 @@ MD5 8900244be832ceab8b7a5fbc2a3734df linux-headers-2.4.26-r1.ebuild 769
 MD5 7a20e26b7cddf8179591f77334b5641c linux-headers-2.4.25.ebuild 3410
 MD5 1b900a0e84285a3ed937541e17499296 linux-headers-2.4.22-r1.ebuild 4066
 MD5 716932740170ef6fda36c412ae06879a linux-headers-2.0.40.ebuild 1808
+MD5 6cc514b52ecc793b7cf315a4c1cdccae linux-headers-2.6.15_rc6.ebuild 1751
 MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
 MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
 MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
@@ -25,6 +27,7 @@ MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
 MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
+MD5 5259cd19055f60c0f7738103e73995e7 files/digest-linux-headers-2.6.15_rc6 291
 MD5 1c81c4ed9c2867aa281bbabbf507e096 files/linux-headers-2.4-arm-cris-ELF_DATA.patch 604
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 14c583e9ea29b2a3fc88349685cce2f4 files/linux-headers-soundcard-ppc64.patch 722
@@ -36,4 +39,5 @@ MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1
 MD5 e32b5df37d1bd1fde32f19276f8bc5e2 files/2.6.11-ppc64-32ul-spinlock.patch 510
 MD5 833edf786e2038e76bf5de8de80a3b7a files/unistd.h-i386-pic.patch 4312
 MD5 76f2374cb41045ea36cae2fa0dcd063e files/linux-headers-2.4-errno-in-unistd.patch 226
+MD5 202f4fbd303907a14ad1af3510b94f8c files/digest-linux-headers-2.6.11-r4 221
 MD5 76c239f03201f79b357eafb37e213bb6 files/linux-headers-2.4-armeb-stat.patch 1406
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
new file mode 100644
index 000000000000..bd4e6d89ac3f
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r4
@@ -0,0 +1,3 @@
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+MD5 0880556aadd7dc0b77258dcf4ea9b88b linux-2.6.11-m68k-headers.patch.bz2 12090
+MD5 6167a798f805ceec63e3909348acbae7 gentoo-headers-2.6.11-7.tar.bz2 21194
diff --git a/sys-kernel/linux-headers/files/digest-linux-headers-2.6.15_rc6 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.15_rc6
new file mode 100644
index 000000000000..2cfcf0dd1f2d
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.15_rc6
@@ -0,0 +1,4 @@
+MD5 9c1d46fca842361a84e499e851c7548e patch-2.6.15-rc6.bz2 6224690
+MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
+MD5 0880556aadd7dc0b77258dcf4ea9b88b linux-2.6.11-m68k-headers.patch.bz2 12090
+MD5 b67d982a61e89e7a486545965b4013c0 gentoo-headers-2.6.15_rc6-1.tar.bz2 19706
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
new file mode 100644
index 000000000000..506f094e1130
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 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.1 2005/12/22 00:52:16 plasmaroo Exp $
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
+inherit eutils kernel-2
+detect_version
+
+PATCHES_V='7'
+
+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="-* ~alpha ~ppc" # Do *not* add other archs, this is a revbump-forcer for only #114767 and #115708.
+
+DEPEND="ppc? ( gcc64? ( sys-devel/gcc-powerpc64 ) )
+		sparc? ( gcc64? ( sys-devel/gcc-sparc64 ) )"
+
+UNIPATCH_LIST="${DISTDIR}/gentoo-headers-${PV}-${PATCHES_V}.tar.bz2"
+
+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)
+	[[ $(tc-arch) == "m68k" ]] && epatch "${DISTDIR}"/linux-2.6.11-m68k-headers.patch.bz2
+
+	# Fixes ... all the mv magic is to keep sed from dumping
+	# ugly warnings about how it can't work on a directory.
+	cd "${S}"/include
+	mv asm-ia64/sn asm-ppc64/iSeries .
+	headers___fix asm-ia64/*
+	mv sn asm-ia64/
+	headers___fix asm-ppc64/*
+	mv iSeries asm-ppc64/
+	headers___fix asm-ppc64/iSeries/*
+	headers___fix linux/{ethtool,jiffies}.h
+
+	# #114767...
+	headers___fix asm-alpha/bitops.h linux/{bitops,wait}.h
+
+	# 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
+}
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.15_rc6.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.15_rc6.ebuild
new file mode 100644
index 000000000000..2fb8c36975cb
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.6.15_rc6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 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.15_rc6.ebuild,v 1.1 2005/12/22 00:52:16 plasmaroo Exp $
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
+inherit eutils kernel-2
+detect_version
+
+PATCHES_V='1'
+
+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
+
+DEPEND="ppc? ( gcc64? ( sys-devel/gcc-powerpc64 ) )
+		sparc? ( gcc64? ( sys-devel/gcc-sparc64 ) )"
+
+UNIPATCH_LIST="${DISTDIR}/gentoo-headers-${PV}-${PATCHES_V}.tar.bz2"
+
+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)
+	[[ $(tc-arch) == "m68k" ]] && epatch "${DISTDIR}"/linux-2.6.11-m68k-headers.patch.bz2
+
+	# Fixes ... all the mv magic is to keep sed from dumping
+	# ugly warnings about how it can't work on a directory.
+	cd "${S}"/include
+	mv asm-ia64/sn asm-ppc64/iSeries .
+	headers___fix asm-ia64/*
+	mv sn asm-ia64/
+	headers___fix asm-ppc64/*
+	mv iSeries asm-ppc64/
+	headers___fix asm-ppc64/iSeries/*
+	headers___fix linux/{ethtool,jiffies}.h
+
+	# #114767...
+	headers___fix asm-alpha/bitops.h linux/{bitops,wait}.h
+	headers___fix asm-generic/*
+
+	# 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
+}