Redo some of the libc injections and fixup some of the net-related code.

Package-Manager: portage-2.2_pre5

3 files changed, 52 insertions, 7 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 3ea309e0747a..3005b84db50e 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.263 2008/04/20 03:23:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.264 2008/04/20 20:46:10 vapier Exp $
+
+*linux-headers-2.6.25-r1 (20 Apr 2008)
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +linux-headers-2.6.25-r1.ebuild:
+  Redo some of the libc injections and fixup some of the net-related code.
 
 *linux-headers-2.6.25 (20 Apr 2008)
 
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 9e8ab71207ca..4fe1ed7a29a8 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -12,7 +12,7 @@ DIST gentoo-headers-2.4.36-1.tar.lzma 10846 RMD160 37fd84f716dbaec65c6c4bc5a30d2
 DIST gentoo-headers-2.6.17-5.tar.bz2 24016 RMD160 1ad27d63cd2bfe588999e12b1bc3d99aaa696178 SHA1 d248c017bc1ff9f107d11c956d072730899285a7 SHA256 e4ec1a20c9d384f31bc845976beb333dc9fdbb234979baf127c4fff3359afdd4
 DIST gentoo-headers-2.6.23-5.tar.bz2 8185 RMD160 5c2bb6deb7ab7c2180cc4395d8a56f2ad92b32ed SHA1 d015ce4f8ca1a36b8602f2c5da56da60585815d2 SHA256 108499f4b07d1bb6c4dc6930ba0c7d48499a6dfa2bd2f7d9661b84a7a4f339e9
 DIST gentoo-headers-2.6.24-1.tar.bz2 7393 RMD160 babf5b219a193154c4d33201404a39db486e9a89 SHA1 f1414703e3109346603d3dc39c92dfd6d0b2c6c0 SHA256 0edb9e934f8e6d76dbb5a911b595718a6d516da7561c5012a1ca8d5fbe04c37f
-DIST gentoo-headers-2.6.25-1.tar.lzma 6488 RMD160 a7015fbe457dafb232bd3b226c3ebd1f0015feba SHA1 0879b11d154c9df59a17afac961dde7a98b8c946 SHA256 868e17d3a5eb58caf67bdffc45b4921f89b5ed6928737873073d6feead5e8b73
+DIST gentoo-headers-2.6.25-2.tar.lzma 8168 RMD160 6f5a5311fac14f0a661e0fe7555f7b124d71661c SHA1 2cde13f076b6e298b151c748b44d7952a82910d1 SHA256 2dfb1b47056822b10feccefe1b72c398f652704bce8d5427804e714cc31461dd
 DIST gentoo-headers-base-2.6.23.tar.bz2 4774654 RMD160 506b3cdad53025783fe7f9b30c9150828bdf53e9 SHA1 a00fe87cd741fd04ce49678da41341baa0b0e4cf SHA256 5bb816dceba5b6cb4829b25eb1e06af3c00b5a9f8eca1d6e711965d5020b78ab
 DIST gentoo-headers-base-2.6.24.tar.bz2 4777944 RMD160 f9ed6d92c6b12d67ecfc3301c2021757c615e0bd SHA1 cfb89d2520d57514e8fb147124832c72405addaf SHA256 891790e5abcc73b82d3e1248b221b73b4592f01d28108b9a3c17f52b9153c3f4
 DIST gentoo-headers-base-2.6.25.tar.lzma 3873979 RMD160 be1e6d2070d3369ff593233c383efdf0fad4cbbe SHA1 0d92049a2a9bf5af2a854a7cc700509b5f9432af SHA256 81b4236fedcebc84f30788e074364d0d5f10fee667fa93ff264f977334361b0b
@@ -32,13 +32,13 @@ EBUILD linux-headers-2.4.36.ebuild 610 RMD160 b7460f982042adb0a14748967b3dbf0050
 EBUILD linux-headers-2.6.17-r2.ebuild 1178 RMD160 2ca04dc15bca98c4224d1b2f1abac61440a96803 SHA1 44c1c496145fa10aaf8336e6e647b85bbf5d838c SHA256 73c8c8a41354ea04368b6616825727cc749a03b355098767d14b78e941a325c5
 EBUILD linux-headers-2.6.23-r3.ebuild 1082 RMD160 cdaade84c46000495b1a4919df41d9fbebfad984 SHA1 e1cc4de22fd33aaf45813917f1c5c8588125b503 SHA256 00ca1b2526644200957b436be24d489a34084a8b561edd304a692f1503e197f0
 EBUILD linux-headers-2.6.24.ebuild 1075 RMD160 f67ca9b40ac1330dcfd5b42df7dcd12113af66ce SHA1 a54ca20f689dcace10563f748c7fdf4607562043 SHA256 d1b9a8c512ada7782a135efd762684db761aac2c158b3b5203d1079f1888a1ac
-EBUILD linux-headers-2.6.25.ebuild 1096 RMD160 7c423522e2815bc27816a8ac661fc44a4034061d SHA1 ee1588390e9789b23caa996cfdde8e53fc4c8371 SHA256 85364ef1aa7c638ae4cfa6b8beab2ea83bb0cb28d46bd7b528a87c91ae3fb361
-MISC ChangeLog 45586 RMD160 7016372c92f6517d86860f8e2a017a97b5fb3ddc SHA1 098e386c98302615c8a41425e41d4044978e4523 SHA256 c89dd1220ac6d438ebb3c89c9190475a031bebe8b1d63e80849f3c057b17647f
+EBUILD linux-headers-2.6.25-r1.ebuild 1099 RMD160 74e07183dbb562961776323a9ce473706128f509 SHA1 af09817b8e7bf0e4c942f4a1415984d0ca3937a9 SHA256 a111bf29a9779e70e7f6a914c671a3909bdc38cbd29dba9f5f17562a541da8f1
+MISC ChangeLog 45787 RMD160 799e3e1ef2d5ea1e32ff29c99324613b883f32a5 SHA1 e06b1e779a3e58f25ee73cf8b0d9377e97a54dea SHA256 89b232c380acc52d1bc51f8b3b966de68112cccca406c184b7d9d65cbb13355b
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIC5wij9hvisErhMIRAvYxAJ9zIl7lnDi4cYVr2GsjQq/dnm6NigCgnKa6
-KFNMIwqo7HO3ogEGDIKA1qY=
-=Mz13
+iD8DBQFIC6uYj9hvisErhMIRAiTXAKDJs9WNFeJO4YZ99hNb6bLTPIJFlACdFyQX
+UQ/irUsnnzcSy35SczjCs90=
+=bnBX
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.25-r1.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.25-r1.ebuild
new file mode 100644
index 000000000000..74ae78bd8a8a
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.6.25-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 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.25-r1.ebuild,v 1.1 2008/04/20 20:46:10 vapier Exp $
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arm cris hppa m68k mips ia64 ppc ppc64 s390 sh sparc x86"
+inherit kernel-2
+detect_version
+
+PATCH_VER="2"
+SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.lzma"
+[[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.lzma"
+
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DEPEND="app-arch/lzma-utils"
+RDEPEND=""
+
+S=${WORKDIR}/gentoo-headers-base-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
+}
+
+src_install() {
+	kernel-2_src_install
+	cd "${D}"
+	egrep -r \
+		-e '[[:space:]](asm|volatile|inline)[[:space:](]' \
+		-e '\<([us](8|16|32|64))\>' \
+		.
+	headers___fix $(find -type f)
+}
+
+src_test() {
+	emake -j1 ARCH=$(tc-arch-kernel) headers_check || die
+}