fixup building with gcc-4.1 hosts and superh and some other obscure stuff

Package-Manager: portage-2.1_pre7-r5

3 files changed, 119 insertions, 12 deletions

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 84c66ef70146..343a02ef841b 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,44 +1,142 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 43af51414d785ee4cd3c1ee21b63ff95 ChangeLog 33099
+RMD160 5e8d44bf5db5209e700cad177d6832292da8fe6c ChangeLog 33099
+SHA256 0ee8095be51bb5ec4795282576ad661c5ca0dd27b22c42d227bad2d376aa5e02 ChangeLog 33099
 MD5 e32b5df37d1bd1fde32f19276f8bc5e2 files/2.6.11-ppc64-32ul-spinlock.patch 510
+RMD160 1a8a5a7c96049c7cac243022143fd7f20d678495 files/2.6.11-ppc64-32ul-spinlock.patch 510
+SHA256 ffb32af7a072d8e6c87b73eb525744da2442d472ca0f26af4e3f4468074453e3 files/2.6.11-ppc64-32ul-spinlock.patch 510
 MD5 505d7b7cd4ace73dbd5473c7fd3cdf37 files/2.6.11-s390-cflags-update.patch 391
+RMD160 82fb47c4e0c5554df5e22015a1a6a047d5c9d4aa files/2.6.11-s390-cflags-update.patch 391
+SHA256 f421a6923044356e3b2a57d49dc1b0f70998522d2c0e39d142563841eeb5d6ca files/2.6.11-s390-cflags-update.patch 391
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+RMD160 3ce8fa328938fd8ec3254ae1f59bdb3122665ec7 files/bigendian-byteorder-fix.patch 1557
+SHA256 1c22d44ddb47095597cdbfce86e5b0e94060bab7d986165d8f4cd55d64e2d628 files/bigendian-byteorder-fix.patch 1557
 MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
+RMD160 617d8f3ea4a2fd806a1e0ad9fc6983ea03c9b468 files/digest-linux-headers-2.0.40 66
+SHA256 4ece3e070b473d46bc025a4b7d4769998672a8ce5bccc8119a19740c78c9e3f0 files/digest-linux-headers-2.0.40 66
 MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
+RMD160 a56f86f943811bf987c9105750de45fb85daa5a9 files/digest-linux-headers-2.2.26 67
+SHA256 bf7fcbe02f2ede9afbac227d7ed043e5233270d865ea1fe20f442bbfdd0b493d files/digest-linux-headers-2.2.26 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
+RMD160 521fa19459bd3094e1b5128360641d615fdb3d19 files/digest-linux-headers-2.4.21 67
+SHA256 b82bbdc7a9926c429c55aa56cc8ade6238f07e1874a4cc76047026b2313acdee files/digest-linux-headers-2.4.21 67
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
+RMD160 521fa19459bd3094e1b5128360641d615fdb3d19 files/digest-linux-headers-2.4.21-r1 67
+SHA256 b82bbdc7a9926c429c55aa56cc8ade6238f07e1874a4cc76047026b2313acdee files/digest-linux-headers-2.4.21-r1 67
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
+RMD160 6f92cc5d51bb6748a1fc7e6c4a537662352e8325 files/digest-linux-headers-2.4.22 67
+SHA256 43e5597650b9c8236f705276f06df201bb1e456a52c367fb64c1ba1d570884dc files/digest-linux-headers-2.4.22 67
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22-r1 67
+RMD160 6f92cc5d51bb6748a1fc7e6c4a537662352e8325 files/digest-linux-headers-2.4.22-r1 67
+SHA256 43e5597650b9c8236f705276f06df201bb1e456a52c367fb64c1ba1d570884dc files/digest-linux-headers-2.4.22-r1 67
 MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
+RMD160 bef26a703432b39a6a5c73c0155f98820481ef81 files/digest-linux-headers-2.4.23 67
+SHA256 1a744ffc03beee81cdf6bf23922844c8fc16ccef95a839fc8bc476b2834c8ab0 files/digest-linux-headers-2.4.23 67
 MD5 545a151ce959e51f4e528e3c27cb5a65 files/digest-linux-headers-2.4.23_p3 131
+RMD160 6f05378f0226c86760580e198c10de602e3cbfad files/digest-linux-headers-2.4.23_p3 131
+SHA256 f8cc38538515a82c7864f8713987fb9e07d6925665f516b1d46ddfba72d40fff files/digest-linux-headers-2.4.23_p3 131
 MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
