gentoo resync : 20.11.2017

6 files changed, 76 insertions, 32 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index be6bc3f26b3c..d4b0918c7557 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -9,6 +9,7 @@ AUX awk/fixlafiles.awk-no_gcc_la 8473 SHA256 e5593dbf7785b42bbbc536ffb488d08ce04
 AUX c89 412 SHA256 29ad5dd697135c2892067e780447894dc1cd071708157e46d21773ab99c5022c SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 WHIRLPOOL d9707a2be8da7a709b54fcb1154cfa05e479f8c3bdd6173822ee1f1bc265b2a0d04741c0685bfb0db68e1e4297fb032d2f8ff94da88014575d947054474d8295
 AUX c99 446 SHA256 057b348cf5be9b4fb9db99a4549f6433c89d21e5f91dc5e46b0b4dc6b70432f5 SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989 WHIRLPOOL b888038b96615c7a0363555b407a3de2c1f17e34428fa16dfbf56fcf68875d6bcdecbc61b545d7f71842ff1909a3ffeff17165fa7f56b48f95adae22f5f8bff1
 AUX fix_libtool_files.sh 1547 SHA256 5eda4347c1e7068dbee7e260726ada06f6f49d7452f4110db80d59dddfd8ed97 SHA512 ca39921a04ce9f0888e6aac3240ee71c8259734457a3ac5b910da3c57e04abab7550ae77ed3de6233533569009b17540300cdca32fabf5f3be004f3f8917fd83 WHIRLPOOL 0ae50f8ccc8654d06cca3bae6ba1185e1240811c2150969367c3c19615cc145b0da480b251ced33d397ef0406d7672d6af3d8fd51713e3ba58164c14db8b82da
+AUX gcc-4.9.4-bootstrap.patch 2698 SHA256 9ed61e052767bc919c8a22193ea1ce878cc65a8385ae013afa71bc0e06fff447 SHA512 c712234b87aa66379bc52b43bce31a2dfd8de996030588a26261bb08471cd6e92587bc5aa35bb8f776a5128b1deb524e37aebe1c0b970a98210d653b5094d95b WHIRLPOOL 8865ff7b647ff41d0e7f243217f6b00c7e3aadf01345b995d83175fad81f295868dd4ee2bf7fe9d18e892da4934e02ed4c643151cc0614be19f849c73924c3a7
 AUX gcc-configure-LANG.patch 2052 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 WHIRLPOOL 3cc1ec912fb192ff1058de5b93e49a994ba30d1501a932290dd5b3df1cd783875621cda56edeb41894cd5fa10c04917e693a40a60be8d742ddd7992bf5d8afeb
 AUX gcc-configure-texinfo.patch 337 SHA256 74b73a7ecec2d88889876b4db480cd173632f49d5396bb8e5b3c93673f9b5b98 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5 WHIRLPOOL 39d008aad06f7621e4e5db15f5e85a59e583b43f8d247029bd4944466bb60a9795bda157d185c45c329294078e282703a243aad5c468d90c77665dd6336870d4
 AUX gcc-spec-env-r1.patch 3148 SHA256 da0a6442eb42bce58cbdc7858b110a2e65fc5bd5b4b780b9b491033de6e302fa SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16 WHIRLPOOL 3535605998eabccdee71ba396ed5cefbb8b0a8cb073101f6444c7d01233f3b3904c1b29f4daf0a3417c68de8dbd62a0b7dc367cacfcbfa0c4ee1b69b7df8c6fb
