Push out queued patches and move stuff from FILESDIR to the patchset.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 26 insertions, 70 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 77f7ef5f22d1..a948cebedaf8 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.1021 2014/10/02 00:10:29 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.1022 2014/10/17 17:44:54 vapier Exp $
+
+  17 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+  -files/4.0.2/gcc-4.0.2-cross-compile.patch, gcc-4.0.4.ebuild:
+  Push out queued patches and move stuff from FILESDIR to the patchset.
 
   02 Oct 2014; Ryan Hill <rhill@gentoo.org> gcc-4.7.3-r1.ebuild:
   4.7.3 p1.5: Backport PR60155 fix to stable (bug #512586).
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 9eabd4137849..35eb5a717809 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -10,7 +10,6 @@ AUX 3.4.3/libffi-nogcj-lib-path-fix.patch 1691 SHA256 030e2c9f31b325ea975792bdfe
 AUX 3.4.3/libffi-without-libgcj.patch 1658 SHA256 41fd051cc16b61da4abf4f696f13b8b574fce76c65d1a731de3dd0d39f335037 SHA512 f277f4dff390ead308b897bf06ad53584f11d8234f49f5c41c6966204652113d015c1c6a240d8e9d121af285d4491cfd15a3934c37588b66007423b9050cb42f WHIRLPOOL 82350dd81e502b037d767f066abc1277ed69a2b0d404973e001b7af126aa4c03ddba04ff094fb8ae3b29b9690e78ee0fd71ede2c29bd1c944fc9516199d547a5
 AUX 3.4.4/gcc-3.4.4-cross-compile.patch 1912 SHA256 f8bc4cb8cc012f40f9a988ed8344e9e75df5cb3714d98a2eb19e5320e32c7724 SHA512 c31cc4c77bb9a5f01a7a7969dad862fc5d7f9916adf67e039a71714e0eca02b13a576bdfbab50c069cc8020ef4dc335ed20bb10214f714a089b8daa02e849d2c WHIRLPOOL a96f689f8b97f960e7e33c6bb0fe13e502bf1a180ba8c0f49a9538f842bbb9c736e3162643e2401bccb8ff2f98622e9b1d0e1959ad5728d18130d4b5b927dfa1
 AUX 3.4.4/gcc-3.4.4-softfloat.patch 5242 SHA256 fd4bf1bf8e78e2c7f041866594351be359341db876d81c0e9ad089db8e84a516 SHA512 eb95daa0f14f30c3b31d0f9c345f8e26214ae48ddc3aba232a6e638b439b6a8b79f20c98d4e82029241a385bcc1e62856ace5bec9cf01809bbc0ff5a0f1aee1f WHIRLPOOL ea85014c7619ab49a0185851f92aa2244ab1f46e3894e6306f6d321d6b5321cff7629e40e9b983c1d09dcb1c2542ead0b0527cedc827deb554110b1f191df267
-AUX 4.0.2/gcc-4.0.2-cross-compile.patch 1283 SHA256 f86427e8a73aa28e1f2e2f19bf27a9ed92c716319543c8bad8b3247fc7627182 SHA512 0fa40a7c8a2bc62a126e0f53b637fe2934ae99a5413bf07bacd1115fd8af922f06354c33e52f0c96177ee521a4db69ffb28c918892b556674963f1d51ff33832 WHIRLPOOL 2e92cce5e8fd56f4efc5da4a989d88ffedab89e15eeb6c41a0596ab727bbeb1bd3a611c8b8ae735ffba9d0313d4568be14ae8d5189c18655152bf4c34c61de92
 AUX 4.0.2/gcc-4.0.2-softfloat.patch 2790 SHA256 1525a48bd087c0f0d89db128a16ee106252daf7bf34ffb45867d30f6c452de2c SHA512 e6b20399c86f386726f3bb9001bcbbb83ca572c80808193d4f5e6439abf84e2e708830f278d622a384fbf36ff26c9ec4d7d05ef7a33bdc3d2313973f47d5f475 WHIRLPOOL 706cc1b806c4f7cbe1e6693d802d34341857cdbacf2f66a8d8941a9d2619e7e22be42a92a750d29ffb4fc0add0c9de1640a43be9b1b0c0f1c6686b2743d6759d
 AUX 4.1.0/gcc-4.1.0-cross-compile.patch 1134 SHA256 8ee57285151659793df88e025f1225b401a0c805bfc8d1685e04ef75393a24ab SHA512 84d0ab9bcfdd18148392a7219ec0ad4a1e63d43bda3f45a13e22f551f2f119822fed700570bd659f9260b09b0958d4c49e339ad4f135740e5b60e46462de7f20 WHIRLPOOL 1252a62c809523fb0669cf1c4f056d98c6fa4d24a3f97339be828fea8fcd66254b2e1112d6c4c628deddf71418dcf8e6a8846013bf6683efbe4cc3bfdd8f6cb4
 AUX 4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch 1686 SHA256 7547293b945808f63b70aafed644a43c99e19f82aaf1d2f2df8502d87ab3f01d SHA512 cb0268c64d8d50ee3c95e9c6ca9242be1cb08382c7b081c129045a4852a7b3ed5c48124b33aa51816d80f5c930929bdc097644e817d77b5e186442248a609f2f WHIRLPOOL 7c152c59e7cffe1730bfb20e9ac97aba8a2bad583d9b6daff0ea0be90ca0d4a153bc40c169e1f4831c87c88b4ac5b41bef0cb019e8bbe69a72b702916770a765
@@ -37,7 +36,7 @@ DIST gcc-3.3.6.tar.bz2 23972413 SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd7
 DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 SHA256 5b92fac2afe835a127976fdb6602fb5628cf28e67dd19e8289768a3bb8631ec2 SHA512 c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa WHIRLPOOL 79a7bb14e220dad7ea818afae12839ff7cc624f128bbf7a29c8005478f6da9742ff08100088baeaf36c038f7ddadc4ec64e78d5283ed19efb4d3625916a3b00a
 DIST gcc-3.4.6-patches-1.7.tar.bz2 59052 SHA256 5e520ee48be297f5e5c4cadafcf883c61938680fa4115670d3b65f751d3f2241 SHA512 025120ab1235ade1c5ddd0df97b8f5872fd4d4adbd830569cf11d02df528701055a183389c5898b3b3a8415f4460deff0db7d2520436ea0b6069ff5eab13e358 WHIRLPOOL 85e5ae834f2ebceb61d4afd35433fe39287b178413a550775473778d830545945f01211d744e1c336ce61cecc2e5ab357b0c7a989f9480e1d52c422fece68c29
 DIST gcc-3.4.6.tar.bz2 28193401 SHA256 7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39 SHA512 d235e1223d5faf8f37f2d73db35edeff44c88974b09dfcf325f4b181b16d7124710d93b1b65b60206ce3525f062236ea0f338b3a5341d7ecbe196d8e90c3ff18 WHIRLPOOL 19fc447592f1feee56da74ee6d9436e0813e5a29ced37f8bf91836bbf0b1b9023fe2f717f8c3cf6dc84f11d2029cd87b65e9176b19727996420b589716cdfa45
-DIST gcc-4.0.4-patches-1.1.tar.bz2 38887 SHA256 008d11c04933f8cbf5f5969605c0d28e98b36ed59db2b4468ef9964ca5ecb2d1 SHA512 6a145906db244e7c507be39a06f886e7ee821ed6a9d9e3bad91509fa9792665f0801b102a4ecfece517f5747209e847b645f32989fec47052cdf588c2f31aa39 WHIRLPOOL b29cb25348a08b264b14890eb0c042e1be52e25db668a7829c964d31a60c83e4f89f8a6c0236e06cc936b8715301bf217c430aea22451c647fb9cc563e8c7468
+DIST gcc-4.0.4-patches-1.2.tar.bz2 41172 SHA256 d0c1c1f3579cf9105bd63f0a6396f67e6493131d7d2796ac882cade246122de7 SHA512 c4092fac461ffa3b73d59d6529af21ca8c833a1c232daf6a2319a2bc3eb1f1bc10b9af36cef83fd8f5fb23c38bd6d12c566652371164fcdb419840bff04277bf WHIRLPOOL 1ee8c89911af37c90343e1b584cc1b2983e8b9946ada6094b0cbc1f1e242b19ffdc93643d0b4dfafa1a5f09b0155bdc48173f61f93ee7baaf2b64598ed2c936d
 DIST gcc-4.0.4-uclibc-patches-1.0.tar.bz2 20164 SHA256 2f4386f423de421b1171c6312d82be3f646fa249df9672687bf8c37a72d8d1ab SHA512 67bdb8be3b7d173795ae3692f8f76fb6c236bfe3054112db30e3f0a56982685fe0b15e2c37f7d9e15e6198e4a41e47e1434a2befeee4e9e460e7bc9e0fa9d235 WHIRLPOOL f7cc0a984272187e88683683e7c484d6d40cf70efce4ded1ad5cae2849a6a51214280453eb60400d3b43a310a319b39dc8f7f88a5857d69ea91d73e0bfe6b663
 DIST gcc-4.0.4.tar.bz2 32642939 SHA256 f3fde051c96d2fc084f6f4d6114ce4c1a079fcd1247d947d50a3d1641acafc47 SHA512 194c12b5a1bc50c003f6fc849a4c0032388a960fb4b769bdb6e76cf330f04f880a0723661c991ec03742443c21ccba9af8599ae648a0777e0a5875c5fe7f6abd WHIRLPOOL 58749231707c5007f5907ef3916c9f2941bb42e0890d754c9e62692f5e049955a766bae502f233fa1ac084279432b15effa4b632a87c2c50db4f24c070ae9762
 DIST gcc-4.1.2-patches-1.5.tar.bz2 53576 SHA256 63663050343a4840707dd93a29d810f3e0f5be3a24847e5c0952a73ec8cdcc36 SHA512 3c7c15f740ec80aaa6f9c1ad77daeb2a2527f1719fbcc5d96d956e1fe1f24da961b1b030cf2bb631f1a0cc970f6462823e9a78441c9fd6b57f3645b04cd6a362 WHIRLPOOL 8970cb25abf1652af555fcc698cc574a28373462e01cdc7dc33d6850c6fa310e719ccb18c7cd8784e6fc0f6888e4d484547b6ad2ae1b1d82aab557ceafa50c82
@@ -140,7 +139,7 @@ DIST gdc-0.24-src.tar.bz2 1012099 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f
 EBUILD gcc-2.95.3-r10.ebuild 909 SHA256 3715f63a159c5f4d98906cb60aa94047d1f36ed8e62556e0f1d44b9b50d9d10e SHA512 c1d3cb41a72b2dca62698c977f12fc9e9b85a987b378363272c0c7646efeb6ab1b314282fbe4b269dc67502b4681757b6a11a4d346eba0e441f94794cd7665db WHIRLPOOL 43873edf4f7bfe2f16b8820732e9ddbdbef3c0ca5781734133a2ddab7ec12ad651296ce32945032b9589f10077d1c2e3388ef7b1aed3a1d0c1f8bdaac7b5f408
 EBUILD gcc-3.3.6-r1.ebuild 1554 SHA256 c09b192daf263fa90274d44eb9ee41e4929aadf4f31115cb227cd397d49616ad SHA512 285075529b94af6ac7fbd4049316b3f1a305030cfb9c020602b0c98ec731cb3ac8276a377f7a7c7c4e5e445e633119f17758bda62ea44600204dc46fd7a0256b WHIRLPOOL 6daa315177f6b6f7dd92304b225b58d753c60622a8095cb12e578a7d5d119aabc97b3abb6213b2d91cd71b8a61252e1f592179dc802860408f5081e5dcbc1371
 EBUILD gcc-3.4.6-r2.ebuild 3251 SHA256 d292d26f0927e95b819d9d7302cf7e150fce8bdc5ecb697be4cf72ae69296c1c SHA512 eae6fd3f5458b73c4c839332b0cab89545c45245d81e258b75685a56916b0afea60de7d209f1b4d9c128cab6ef2ec720603a4a801bc580bd50abe24b3f70c9f6 WHIRLPOOL bd9240d6f7019de0cdc9627f6e7e826e9f0db45d7c4cb9eb693c8c846c4906d910f115b4153d9d3648f5aaecfc81f09c9d273ab5efdcc01b967333b43c4798e5
-EBUILD gcc-4.0.4.ebuild 772 SHA256 28f74f5d8840ab6150a2b19700985329ec9f15e0607c0a722a7f9c9cd315d8c7 SHA512 f3634376009b6425b6b9c8a5bf97e00655d3a685d0fde394dc0a57e8beacdda3834ef5fa63123142d47cdaa334aac1e03af878073219260fee51c972529a202c WHIRLPOOL 596bc8766357265a750c4330027df23ac07d32fc466937e5cbc193630f7951c5f1b5ffa0a2e6897e6d6b3dff4ac66304f81f6b6c9046389f8907d8320517cf5b
+EBUILD gcc-4.0.4.ebuild 432 SHA256 b441714f0831b1589ace2121c549a5a4685b8db19116ebcb673b435f16b97083 SHA512 28b33b45902ac39dbcdab1450900cdd1a5974d5786c5f0515e95da468ddc482e4d67f5b3eb3d413af1a970b746a151b2508bb01bc1d5327e87c177eca3e8a37d WHIRLPOOL 42f612414e1f648f201c6a4a6d0421175a52a1f0e65536b85ce3b36db8d9c54075662aa5784c9db095fbf87825d558610e88e24675b6a189fbd8522314988a2d
 EBUILD gcc-4.1.2.ebuild 1015 SHA256 0d2a684cefd71f3590084abce95fb2b9ee7e38b12dc869214bcb5ef7c98f652b SHA512 ff65455e3ffc6c0bbf59e6d9440fcdda7aff3d910b57a727a707ce7d273f9ec894ee68f8221c0fee963dd120038a6ee625aff87a908fc036f3144f42f85939dd WHIRLPOOL 1c62e5120d7a29418caaeb737f8a822bdad6e3f038f52cfd6d5865da2d89be61c3f9e504f53c38e0c701acea2fbea26dfb6e5a978f3b07fa375e585a185b808a
 EBUILD gcc-4.2.4-r1.ebuild 869 SHA256 dab509cc5e657e1cfd3181e806ce4ea1c6f08194ec0c97c1d91b39d34b80c0a6 SHA512 94fb59a42d4c60de015fc31cb7d9a2fb3cec2b974b7eec439de60aaf3562232b53c1da40edc5502d05b4b4704a29d1ebc319d247c09c76a0832af24f3bab812e WHIRLPOOL c7db2b77a9955a20cca2c2409a29ef0a2fe1ef0d05c4284def838802b8b16ed3b46662e045931b75b70937aea064345c0064714636d65eed4c24c7673a6bc7ee
 EBUILD gcc-4.3.6-r1.ebuild 1320 SHA256 bdfb23188919087472495f7a90f3c5993d16b63fd0e45d4ed4922ad4d1ad33fc SHA512 fa339a849ff1aec86356e036c59e7c3ae529db35cb3ed7938beb8f85ec38c1d5c04663827866993bfedf9eac3297e7c0de9fa69da102473da46be68019dca4ec WHIRLPOOL b5353a5b94d18f1785591b1a82eefd8d28228d21a8e35ca966a4c04c145bc139f6fb18d71456934d54d0a564c7daaa8e1bf7f8c941589ec77f6db5b5938baaec
@@ -165,17 +164,23 @@ EBUILD gcc-4.8.2.ebuild 1668 SHA256 992f98c6aeb6f13af10c4ea49f43c505d809249fa2b2
 EBUILD gcc-4.8.3.ebuild 1658 SHA256 72c677a96b440935c79d3e560d0f3ee734753a1b9647e02d9ca4a39c2a634142 SHA512 b051c5c9353aa6acdd45d639298efc394b475483cee30776a1b73c0a91158ce0d4ea9580358f368f8e9c1522058a69e25ae3cb7bc9c3fd1c99d33281fece5281 WHIRLPOOL 8f827ccb571071ea843eaff0ba0e49cb3b5d2f54162692370a6b5ce0f84ae70fbb253a95c3096e11301219383207ed84bc1a8faffa5c71ffc25d95a855174479
 EBUILD gcc-4.9.0.ebuild 1556 SHA256 15523e66e454b85ba32b261b3e2cd4115edb9dfcc6475be8f13ccd454e3f8f23 SHA512 bba7b90bea1266089f09725d712459dd1b10a02c38f7948e29895825cb07d48f5e821ddb28f43b4b5c5886dca850dfd0c531fdff25a99ff9e0f06cd7d0a9590e WHIRLPOOL db3ac4ab7b406e16b3fdd43a98fff94926ce5edd999e5fe028241129276db3c74ed606f8f289717658ebff0a7b5f01b96190683fa4a7a67a2c00970e509431fa
 EBUILD gcc-4.9.1.ebuild 1556 SHA256 43ba154e3c8467f02e69238d2f8e387ff89d5267bddf3dfed1af7358e138edc1 SHA512 901a5bc856410d45d09e3afca8e1dd7d56cbac8225af6e981a1d5e995a8c1cfa4918483eb8a41c47df415594fe46275d532386ef7b98d05122222f4c56aa2d3e WHIRLPOOL 8c88b2259092259f2d9f7d6dbf8931eb297a9a1c3dc1c79610fce213d1326427dd84aa2906ca1f4dddf3be730b5f282eec0f112478a24f8f5aa7b8ad427a28c8
-MISC ChangeLog 63238 SHA256 12326e73d9d00d4cce68bc447a8d3f8e6a76fd534d247130e43773fad91b9bf6 SHA512 e2e3e8376b50067b41dd1192e18ff5b9ea7965a2cc68f2b05ce6d216b900b3369115846eb669ef63dc7aaeb9f19d78c958987eb50515ecf7e17b6a40b829baa3 WHIRLPOOL 169815ca2e114b4cfdebae2409d9efb67730a0f5eaf0db43ebab88adc3c54eedd9000dd6c0104d6a7844fdeff3f97d9ee2171b9afab539104b46bd75f2c8c9cf
+MISC ChangeLog 63426 SHA256 aca6a7b03eb051e3cbd37fde68774e742f10b91a6a52ef8137cf4e54878df952 SHA512 ac97aea803b98a8255bc5d5f27a4fdea63f7182d219c96a8ded9fe7c8520ea02f35fe38cb1c67616c166995f73fb33242f9a21f5508bcfd20297703fcaffd828 WHIRLPOOL 2c9ffaecb99ea3167928f69cc8766bf63bd3264369b5c7834c2da33e2838f382bf954af6baf015fbbbe15297de177629537ac1e7b54959ed7cb830d8d67fc60b
 MISC ChangeLog-2006 112483 SHA256 108a7803efc91b08dd27ca4a83468637222a0685760f63bce724cb486fbc4022 SHA512 2887a66d03f4e1a9c60c743d7aa22147bdd95900b9e759c760a63f1a60c90008585b10b4f46ecc26e0149427bbdb8b83a9de4546d75e9ad935dd8e5377bf8870 WHIRLPOOL a2e1df0a7cead4373b5aeda333d952407049e1945f0a4e7774e1249e9f08ee33faafe0e74adec28b641bf037b8d6a350f45760a25c15e769b23eadb84b7ea48e
 MISC metadata.xml 2093 SHA256 35001f1768ae8803707f32c04fc7694b90a1b2725639f639ed631623b5c59292 SHA512 37f2dba404064da990a16f961705238ee03db4b93e70ff78dae9a3efdd5a0a401cde8c9d2580ef6dd740d736afde302acd8aa1b80d1bfeece42f710e94e0eb07 WHIRLPOOL 4be5bf86822e4a02767367e0bef6870bdbd0fcc3c3e68b225fc14f11752f09092b6d4485e05aec81896496671859f4c385beb05d9dca3490f45c58c6ead94c9f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJULJf6AAoJEO04vUmVeoRj9dMH/iXu2zGh7Xd5GZlFOPnbdtVI
-8dOQ0/Ze6PYPRRhSwx5k+0u/Cl4/SiYjav6s8BUUhq55dVh0K2uGRbSxYX8wkPAj
-zs/sIRD2NcVtdznfFOGuLu+AOXYQZh/qA8FHfhZ30tqQvdVefYTLf2I0ToWltbyq
-1R3yDoBZDpYfgT3lwJFXdmuEZVBeuFw78RltF9Ex3i/H9Hwl0M8EVdTbH7tf/4Vk
-Aknuka2C9HnkvWnhua3EX8v1kwQcEqj3rWjMnWMpqOYGuSswwZgjCzLU+V9mJ4Z7
-21wSKv6k1RZoaT9yHpuPnp49wcizd19B9Z0EKSrqRYm/GGNOzFV4vXJvkgSLkVc=
-=/HR9
+iQIcBAEBCAAGBQJUQVWYAAoJEPGu1DbS6WIA4UoP/2dmJUanHATe8IM6z21DZFLO
+HDCbMcTG2BXJAIDPx7XIU9V4ha8ckopNn/cK50nmJyg/B7g0aXax8NicWNpFElrL
+rC6HyqPATg905SpQ78GMt/+YNaHgCq7NjdeChgXYoXEoVuGY3rbG/Z/q/YKH87tP
+nYo1u2mJClaPFzCJWT1EUZwlyJxjJtmbqNbdwtH3SOfnXqw9VIWh8f9h74qavq2S
+IYDzrbijLqaaSs1xrbJTyU1z666JjqDe6rdwGPLVqKy2N6vcsn+Lx9KU9sf+wfVx
+SyiSBDrk2lQYxIJngd8YGKATlgj2QcNjwSvCzbpGnOp0g7NnVe+ffwNHO16bfCKL
+nP7BHT3NVpUePw9AcrTfmcldsqLOJU0bQBE6vpzfNOI1YHy1sfj/ryLsafN6dex8
+NvcA6z/O4vXP4pEHSEbunqFsPtypMxHH/PzJIQtNS9Py9cceX7T4I8/VD1y4nRb9
+iTc9UtRctlKPMN5S/bjqBGo0Xcc8g2G4fsR4dblu56nZ7Wqxz8gXS/FLo46rn6WZ
+P34D/0ig/X7GCtJHZGqY4omjJC46vctmDlVYb4OU/MjrDjbGgPDPCGOfbGhHa0Zy
+WHK16rCah84ngtjcLkO+bNr6ItszG4eaNT/i8paT3/GyQMYaHcLWbrh582J7Bi7Y
+G7OL5RsawPUoJpB4JHjG
+=kL8S
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch b/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch
deleted file mode 100644
index e14b57a3fdf4..000000000000
--- a/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
---- gcc/unwind-dw2.c
-+++ gcc/unwind-dw2.c
-@@ -253,9 +253,11 @@
- }
- #endif
- 
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
- 
- /* Extract any interesting information from the CIE for the translation
-    unit F belongs to.  Return a pointer to the byte after the augmentation,
---- gcc/configure
-+++ gcc/configure
-@@ -12857,7 +12857,7 @@ then
- 	    | powerpc*-*-*,powerpc64*-*-*)
- 		CROSS="$CROSS -DNATIVE_CROSS" ;;
- 	esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
-         # This is just $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)
-         SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)'
- fi
---- gcc/configure.ac
-+++ gcc/configure.ac
-@@ -1717,7 +1717,7 @@ then
- 	    | powerpc*-*-*,powerpc64*-*-*)
- 		CROSS="$CROSS -DNATIVE_CROSS" ;;
- 	esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
-         # This is just $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)
-         SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)'
- fi
diff --git a/sys-devel/gcc/gcc-4.0.4.ebuild b/sys-devel/gcc/gcc-4.0.4.ebuild
index 4a2969e00228..00388e31c46b 100644
--- a/sys-devel/gcc/gcc-4.0.4.ebuild
+++ b/sys-devel/gcc/gcc-4.0.4.ebuild
@@ -1,32 +1,19 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.17 2014/01/19 01:51:34 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.18 2014/10/17 17:44:54 vapier Exp $
 
 EAPI="2"
 
-PATCH_VER="1.1"
+PATCH_VER="1.2"
 UCLIBC_VER="1.0"
 
-inherit eutils toolchain
+inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection"
 
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+"
-KEYWORDS="-* ~ia64 ~m68k"
+KEYWORDS=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
 	>=${CATEGORY}/binutils-2.15.94"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-
-	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.0.2/gcc-4.0.2-cross-compile.patch
-
-	[[ ${CTARGET} == *-softfloat-* ]] && epatch "${FILESDIR}"/4.0.2/gcc-4.0.2-softfloat.patch
-}