+RMD160 465891373d5003ee40a970b8b0f6879ae6cc62ae files/digest-linux-headers-2.4.25 67
+SHA256 8dc618366717585925ec4046474d04f293b833464e806fa602f7a8da37ba7982 files/digest-linux-headers-2.4.25 67
 MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26 67
+RMD160 bf21c0901991df3e07c4972839acd6b2b104885b files/digest-linux-headers-2.4.26 67
+SHA256 442d214f5d63ea28e1fffd370a3b33723ec409d355c6dbf5fcc69733f5795a0a files/digest-linux-headers-2.4.26 67
 MD5 2574d3f1b776f2df365737f456bfe435 files/digest-linux-headers-2.4.26-r1 67
+RMD160 bf21c0901991df3e07c4972839acd6b2b104885b files/digest-linux-headers-2.4.26-r1 67
+SHA256 442d214f5d63ea28e1fffd370a3b33723ec409d355c6dbf5fcc69733f5795a0a files/digest-linux-headers-2.4.26-r1 67
 MD5 08533e8784acbb47346aff25b70012e1 files/digest-linux-headers-2.6.11-r2 299
+RMD160 f7c386725f389f784d709772bf34be1771a08290 files/digest-linux-headers-2.6.11-r2 299
+SHA256 738e52b980dd5255d6729230131c683b04edd280b6f5c9ba9a978834989f63c9 files/digest-linux-headers-2.6.11-r2 299
 MD5 50a036b82daeaea72417b321fee30933 files/digest-linux-headers-2.6.11-r3 299
-MD5 a6730dc8413207f8dc2bbe236238f322 files/digest-linux-headers-2.6.11-r4 299
+RMD160 eaee9919c695c57772a48476e84de405939ffc22 files/digest-linux-headers-2.6.11-r3 299
+SHA256 02d643743180afd02842c560edff2b20ed4ca73b4c5ce47e5c496910cf7e7f42 files/digest-linux-headers-2.6.11-r3 299
+MD5 47d9a960af05bfc2f55e85c55ba81378 files/digest-linux-headers-2.6.11-r4 1084
+RMD160 4e0a6fa6a87189a2a1c8ffabde244047f913b18f files/digest-linux-headers-2.6.11-r4 1084
+SHA256 be9504887ef4936a57695dd7eda2f264c3346c938b1f7511ba7837794cacac8b files/digest-linux-headers-2.6.11-r4 1084
 MD5 a36d0ed3dff1f59841ff71b625a6bbb8 files/digest-linux-headers-2.6.16 801
+RMD160 512e26fe968382a4b77474bbeeb55fc8f82d3281 files/digest-linux-headers-2.6.16 801
+SHA256 808d8365e686061118a9fefa218559a574b1f1799ae72b545878ab885d2c9498 files/digest-linux-headers-2.6.16 801
 MD5 48ebb9368ff477da66306503da02c6fd files/digest-linux-headers-2.6.8.1-r4 222
+RMD160 204e3f17610b96684793e23253f69c49136ae6f9 files/digest-linux-headers-2.6.8.1-r4 222
+SHA256 bbe87d8c133b4b4587584ef02287faab2b75573a177948e6d6ba5d0b893e023e files/digest-linux-headers-2.6.8.1-r4 222
 MD5 45ff5cde07cfe93ecbb514226def606f files/generate-asm-sparc 1661
+RMD160 c83392ab70db0221240ba1043d237bd8b38b53de files/generate-asm-sparc 1661
+SHA256 d62f73ee86c15cc86497419951ccc02780b75b65589a138ecb26f2195a0acc67 files/generate-asm-sparc 1661
 MD5 1c81c4ed9c2867aa281bbabbf507e096 files/linux-headers-2.4-arm-cris-ELF_DATA.patch 604
+RMD160 e87aa9384fa404f0253e351217a54b5d19abcecf files/linux-headers-2.4-arm-cris-ELF_DATA.patch 604
+SHA256 883099ac26194b7eb18b150bbc2f120572e871decd7db4528ed1daa441e81b69 files/linux-headers-2.4-arm-cris-ELF_DATA.patch 604
 MD5 76c239f03201f79b357eafb37e213bb6 files/linux-headers-2.4-armeb-stat.patch 1406