@@ -68,7 +69,6 @@ DIST gcc-6.3.0.tar.bz2 99903185 SHA256 f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc
 DIST gcc-6.4.0-patches-1.1.tar.bz2 10762 SHA256 19e1c07f87b34626ed0d73f73cfcdff7ca8f7abed172fc6832bb7b08ed5140a9 SHA512 5c2d5a227788e174d4d8d3c137d315a93ed5e1e6fcb9fb43b56e801fe63d973f25cf72ee8cd32752e98a9da17bd07064344c4299270d4b1992bdcb31682ae10e WHIRLPOOL 583bdc54b07da7ab9a9bf84f0fc66be2c1212f4dc9835f9bbd4a3474800246f82dc195f7b2ccd40077082ead1f8c57e02d54ba13cb779c30acfdc40fb1c6b0bd
 DIST gcc-6.4.0.tar.xz 76156220 SHA256 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 WHIRLPOOL 136b282c6957877d2f463d83740fa65a4e7a346ac94e4baabea25cec41ae307f34409b1e518a22927821d564b8634a48978dc8e1d0b988999e924adcbf3f5cc9
 DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 SHA256 39d4a0c659cc361bd3c71fdc9b793bccfa2bce06ede65ac49b805d1e236fcc8e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30 WHIRLPOOL 9682649fff62b56683637d25a58d11928342d99e52b2269f42369fd1d691208a7645802cb0d609ac30e20593ecdceb8cb1ab9b216963afe14db1b17ed43d5eb7
-DIST gcc-7.1.0.tar.bz2 84303533 SHA256 8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17 SHA512 b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec WHIRLPOOL 1dce5f89d4110bacd7f65140a1dee7b1a4898682e2ae8621832bda6f101354d226743acf77974b5e97d861c6eb6c47637138987dfb6ba222ad81b751e80ff6e6
 DIST gcc-7.2.0.tar.xz 62312628 SHA256 1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1 WHIRLPOOL 9503fb08731d94b5d79b182579f41992e9db16dba8a034cbfa8a2703a975185859e79c1e3f6094d14d08c7f5d7135c2ca5ffd8d6f7ae7820c20d4076fe5e9f65
 DIST gdc-0.24-src.tar.bz2 1012099 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f018a3c6218e3fb2a4500fc79a SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686 WHIRLPOOL 22322b0c3e2d67b3b37bd7fa92a29c593688f934d4ffd62b9cc87eb63a44a4f8bbc9d75cadf11209c73bdc9942c9b4430036629d0eefcd04de9055c502b85f12
 EBUILD gcc-2.95.3-r10.ebuild 752 SHA256 8d9196b3fc56a9e77030990c66eec2e30b8b91139467763335e2349372068c19 SHA512 88e3a89474f1b46077b74a7c9931cdb7275bedc72d2be4ebb0272f45ae7a64b533fc80263275839a6c67fd2ce5cfde6580d28b613a37608db26b3c62590dbd82 WHIRLPOOL 49aff012c4c5c924b481e03f30e57d74dd3d74639939a00551d81c81e15b3f6873636a656c773f8729db3f3eeab3540871babd8e6662976454205484f2405937
@@ -83,12 +83,11 @@ EBUILD gcc-4.5.4.ebuild 687 SHA256 fa26996cdec3b8155e1ecd7329c6dd1e2f2094befba10
 EBUILD gcc-4.6.4.ebuild 768 SHA256 56a6a8c5a255751a41c2efbeba9b7f9fb144b68a257f0a7f136a769a840b5e00 SHA512 a9d6fab6be0914a0ece96f42da9e2c84ef9d64cb480d9374b01ea16679c65129b49e9439a17d2c898d1e1bd33b7c03513df5b7172e91e3e682d6c475e9972fd5 WHIRLPOOL 58e87d6d2f94e054163cd69acefe5727c17f2c04fcd47bb135fd6b62700270504f9969f2ed6ff574fc28e5ce0efda3b385d0bee9e8260dc1aa3e0401dec74752
 EBUILD gcc-4.7.4.ebuild 1291 SHA256 499c89b374e2fa9f4b205151cbf0e97f34d3d0d60577e2a1c685cedff7cd519e SHA512 ad60bbe91d92bde8b42c9c10d10d2ff9c36677b60da6447c4fde3205bd3e2bbdb3194c52b6e51e740a9af93b0d05dd8446f8f0fadbe6f8dbc9fadaee8dd5dfeb WHIRLPOOL ead07b80aea133bcace26288fd4ef1b656469caa8d23d6e0171bf994bb175d4709647a7eda380de3f1070760bdeaba5411e96e52ee4cf5b3cce17a3da7633b01
 EBUILD gcc-4.8.5.ebuild 1401 SHA256 222441bfaa3d89c48ca2ee4f61b9025b1a598a0de38f1a88707e7696ea9ff350 SHA512 d0a47534b4e2e35ad3296c87887307f3446421f4cdcb2d2aa9c3a3b5570af6c1597101e61a486994135577f1f693bb4db4ef91ec639ee6f274b843600029667c WHIRLPOOL b9efe4b12eff49c823d9056f9615670a42a759ce6ee44f0134c0d5d95de6c128682e118dcbdd242cb4434819eb48f312e5794966957d3c7a271595ae6ffe17df
