Remove s6_addr* defines to stop clobbering glibc #225505.

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+

3 files changed, 52 insertions, 5 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index b8b0983d41c1..fcd78844d6d7 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.269 2008/05/15 02:30:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.270 2008/06/09 09:49:22 vapier Exp $
+
+*linux-headers-2.6.25-r4 (09 Jun 2008)
+
+  09 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  +linux-headers-2.6.25-r4.ebuild:
+  Remove s6_addr* defines to stop clobbering glibc #225505.
 
 *linux-headers-2.6.25-r3 (15 May 2008)
 
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index cfb0e1e2a17e..f428aeb5c4b5 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -14,6 +14,7 @@ DIST gentoo-headers-2.6.23-5.tar.bz2 8185 RMD160 5c2bb6deb7ab7c2180cc4395d8a56f2
 DIST gentoo-headers-2.6.24-1.tar.bz2 7393 RMD160 babf5b219a193154c4d33201404a39db486e9a89 SHA1 f1414703e3109346603d3dc39c92dfd6d0b2c6c0 SHA256 0edb9e934f8e6d76dbb5a911b595718a6d516da7561c5012a1ca8d5fbe04c37f
 DIST gentoo-headers-2.6.25-2.tar.lzma 8168 RMD160 6f5a5311fac14f0a661e0fe7555f7b124d71661c SHA1 2cde13f076b6e298b151c748b44d7952a82910d1 SHA256 2dfb1b47056822b10feccefe1b72c398f652704bce8d5427804e714cc31461dd
 DIST gentoo-headers-2.6.25-4.tar.lzma 8608 RMD160 df944a12add1ee8daa9d8b4c7b3d2a381958baf3 SHA1 cef481da3dfeb0b1605c67ff5083da934bfab9ac SHA256 67a7f1f1afdf5b4385bb096a40e8ebc82b5a7daf0d69e64fc94923378eef720c
+DIST gentoo-headers-2.6.25-5.tar.lzma 8729 RMD160 db5bf6436beecea82240d3c1dbff7cb30db327e2 SHA1 5ee77643f2eef45aeb022337ec606cf811974d2b SHA256 c24881f1a4d02d1358753ed8ae7c4b978530a75b07998776a370e3d269a248d0
 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
@@ -35,12 +36,13 @@ EBUILD linux-headers-2.6.23-r3.ebuild 1082 RMD160 cdaade84c46000495b1a4919df41d9
 EBUILD linux-headers-2.6.24.ebuild 1073 RMD160 93e871762f627b1330fb8970b329326c2de4f751 SHA1 01220e4495106dcfad1cb31c4e4c31dfd635e22c SHA256 a74a56ab0849ee9b773c4271d6afdcd9b403f9a4ec3c6446df972ef4fe4fec50
 EBUILD linux-headers-2.6.25-r1.ebuild 1100 RMD160 ec35f28b95b23d43b554df0195bf958a4a4e6e80 SHA1 44c63fdeba098a315c01de97a1134b873284d847 SHA256 14f3edce0b1f74f204f21f65512efc1c4eeb64f3e39f84dcbc913ce5a5a0452d
 EBUILD linux-headers-2.6.25-r3.ebuild 1099 RMD160 329efc8daa891b7b148a23863f21c24c958bab38 SHA1 d9b01ad36e7a4beab4f7ccb0ba4325b1ac8cbc16 SHA256 7c63f9138a2f0034ff8b72f6dfbfe8adb1fbed371ac1d424e7a66d1af52a71a5
-MISC ChangeLog 46485 RMD160 9db6e3ca9e7677213f717c33d6f893a8265e7bc9 SHA1 5d92caaacf3692e1b87cfbf53cf8c08fbe667763 SHA256 034b2354248a7d88f03501ad33b6662c01112c572936d8ff169d1588254ce338
+EBUILD linux-headers-2.6.25-r4.ebuild 1099 RMD160 d36035ae23c2c10be7320370173dace051492664 SHA1 4831269f43719c4d7532624b6b3e2629d2754c96 SHA256 fe7763fa6fb14635a6370eddc0386ad163f04e6d5dd075a40212cb6164cdf59c
+MISC ChangeLog 46671 RMD160 fc9def409b6dca42a5dc8c74e5726fb0d87f146c SHA1 cd726c2e47884b6f421b4df23e0e1bf73bb76318 SHA256 dc72d84fc0572ae9af0c926f2d4afb4c7e552ed9460779877354a798c5362dcf
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIK6BSj9hvisErhMIRAgHfAJ4yNOu1hcVhYAEtmhabnLFOcfV9jwCgpp+7
-ngmWBulgvYMERc9IpIMORyw=
-=QIPh
+iD8DBQFITPyoj9hvisErhMIRApkyAJ9H79hr9RJSicjuUF2SSlBcOZtGFQCghx3D
+8S/wFp1b2OjSk+myekSEBTA=
+=xubr
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.25-r4.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.25-r4.ebuild
new file mode 100644
index 000000000000..9d2d023610e4
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-2.6.25-r4.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-r4.ebuild,v 1.1 2008/06/09 09:49:22 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="5"
+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
+}