+RMD160 0cb1fb012e4b766f6e1e9bfd350e440d36568c39 files/linux-headers-2.4-armeb-stat.patch 1406
+SHA256 21889fddaac10342ebe61c88c09498f3a5f96737c3e173132beacb6f356c4d10 files/linux-headers-2.4-armeb-stat.patch 1406
 MD5 76f2374cb41045ea36cae2fa0dcd063e files/linux-headers-2.4-errno-in-unistd.patch 226
+RMD160 21ea3224da855f047c42972fa4926f4b4c6ddbe7 files/linux-headers-2.4-errno-in-unistd.patch 226
+SHA256 3c0a03bfd9e8011cccff7b39870dde7912785704332f8a347df7a1cb6c017a0a files/linux-headers-2.4-errno-in-unistd.patch 226
 MD5 14c583e9ea29b2a3fc88349685cce2f4 files/linux-headers-soundcard-ppc64.patch 722
+RMD160 34098233034fbff6a5a9e462d517b5a87000d33a files/linux-headers-soundcard-ppc64.patch 722
+SHA256 c584d6dc683a2d6ce5b798df33f0f757c1227a2ad839cfd40b84dc559e2cb252 files/linux-headers-soundcard-ppc64.patch 722
 MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
+RMD160 f2ab9154810f7ec94fde147abfe3bed084733535 files/linux-headers-strict-ansi-fix.patch 1486
+SHA256 b22d68d655ee65cdbbbe0750682fa7873d75fd19cd04cbe0a165d15a97b60afd files/linux-headers-strict-ansi-fix.patch 1486
 MD5 833edf786e2038e76bf5de8de80a3b7a files/unistd.h-i386-pic.patch 4312
+RMD160 fad74589ec159b556452b494a766a31cf23d8d1a files/unistd.h-i386-pic.patch 4312
+SHA256 c9b9d8799eb09a42779dc39b626d269bcccea79e970fb84398d6a2e97c2d9bb5 files/unistd.h-i386-pic.patch 4312
 MD5 716932740170ef6fda36c412ae06879a linux-headers-2.0.40.ebuild 1808
+RMD160 7efaacbd19ed8199d48c1551c71c0d00c67c6250 linux-headers-2.0.40.ebuild 1808
+SHA256 3ed5c8722d94886ae12715e60172f217b8d1222a412c617a78f7e4270270b21b linux-headers-2.0.40.ebuild 1808
 MD5 1c43697b46cd87859708b7601424a258 linux-headers-2.2.26.ebuild 2502
+RMD160 d629565254ce26e64eb18f435afa6e11fef555b2 linux-headers-2.2.26.ebuild 2502
+SHA256 c9058c44d67b37cf27302e39caa60ed63001c6ddc87a0ab5cdf41479f0111563 linux-headers-2.2.26.ebuild 2502
 MD5 a2a5e78513efa43a18e8b73b372c98f0 linux-headers-2.4.21-r1.ebuild 3930
+RMD160 e0802e01be8bbccddcf39bf0264fdbd150decba4 linux-headers-2.4.21-r1.ebuild 3930
+SHA256 648a9ed8257c5c8739ba3d14e19d85318391f9be2d036d243683e0734b11cf0b linux-headers-2.4.21-r1.ebuild 3930
 MD5 971ea18cb4c8e708e59090cf3677f32a linux-headers-2.4.21.ebuild 3716
+RMD160 171376f731ce8de8e227af326d0b74099ba6bf97 linux-headers-2.4.21.ebuild 3716
+SHA256 8b5d770503b11e2c983e5a43085f3db466e5ee7acf8e08a77c0d80a679bee12e linux-headers-2.4.21.ebuild 3716
 MD5 1b900a0e84285a3ed937541e17499296 linux-headers-2.4.22-r1.ebuild 4066
+RMD160 812ab7397d4e471f567f9fcaa1264eab047e9296 linux-headers-2.4.22-r1.ebuild 4066
+SHA256 fdc20f5a376f9b26263cc28604d189976f647326e0d6dc6cc3c947158bba7775 linux-headers-2.4.22-r1.ebuild 4066
 MD5 c29c48dc661695aeebaf78abbe8a81c3 linux-headers-2.4.22.ebuild 4017