-EBUILD gcc-4.9.4.ebuild 1401 SHA256 59663d341e1d93e0de1e9466d03b90d1e2a1275a2abe0cb788710a37dff061d0 SHA512 dfce8e4d1da4a24523e87a05693f14ffeda307bf19ccbe520ef5a675b629aec1a2668d9ede7d5586637ec60a38562c16ce3547b3bd0b1cecd6c49690ce7a5485 WHIRLPOOL 18140fca80730cfcd365771f86216d7ab91ed0ed39628f6a42dfb1c3d617215b83ed1c5a17df5652ed90cde468e9e795393f8d6bffe167302a317f76cf8c3c35
+EBUILD gcc-4.9.4.ebuild 1460 SHA256 1d3591a5a1d83bde68a65750222bd77738d3f2cc247f4f98b05a2f404811ff6b SHA512 ad95c792c32ef356b3943bbcc4a1f16ba3e891e5f11ce872287d620d6d57aa44a8941c1e4c11a1fcdc10f4faf21f02cd513c6a36d210bebb7c5207a9f05d7b32 WHIRLPOOL ef988c7e5db737e36597d0923436e7fb8faa07787df93fee9577ff373ef9217f76abceb3f743b3037eaedbf808632e4d1db751bd40cdfbe0d8b19002295550b5
 EBUILD gcc-5.4.0-r3.ebuild 1278 SHA256 fc446606c5917cb4f29eeb17218a374bb8f04b4b700ac38a686dd282f5b0e215 SHA512 0b51d9a3a8795b06c3b1f0096969413d73fb5b88dee9ae85ac499b1ba0dad77a066f740ab8873bad9a8ad1c3795af446dec9faa0c67d236f65958937b61583c6 WHIRLPOOL 7bb788dc6610fb07b3acbbcc75b22c6f9cbc25f523ba303932291b124dd08adec3922bf4deea8d8124150b4e53e8094ee32bde51f35e06aced003a746b3ba647
 EBUILD gcc-6.3.0.ebuild 536 SHA256 5af5aa7557154763ce558bfbc14e282d87a850583f82ad2ca5d482e51c3e279b SHA512 a01f1d52b881a6e87124a3de3cd062562ba4a561f54d3ec3f68d0732958f9c7d12df38bbe18b98bd4c77e005410f2065146dae83d2ff76018c381935f9b932f1 WHIRLPOOL 5c7cc0f33710a4ccdecd00213c40d10ecde1423fc03c8740aa0ca0f06ae83431ba81ee8e1da3e8f61dc3df3b892db9a7e02e5853d19670d2bf1a273ab9649c58
