Fix #82243, #100659, #104845, #108521.

Package-Manager: portage-2.0.51.22-r2

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 0477ec36b77beaa49ce11f5bfcdc2c05e20a33eb..6b0ed826fd42231361885206afe2af6b0b510354 100644 (file)
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,11 @@
 # 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.148 2005/10/31 21:17:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.149 2005/11/18 23:46:23 plasmaroo Exp $
+
+*linux-headers-2.6.11-r3 (18 Nov 2005)
+
+  18 Nov 2005; <plasmaroo@gentoo.org> +linux-headers-2.6.11-r3.ebuild:
+  Fix #82243, #100659, #104845, #108521.
 
   31 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
   linux-headers-2.6.11-r2.ebuild:

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 6f1d366049321dfc01786ba403bb5564a1f123a8..73a916f8648a6afae52b20910984fb596f1c9bfa 100644 (file)
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,46 +1,38 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 193016a60a4803742810a25c4724a20d ChangeLog 29814
-MD5 e32b5df37d1bd1fde32f19276f8bc5e2 files/2.6.11-ppc64-32ul-spinlock.patch 510
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
-MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
-MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
-MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22-r1 67
-MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
-MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
-MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
-MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
+MD5 5e7ba65c7c9aa5e0a5a9c4395b3ca036 ChangeLog 29970
+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 63a80fbdb4dcc49e6f133e1a037807bb linux-headers-2.6.11-r2.ebuild 1698
+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
+MD5 4b7f9dd73295707d019c97d76b76a021 linux-headers-2.6.8.1-r4.ebuild 1213
+MD5 210a17e3aad60927524a64e0179b068d linux-headers-2.4.21.ebuild 3719
+MD5 50f0269653dbe0f2a66dace878ac3a82 linux-headers-2.6.11-r3.ebuild 1789
+MD5 61afe60e78e1d32c3d92deb8a6652cf6 linux-headers-2.4.26-r1.ebuild 648
+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 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
-MD5 cb585d867113ccb42003ad196dfb1e01 files/digest-linux-headers-2.6.11-r2 221
+MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
+MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
 MD5 48ebb9368ff477da66306503da02c6fd files/digest-linux-headers-2.6.8.1-r4 222
 MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
+MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
+MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
+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 1c81c4ed9c2867aa281bbabbf507e096 files/linux-headers-2.4-arm-cris-ELF_DATA.patch 604
-MD5 76c239f03201f79b357eafb37e213bb6 files/linux-headers-2.4-armeb-stat.patch 1406
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 14c583e9ea29b2a3fc88349685cce2f4 files/linux-headers-soundcard-ppc64.patch 722
+MD5 bff11498895d00e8dcbcfa09ddfd5eb6 files/digest-linux-headers-2.6.11-r3 221
+MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22-r1 67
+MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
+MD5 cb585d867113ccb42003ad196dfb1e01 files/digest-linux-headers-2.6.11-r2 221
 MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
+MD5 e32b5df37d1bd1fde32f19276f8bc5e2 files/2.6.11-ppc64-32ul-spinlock.patch 510
 MD5 833edf786e2038e76bf5de8de80a3b7a files/unistd.h-i386-pic.patch 4312
-MD5 716932740170ef6fda36c412ae06879a linux-headers-2.0.40.ebuild 1808
-MD5 1c43697b46cd87859708b7601424a258 linux-headers-2.2.26.ebuild 2502
-MD5 83dfc41af41e560a10c1f0ed5c2a8c11 linux-headers-2.4.21-r1.ebuild 3933
-MD5 210a17e3aad60927524a64e0179b068d linux-headers-2.4.21.ebuild 3719
-MD5 1b900a0e84285a3ed937541e17499296 linux-headers-2.4.22-r1.ebuild 4066
-MD5 c29c48dc661695aeebaf78abbe8a81c3 linux-headers-2.4.22.ebuild 4017
-MD5 35c5f3bbb5efdf7b8c5fc97d27f32393 linux-headers-2.4.23.ebuild 3470
-MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
-MD5 7a20e26b7cddf8179591f77334b5641c linux-headers-2.4.25.ebuild 3410
-MD5 61afe60e78e1d32c3d92deb8a6652cf6 linux-headers-2.4.26-r1.ebuild 648
-MD5 6a3b45eded92aace1a5df1a478fa977b linux-headers-2.4.26.ebuild 3340
-MD5 3ab8424f2f5ef97a7c213c582ded7b71 linux-headers-2.6.11-r2.ebuild 1777
-MD5 4b7f9dd73295707d019c97d76b76a021 linux-headers-2.6.8.1-r4.ebuild 1213
-MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDaVHXgIKl8Uu19MoRAumkAJ9nwfKMiJ6aIeBZxBSKTnhLULp8VwCdHDYc
-8Xy1NAp5q3X9jk5QAQwaijk=
-=GSZM
------END PGP SIGNATURE-----
+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-r3 b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r3
new file mode 100644 (file)
index 0000000..ab27b1b
--- /dev/null
+++ b/sys-kernel/linux-headers/files/digest-linux-headers-2.6.11-r3
@@ -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 add60b5600598ebf36fda5957f751ead gentoo-headers-2.6.11-6.tar.bz2 20684

diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
index 42b4d864f38e54a4ff99594765b34c6299a4bac7..373368723608393b3ed58d724df5210aeb35239f 100644 (file)
--- a/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.19 2005/10/31 21:17:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r2.ebuild,v 1.20 2005/11/18 23:46:23 plasmaroo Exp $
 
 ETYPE="headers"
 H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
@@ -11,7 +11,7 @@ PATCHES_V='5'
 
 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 amd64 arm hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86" # Not tested to be fully stable, if things break file bugs to plasmaroo please...
+KEYWORDS="-* ~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86"
 
 DEPEND="ppc? ( gcc64? ( sys-devel/gcc-powerpc64 ) )
                sparc? ( gcc64? ( sys-devel/gcc-sparc64 ) )"

diff --git a/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild
new file mode 100644 (file)
index 0000000..f422c00
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11-r3.ebuild
@@ -0,0 +1,45 @@
+# 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-r3.ebuild,v 1.1 2005/11/18 23:46:23 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='6'
+
+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 ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" # Not tested to be fully stable, if things break file bugs to plasmaroo please...
+
+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
+
+       # 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
+}