+RMD160 b6d18de85bf4298fb41698c90ebe277cdbe5c168 linux-headers-2.4.22.ebuild 4017
+SHA256 29a258b385b0f4174e16c930781a68b8840fddf84fb78d5550cacd72a0fbac8a linux-headers-2.4.22.ebuild 4017
 MD5 35c5f3bbb5efdf7b8c5fc97d27f32393 linux-headers-2.4.23.ebuild 3470
+RMD160 00acec7246ab694217d3376c217389500a701a2c linux-headers-2.4.23.ebuild 3470
+SHA256 dedea5c7f3affb4f85e49b01bef7494e0c818c8fd0db8f318d044f004233896b linux-headers-2.4.23.ebuild 3470
 MD5 06eb1588f23861450f2d8b2e8379352b linux-headers-2.4.23_p3.ebuild 1267
+RMD160 d934faae5757dc69f4b29a4fb2304a8f80258198 linux-headers-2.4.23_p3.ebuild 1267
+SHA256 7188b4e8c7a978a58071bb27db512240be2ea7186bcad101df849b52a27a17e2 linux-headers-2.4.23_p3.ebuild 1267
 MD5 7a20e26b7cddf8179591f77334b5641c linux-headers-2.4.25.ebuild 3410
+RMD160 f84eec78868ebecac2cd20da46b1d693445b9990 linux-headers-2.4.25.ebuild 3410
+SHA256 133475da8ef8b54cf1e5084cfc3121ce38624ed0e7b642e767af74bc931d1abc linux-headers-2.4.25.ebuild 3410
 MD5 87c2d0fd47529cc76e96bfe0ffb7db82 linux-headers-2.4.26-r1.ebuild 775
+RMD160 c54322e13e96bee0dcf5004a52ddc560f34c7868 linux-headers-2.4.26-r1.ebuild 775
+SHA256 d0455c5924335ff5521ea89efae448279fba642983f2b4d8c41042354dca2ecc linux-headers-2.4.26-r1.ebuild 775
 MD5 da434d4a8e489fbbd6ff72d550db12ac linux-headers-2.4.26.ebuild 3336
+RMD160 e4a82259da9b374715abc62ed40253c325fca92f linux-headers-2.4.26.ebuild 3336
+SHA256 cced65636ef2c6b26be7d6dd3faa8cccf8b2abdca598678cb4efde7e02341af3 linux-headers-2.4.26.ebuild 3336
 MD5 35a08ce92d78b165f66c9d9748623dc0 linux-headers-2.6.11-r2.ebuild 2009
+RMD160 4f9e9531b20606c0863949f6e6ecf5dbde779903 linux-headers-2.6.11-r2.ebuild 2009
+SHA256 794d1ca8ee606b9b3623f1181787009e553ffa9f63f39f6cf5a4bb09d09c7240 linux-headers-2.6.11-r2.ebuild 2009
 MD5 a263e361055f27d3c0bc0e2d860c2834 linux-headers-2.6.11-r3.ebuild 2128
-MD5 ee2508d66c11649cae46d6dc0ef8dd09 linux-headers-2.6.11-r4.ebuild 2104
+RMD160 584ef7282f75a869e539fdef3567d67993d9823c linux-headers-2.6.11-r3.ebuild 2128
+SHA256 6b03eddd8ecfb3a854eb1ee2fd43519cfbc3ec0b0bd90fa3b6578555c6b2249b linux-headers-2.6.11-r3.ebuild 2128
+MD5 964b0676a29c53ff179e3537f136fe29 linux-headers-2.6.11-r4.ebuild 2213
+RMD160 00867d28c847c980adafa00a1db239c2f7eaf040 linux-headers-2.6.11-r4.ebuild 2213
+SHA256 aa1c71f11255845d7b15244e6cd6ba72da9375325823b14101d6e7c37f22c569 linux-headers-2.6.11-r4.ebuild 2213
 MD5 d179b941b60f07cada0787668a657cef linux-headers-2.6.16.ebuild 1705
+RMD160 9266f5e7d2fbb91be190e0f3f37b133a619eec13 linux-headers-2.6.16.ebuild 1705
+SHA256 4cc9d5a4454a717e6aa2310999342ea4d83a0fc36ed880b79be90f5395b48bc4 linux-headers-2.6.16.ebuild 1705
 MD5 4b7f9dd73295707d019c97d76b76a021 linux-headers-2.6.8.1-r4.ebuild 1213