-EBUILD gcc-6.4.0.ebuild 536 SHA256 1034b5891316427ba6f535118e55f9324bb4e4566f76a1eb498d615d0814c537 SHA512 3f1974002f916d7ae5540b536c694fae812698d2a26dc60963354ac7f438434a98b59360bcf92fb641832c2e80963c1f39243fc024b210db737039f6078918bc WHIRLPOOL 18b05e196441f8fbe9bf4024e4e855f619e425fb75bd2c287074d1b757909d0b5ad6721959e5348e8af25fd8715f51af1460fa32052d4934d5f9d2b985f4a198
-EBUILD gcc-7.1.0-r1.ebuild 431 SHA256 2d02cb39924f325eacb9a7e3eed1f83f8d605720ea184f38dec214fffb045d1b SHA512 d7081aeafa29f5dd89cfeab4f596bc639c4e383d9c2e4d5a4e5ebcee7849fc0d3b3aa5f32d48f445d876efcea4f0751eca780d22482958c8670fff6a38e172fc WHIRLPOOL 3ffbb4975beb5f9a9251ebf7063211c399e194de474b5ea0cf38cfa2c173b612f69cfebf597165afb7a620133b16b275223ba5a9af6b531790d24448b04b851c
-EBUILD gcc-7.2.0.ebuild 453 SHA256 e738480b135ab3c4552370f47524dea701e39bbe4979fd001e2c8ef5c4e5c294 SHA512 9103d3b9ccb0366247bf1bfae187ae1170c5df2513c1008cfcdfd30880f0e71f0c4ed53f843ef630332378e22a66126042ae58d4d3a71c3aaa731a8aad446520 WHIRLPOOL 537c89fb244d6b12da043ec5ad57f45d95474d16c6bdee47a2dadd44b37f79f3d4c34dae6276f85d1d0349f5cc1f5159372cc3c157cf680301cfb8613d27f406
+EBUILD gcc-6.4.0.ebuild 532 SHA256 a3b8902aa7eeeb612e0552d161b74f1dc8f0e8c7230e4ca8178b80ceeb3da5be SHA512 4b8f7f5155facf399200e2685d0592d6e144247fa387f4598fd46c55bcc950c76479e0f9043df538461dfba1698abe04e023d84bc40a47a1380429aff7c5bfe6 WHIRLPOOL eea6c2034a218ad9c6338b880c4544e1c6d682786012c3b750d47b99c4af31735f97d59ad31399a20cd85098cc6f5df7d64a8f04e719af6efe00a1c795bd296d
+EBUILD gcc-7.2.0.ebuild 558 SHA256 57a4213f15e8ab9574018f867383b695544c4223fba0a1b4ae0dd33e7f287b3e SHA512 3ffb6eefa26a967fe075879b41e9fb67f7d6d0175762aa8044ed466bf37adc19a4eb090109f16c7b03874db67f39a39c9ae77a26e2682f7e3b145b45711ee51b WHIRLPOOL f2a39bd9f407ab951e7dffee6ca7e60c547943cc53c8a47e38960dfcfe91dfd1737393b62bfaa55152f02f358de726468f393957ef2657041c84861fae20446c
 MISC ChangeLog 12968 SHA256 a5bfaa87cea2ee1db7c9d2063bafd106abd89290d47c32cacebac76ce42aeead SHA512 67579e419cc3740201dea77ef46dd2dfc9c7109b9c44a220f36093a18f03f338d91496fd02a55715c66ca9dbc24b3125d866f2dc97226ca611356cb25b22c8be WHIRLPOOL 9b58f80d70b5971697f2d7dde838d25d8e24f4920abc55b3b1765adc42937b13059e52fb5233eedf19d47b4ab66671c0adae7b81f4e3dd0e3292ca87d4e4f14a
 MISC ChangeLog-2006 112483 SHA256 108a7803efc91b08dd27ca4a83468637222a0685760f63bce724cb486fbc4022 SHA512 2887a66d03f4e1a9c60c743d7aa22147bdd95900b9e759c760a63f1a60c90008585b10b4f46ecc26e0149427bbdb8b83a9de4546d75e9ad935dd8e5377bf8870 WHIRLPOOL a2e1df0a7cead4373b5aeda333d952407049e1945f0a4e7774e1249e9f08ee33faafe0e74adec28b641bf037b8d6a350f45760a25c15e769b23eadb84b7ea48e
 MISC ChangeLog-2015 73367 SHA256 77c0651f80b2d52ca970b933945e41414e84feb5db7559abac0eb9b69278e408 SHA512 c0de93d6277b780731761642beb78c89117ec59874277c2869419c6f9f99ca8c411a22d414d8c0a6e34ced845c359192bb6a57788ac777021985e9e1732d9cf6 WHIRLPOOL c9a060d46c14f2791d5369b20a53fa5a3f318670e0d56b0f8e4e16a971bc6ac15f56bcbf3970f2fc2f56eab52788e595bdd0658e6bdc0ad9d1b6376456f35cbe