+RMD160 ca75428c3e168eaf4b01cdd4f6c92e76181ba38e linux-headers-2.6.8.1-r4.ebuild 1213
+SHA256 c87234093af71505f599979e863a05c46cbb093717187eceb42c79b18b0fa31b linux-headers-2.6.8.1-r4.ebuild 1213
 MD5 248488cc2cb6484a305e8108b4eaaa6a metadata.xml 489
+RMD160 6d4140ba9953af0bc389edbdc0658982cd52c555 metadata.xml 489
+SHA256 16a5f3dcc59bc342281b445c1377954ec74a6a39ade615cb2b3b9ebd72d7ea57 metadata.xml 489
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEOvfd2+ySkm8kpY0RAiSXAJ45mt3rhXyT8SeI3Hc5/yDgUmF5hQCfTawE
+JBbKOfUj+ynobQjaViySGaI=
+=0/4K
+-----END PGP SIGNATURE-----
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
index f98435faa1c0..d65d4e4764e3 100644
--- 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
@@ -1,4 +1,12 @@
-MD5 85d53ce597754425a317b25e63e83882 gentoo-headers-2.6.11-9.tar.bz2 21486
+MD5 215998d10621efc7c132b0f28fb9badc gentoo-headers-2.6.11-10.tar.bz2 21945
+RMD160 931ed9455f70674168610971378b854ab00f6f35 gentoo-headers-2.6.11-10.tar.bz2 21945
+SHA256 7e0de6169d0abb7feef5b2f39c302e362f3c4544286427df11d0002f2f04a22d gentoo-headers-2.6.11-10.tar.bz2 21945
 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
 MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+RMD160 c11918b5db60eb25c42b70eb376106c879678940 linux-2.6.11.tar.bz2 37075679
+SHA256 1fa39c202efe168bfeb0ddd74c8e4814f77da7dc78993e47826bad9173b95808 linux-2.6.11.tar.bz2 37075679
 MD5 8bc41818e91c0fbe6122b2088278a29f linux-2.6.12.1-blackfin.patch.bz2 237386
+RMD160 0c3a76aec152c43ef7f1b6130a1a43e59829cf92 linux-2.6.12.1-blackfin.patch.bz2 237386
+SHA256 7f7d34e07a5581ee120a5847bc21e98ded02df1cfa86856514cfe467a1a4ae8c linux-2.6.12.1-blackfin.patch.bz2 237386
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
index 5c7111a5cd28..497b890d10de 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild
@@ -1,13 +1,13 @@
 # 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.11-r4.ebuild,v 1.12 2006/04/09 17:12:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.11-r4.ebuild,v 1.13 2006/04/11 00:26:53 vapier Exp $
 
 ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa m68k ia64 ppc ppc64 s390 sh sparc x86"
+H_SUPPORTEDARCH="alpha amd64 arm bfin cris hppa ia64 m68k nios2 ppc ppc64 s390 sh sparc x86"
 inherit eutils kernel-2
 detect_version
 
-PATCHES_V='9'
+PATCHES_V='10'
 
 SRC_URI="${KERNEL_URI} mirror://gentoo/linux-2.6.11-m68k-headers.patch.bz2
 	mirror://gentoo/linux-2.6.12.1-blackfin.patch.bz2
@@ -24,15 +24,16 @@ kernel-2_hook_premake() {
 	# cris is slightly incomplete so lets fake it enough to get headers
 	mkdir -p arch/cris/boot
 	touch arch/cris/boot/Makefile
-}
-
-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)
+	# specific targets for now (dont want to break other arches)
 	[[ $(tc-arch) == "m68k" ]] && epatch "${DISTDIR}"/linux-2.6.11-m68k-headers.patch.bz2
+	[[ $(tc-arch) == "nios2" ]] && epatch "${DISTDIR}"/linux-2.6.11-nios2-headers.patch.bz2
+}
+
+src_unpack() {
+	kernel-2_src_unpack
 
 	# Fixes ... all the mv magic is to keep sed from dumping
 	# ugly warnings about how it can't work on a directory.
@@ -51,6 +52,6 @@ src_unpack() {
 	# 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
+		epatch "${FILESDIR}"/2.6.11-ppc64-32ul-spinlock.patch
 	fi
 }