diff --git a/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch b/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch
new file mode 100644
index 000000000000..aed1ad0e90be
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch
@@ -0,0 +1,66 @@
+From 41a4aa66eac45c8862a79351647ec06dd03bd1f5 Mon Sep 17 00:00:00 2001
+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sat, 13 Dec 2014 11:24:37 +0000
+Subject: [PATCH] 	PR bootstrap/64023 	* Makefile.tpl
+ (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS 	to POSTSTAGE1_LDFLAGS and
+ STAGE1_LIBS to POSTSTAGE1_LIBS. 	Add -B to libstdc++-v3/src/.libs and
+ libstdc++-v3/libsupc++/.libs 	to CXX. 	* Makefile.in: Regenerated.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218705 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ ChangeLog    | 9 +++++++++
+ Makefile.in  | 6 +++++-
+ Makefile.tpl | 6 +++++-
+ 3 files changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ba5ae4c2ecb..8ffc313f157 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \
+ 	'AS=$(COMPILER_AS_FOR_TARGET)' \
+ 	'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+ 	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+-	'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
++	'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
++	 -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
++	 $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+ 	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
+ 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+ 	'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \
+ 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
+ 	'WINDMC=$$(WINDMC_FOR_TARGET)' \
+ 	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
++	'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
++	'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
+ 	"TFLAGS=$$TFLAGS"
+ 
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
+diff --git a/Makefile.tpl b/Makefile.tpl
+index dcbc6b1b143..bb8227eaafa 100644
+--- a/Makefile.tpl
++++ b/Makefile.tpl
+@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \
+ 	'AS=$(COMPILER_AS_FOR_TARGET)' \
+ 	'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+ 	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
+-	'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
++	'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
++	 -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
++	 $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+ 	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
+ 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+ 	'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \
+ 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
+ 	'WINDMC=$$(WINDMC_FOR_TARGET)' \
+ 	'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
++	'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
++	'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
+ 	"TFLAGS=$$TFLAGS"
+ 
+ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
+-- 
+2.15.0
+
diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild
index e7562f2330ad..44597c4ceecb 100644
--- a/sys-devel/gcc/gcc-4.9.4.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4.ebuild
@@ -39,9 +39,12 @@ src_prepare() {
 		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
 	fi
 
+	# Bug 638056
+	epatch "${FILESDIR}/${P}-bootstrap.patch"
+
 	toolchain_src_prepare
 
 	use vanilla && return 0
-	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
+	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
 	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
 }
diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild
index 6002afe6b4f2..0bdc2e72a6b6 100644
--- a/sys-devel/gcc/gcc-6.4.0.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.1"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.1.0-r1.ebuild b/sys-devel/gcc/gcc-7.1.0-r1.ebuild
deleted file mode 100644
index 41b4c34bfbbe..000000000000
--- a/sys-devel/gcc/gcc-7.1.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.1"
-#UCLIBC_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-7.2.0.ebuild b/sys-devel/gcc/gcc-7.2.0.ebuild
index a0f65c4fe504..047d575c698c 100644
--- a/sys-devel/gcc/gcc-7.2.0.ebuild
+++ b/sys-devel/gcc/gcc-7.2.0.ebuild
@@ -9,7 +9,7 @@ PATCH_GCC_VER="7.1.0"
 
 inherit toolchain
 
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}