gentoo resync : 13.10.2019

41 files changed, 81 insertions, 97 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index fbc27f86d720..db56af2d7dc1 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -110,53 +110,45 @@ DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330a
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
 EBUILD gcc-3.3.6-r3.ebuild 1247 BLAKE2B 992f97d49a929c135ca42281a721d8e8dc79a9ce01a61f7a3c2b6fc343361f02da0224ecf90125b9fa8359b92efa401cabf60480fe3fbd1378b1590b77a5180c SHA512 fe11c6ccb51f32c481b6bdeaa40a9723d290b6ba1a3ad27c9da79ebdb1fea2c4cedd0aa97d989758c4e099556968590f716148c27ae18b0955433d624734c11f
 EBUILD gcc-3.3.6-r4.ebuild 1244 BLAKE2B 0d44b62ee7257ee60b47e83354713fdf8ae7aeb742f2923b9454a4bf41a274f2de6a5cb6d5e63569e94a96c0bab3f2020ad8c7f4a48c2bb879d29b14a54da19a SHA512 cb9e5fee43681e6d340b99e27af390cd9df0c06ae655895168c19247fd129a0159f5a4d5529716515838d825da2e8c175259223d2512810e9cbdbc8f0a0db3e7
-EBUILD gcc-3.4.6-r2.ebuild 1374 BLAKE2B 7e38335fa6a4dede1b581fb2b42c14ebab65a16c81d10517601a1e8e9f63f42673ed099f483616a0a720ea01b43e97c7a05362665353bffa6bdf8b56409318a6 SHA512 5c31bf85dab53b0670ca7606c29e5fcdc9cdade9596b02320d95e2ab215952de4dc2f4fc4ce17bf4826c26bb76e820135a9317198753cb071b3ff7e39f1069ad
-EBUILD gcc-3.4.6-r3.ebuild 1378 BLAKE2B d11152c0eae119ac4a3e0d4ee6624c73c921a04c3a4461e80bb9a8ae1cf5a5af6d3cedf1c0ed6557dedbd0fe55d4b3fcf3d68ec88e219a058d2ed4a5150d8bd9 SHA512 18a5dba574d47b571c5217922a0b93d13f96e7dd02b29005529031461360d89c9404340d6ac7880e7b42b80d7cb8b52b6a97da0e5394212f939e6fafd564f0eb
-EBUILD gcc-3.4.6-r4.ebuild 1376 BLAKE2B 02140dccbf162fdb3083163b56a72df88d8bd8fa0ea64064f1aea9b581d846e7ba6f06155dc31e9543f906dd11711c03ba13b12921f9d7e3a3e65dbfcf050e9c SHA512 ea6be02a7778903a4a5f90e803b4e32cecd0ed2dd236d803f585185f44cce277add397d804b060cdc29ab82a8da64309ca70cbaef8666504df01054b18342e08
+EBUILD gcc-3.4.6-r2.ebuild 1364 BLAKE2B 5a8c18766b666047252f0dce63999e3deef64175f3e0054ed6f05de22a325ceb0f89f39ca54165153f318d8746dbcceabff0eda526bdb9dbca8331d2f3046a22 SHA512 4bec661f818ce0040a51ec4a0392353279e32861b44bb61dd034fdf2c819dac65e8ce13f45bacf30b5eacc18f1effb6060336323a9f47c0e41cc1e59af87d52d
+EBUILD gcc-3.4.6-r3.ebuild 1368 BLAKE2B 351d16d2077170861f8ef3a8d94958d27c1529e0ab0c543a134dc818542e84da21f65b78669e6fdfd2a9aa7e43b5f837de722ac70d69f6de8ea2773cec0ab7d4 SHA512 6131b84a91091e3ad0c3335442261f95c84f39b3da6cdb6a6d06e3a771b37e7f3ad322d5c2317935098e509789211f8c649b408a726fb19f0669f7976cc88b83
+EBUILD gcc-3.4.6-r4.ebuild 1366 BLAKE2B 339ea87ce3f6d3a727ba42db090d5721968757900cbe6008cd9739b8bf3c886e4771d00e870f6f2f9c759338d5b9787681bbae2cc43fe23e061f75376dc02c2a SHA512 2326666a9d4e98527c1db24d7e0c1320aa4225464bee5ac672e2ca8a95c0347133201afba333b7ed40f976c91c19c14b121853af3da5927829f05ad4b0b3a297
 EBUILD gcc-4.0.4-r2.ebuild 244 BLAKE2B dfdde3b2f9a0ce404c006be81c660911f6f8bf1ee0705b8675d371905bce310ef712bc898fec7ba02c53a45bbc6868334405a71029104449966ee3cf76e26841 SHA512 b9738da5703eda3e2c2e33bb456549be9ef68e4391cc880b5af8b2f173cdbdad874f609e90fa38547a3ef53657375c0bb8d377bd70bf3edb89a3e30264e7f180
-EBUILD gcc-4.1.2-r2.ebuild 655 BLAKE2B 3302cb25ba09947d7ba702446e24d0b62e01fdf7ee77d4adeb693926f9fc2df4804f9f22a113be0916e9943afc2bc92fe7b01d2478e16b627dcfe76d5afcb997 SHA512 b24aa6d3b774f5994bbf7139682a1a14b2056a2c88c4ddf385cd3473e1e6de03631644348b4a279dc02634acc6647f116e3789a26421091cf91a0750a1897252
-EBUILD gcc-4.1.2.ebuild 649 BLAKE2B 70c041237a0852fd3ae427244b7ce6eab2773e61c9c9deacaa0f6a6d2d3ea3c3035179bf2d2595b8949b6397c93b258f9bde69f9831ced1c95c87acbca485f08 SHA512 894bc80ed2b4a72f53f059962a4985e27c5e809744bcf83d9d27a5ef1bbf999099a5d36d35da2b2cbb5f511d26c1b756a76074024e4866a5983bdf7e0a28740d
-EBUILD gcc-4.2.4-r1.ebuild 394 BLAKE2B 0798e2523d59723a892cea76ad338357b1a83c6d61b3cd1be9d6926c00740f99b8e0466b9740bf2db44655dcbdeff488c9351411a691fa844f3a77ddbbeb9f3a SHA512 ea93dbe7d8e21ff9b60c9fd67b70fad4b90f4ecea98a0359d0a1d477dce866c78979c2a535fd4638d19b9ad990cb2985a3a64e179aed6e301cfc7fa8c7cca00c
-EBUILD gcc-4.2.4-r3.ebuild 392 BLAKE2B 940f8f015f571fa25e00453127054da76c38958eb7c7320e21a15210132ba686c8c67dee45e0601287792cccd486d99c86617b5470bfcea2749744f7ce6ace7b SHA512 99ab8ca59a1746caa722787b12a44b82379d9b0be4a9a546047ed3522f4cd096f60a6c4effda77ca92359dc8501bec65d606e1d46d22e6e811da46c61fc6e036
-EBUILD gcc-4.3.6-r1.ebuild 630 BLAKE2B a0f9f25d48a7b3abe6e377c12ee3ff35c585b6c5619679d465dd67cf7107d8fabef98c40c2f62a3f27029b43095055440bf6340c534906e31403041e334bd2bb SHA512 d381b460bd995fa8e5f8ee7464f04030510f21d569ab539a0bb6afbe2f5f4266af25ea8df052004bfb56155fd3f6cdb82fed7431c36da0f658549a26449d1e55
-EBUILD gcc-4.3.6-r3.ebuild 635 BLAKE2B 82df9ea727d2421742adf043da0819f1e0f6c622ab9758e5aafc3e30d332e49eb34a6f06a815ae49c5d4131ca549da7a4b91abd8f21ae1f2e9d4e577d340fb99 SHA512 c05e9a151b56cb93a3e85f0f05e0900fb5ee3d0f5de54f76f1dbc0aa2f04e55dd145e3363bddad90100b4261bcbb478109beb31301618e02c9c4db7d812f5ee2
-EBUILD gcc-4.4.7-r2.ebuild 680 BLAKE2B fb3274a32fb75e2078034ffb605b712933855858c8c43c89ffd6621beabed31dd913ebbf417c58c04f5a7ba22633213fea6dc7c045d6e8ac9b43dcb40c66a2a3 SHA512 fc13dc76ca642580b7ed4aee4b97cb3109b531448265420c845de074d19964b36fc081aff5215d8106d5a56b25d6610eaffe6a3152b73e29b71820490c5c6b1a
-EBUILD gcc-4.4.7.ebuild 674 BLAKE2B 9f2b3b4d27620cdbf5f141f38709cc37f04d3e822f58b02bc3f784e37f1b9bf550a5ec9d80e646a37f2cd17f315b5e51b008257f9e5d81977e8985f88b328667 SHA512 72e2eb8e125e1dd8ff095a989a739978562e77432a949839eb012bf915af4e989c79759230583b80580d25b2659cee937359f05f96cd7dbe5084d4f7bd3f96d5
-EBUILD gcc-4.5.4-r2.ebuild 693 BLAKE2B f12bdae02e413e68a6d4f48702dfa25d8d4f5922e7964982b0eecf3cd3bda7f555d2f34fe00543a8899cc349ad0f2522bf2c7e00abb3016863c82d44c25ac0ab SHA512 b7a76fcbd4baf563ac20aca35779f88d3905051e96e50d2eaf1a80c68ade7cfaf436c04741afe1ad7aab472fa8a5f21b7bb9733d5136eb7d65503600d81f6abb
-EBUILD gcc-4.5.4.ebuild 687 BLAKE2B 0cb42fa794ab8b1e4dc8075bddc288f888e6f79ee6d93aa8b95faf1b3befb9049397b8e9583b10053a2e7f1fe1af2e81104cb7aa85327da9a72e0cdd7d43b02b SHA512 2f4ac3fdea111450adbbde5b3021b97db273baa1d2ae9188ab95baa772a696843c2685ce51adb8dc408ebf0924670eaf7b17c42bf1f798bb23d3037ff951e456
-EBUILD gcc-4.6.4-r2.ebuild 774 BLAKE2B 106d2682855e5c6c32163bc29bc462bc782f4e3a5df49417822010d24f03d797a5ae4b5ec6421b9f2b3f5018b86bc91b3d97803ea6d748ca22ce8f356f595f39 SHA512 604b9bb1388e4e0002b985d3d6d15af8502eeb189548c39b70cbe86c5831fe676de4b0e6fae6286f056648b099214f985026b68e9e80534e5cac74022a21eba5
-EBUILD gcc-4.6.4.ebuild 768 BLAKE2B 9f38ecd86d75d9040e3674e4f33cc71e070c43d33a984b24e01e830d642546987dac29213534400f7c70890c86120bb95b353ed34bd79160539cb263fecc13e3 SHA512 a9d6fab6be0914a0ece96f42da9e2c84ef9d64cb480d9374b01ea16679c65129b49e9439a17d2c898d1e1bd33b7c03513df5b7172e91e3e682d6c475e9972fd5
-EBUILD gcc-4.7.4-r1.ebuild 1291 BLAKE2B 960d5072a4d03ee507cc5f7ea57f272165378daba273ec05e625dab2c38b0676f9261e46e6733649a49dc2dc50227449d480c90f8faa7af35a4cda8c2d4d7277 SHA512 44882746c9ee2920073722cf2847e717c412672e89656c6ee84e44903e935d0a84c6e7fdec327fddc8ba95cce1b8690d29847caff220f571e7d81dd556674b25
-EBUILD gcc-4.7.4-r3.ebuild 1300 BLAKE2B 68d517adc49deef4e6fe397464117d58f8b3853249e4ad75198a7ef7652b4179b7b990f7132011502408d57a56fbcba260bcc33fbabb70bba87e7f82c38ad200 SHA512 042e52a0d943e36f6f7dd84cdbac6bf3cd7fad0b488f6a80d676719b3372bec2e0c9abdda40e1c05ce7afcece7b24ab2b3ac36ab455b38a03109c870ff851357
-EBUILD gcc-4.8.5-r1.ebuild 1401 BLAKE2B 669ceca836569aa02247049b00d1beb820b12a8fd08bc8da703b650a01629bb6b9b9607d83152889770cc7116a2ce9e058db7d5eee5e91921ae2342a32890c40 SHA512 22f68cc6733b59e3d4f43df088fa0440ebbb40c3cfbb88e538a1ccca849f1111a83c9a2cf0d0733eb16eec956e65c5accaae1c6598a8027a497d20f3293a2934
-EBUILD gcc-4.8.5-r3.ebuild 1411 BLAKE2B 0e12458346c9ec6bfccf6100187472c1dcd6cf0459d3e426f87ff538a695ac1e078f46ce2197d2834ee4eee7e54c1fdce9dda39676ae9858bf60ce38d7ba0bc2 SHA512 f082c4ed61cc6974f5df3dcb6ace113c41aa81608c1405b62a6dbbbd526eb55ab0c4e020e85d82a33de5078ca506020cf3f3d34a8eb12585b3633b00561c340b
-EBUILD gcc-4.9.4-r1.ebuild 1470 BLAKE2B ada75cf169dbeaa91ef7b6e2350e2ae2e1d48ec0c6295a937114437dd682d48537bfea81b1433e4207d5b14094f002f62b736c73f8ddafff5a90e21f63b1a3e3 SHA512 e551c428f54ae57fbb5b2ae9d17f312b5848161a936524add7523e412287c044493a574029fdf7101ab70b44ba4a9062229dc76d9c4e93595b8d7099ae041e49
-EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 60ac80417d49608501a2956ad5b62162fc0e5ce089a8786c7482328cdf4b0d7ab8a10045c2479b3ecf602ca934796e9c32459c9b421a3444a3333b79faf3026d SHA512 c0a443c8c0629b12047f1bdad0b62a23a423f2fad4408b765d5093f8cb2a4ab54b6470f6f4e2b2d4f444817a2e71c11568fadc8d11bfdcc068a8fb4b7fd826f3
-EBUILD gcc-5.4.0-r4.ebuild 1275 BLAKE2B f8246e6904d1d39cccacb972a9e62bebd41ac2df8f45be771be421c8a9905a03486500ac57a8b08d090569eb3f17ed3effad54e337048f1c9ce34f655c86005a SHA512 212b36ca6b5a55855ee91a82ba37c8597d34117a581135ea49ad88b9b7495549e0889a0add86f499208ec27eb81ef8ab786d2ca97d565dd60e6eb09f76ebec61
-EBUILD gcc-5.4.0-r6.ebuild 1286 BLAKE2B 176cf1828d2e8f16cdf1157326103becbb0af36db08f2b4702e25d7732f179709335dd0dcde3afcfc141abf016fd51671b111110d3925b81194e866b4c7abd4f SHA512 807577140b06506ee70e75aa3325a1e02a6f7c4a12c0a79f633b3bb04bdda94de0e9da0d615a1df05bd8829c75825ed98d361d4f3e882b5cdb9cfee04ef10e69
-EBUILD gcc-5.5.0.ebuild 1285 BLAKE2B e0a5bcb01c51b656d4e6f11a8b4894de0de79da2aea5d9e17ea6ce619010244e68e2689923f65fb23553d912aa57f6d55d95688b5b22d4f5c4f1fb878aba4c61 SHA512 8ef8082806d79fb0786c65eb691838cd9735811ed54ed75c9ddc62968bbe5253ca7b6c6dd00bae32608ab076c52e5cd54522076745e6e1e24298b755f1ef5d1f
-EBUILD gcc-6.4.0-r1.ebuild 525 BLAKE2B 4ef6e95caec3cd198f9eac05585a691ea6babeca2278e92b6092dc9c19a8708a4abc1ddb7af687f862b8e47cb4ed4380589a76499e45df5cab03d4b6b2620dd3 SHA512 191f06a355369bb2ad9eff92299d9d4c5c78edf7bd11d27d791fd1c8f438829ef3b0ced2478e126c9470ea198f3ccd20d2ca52e216952130788892c280c213e6
-EBUILD gcc-6.4.0-r5.ebuild 532 BLAKE2B fe0a860235c627ca870340098884f2aa14dc891d00dcdbc5afd81ef2db55a9006d63924b00457fe53e89b81abda549a08aa2b05a665ee2c3f256ba4d7af603f0 SHA512 da5b64937c62801ee0358fa2a6cd8e2b18baf2dd914b8fff644f03e1f6a31b2f788ba1a5633301c2500deefa29ba6f7cce6252ef98bceee20262f4c284213ff8
-<<<<<<< HEAD
-EBUILD gcc-6.5.0-r1.ebuild 470 BLAKE2B 4fea17daab5bdeb872e284aec412ca9a150d70b2bb9c49ff1b4f6bae9cf9628505939b618675d0fb87b7d444230e157fc060a9ce41a9a4e9bfcc8633a27cf76f SHA512 4d3178700a579a38afc6d861133ab1db75b7c045d60b8afa2de1739712024eca8de9b4301c06dd1870f09b4c528d1affa1d88eaabd86677ad9e46ae86ba1902d
-EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b40de377b2e3bf5bf2d9c722de9863d446c7553201be3f224be221f428ff1941da37ca1fd0e08d47ea86df23 SHA512 a9bf223ca8ebf6acbd501b34373d6cdb17dace9bab8bb0efee948f75be11bbe67db3f388c64320932e001d18ec701ee88a68ad36c5df1ec29c2434f40f5cd4ad
-EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91dedf97a2f712967b9170f01127903d625bf7085a43ec09aa2f813a917cd4ec9f94122db09fd4c02dd803d9df46 SHA512 7a3ba4a4f4a41480b04c499b86214f390d0df4dfac3e20abaf087e465a631b846fe303ee0db80d000e1f79a16bdf1722ee0e29055b311d8ba8a6c4b17c4fdc02
-EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c
-EBUILD gcc-7.4.0-r2.ebuild 483 BLAKE2B 8d75e4fcc62e82a81494297894ac73920100ec1d13a039daafc9a0b290e633e91e8eb7af8b0f8d93ad261387645066314da75a0f4cd7f233dd90c6ceb5861f61 SHA512 160f49984268a4487540681c190f68906561e2cc459ea8df6b7d841ae35ff805b7b070436e434d91355008722e67bdcc54db07ae642746107622a69a3d5f59dc
-=======
-EBUILD gcc-6.5.0-r1.ebuild 464 BLAKE2B 10626c5a86323b2e6296d1886838bda705159ca45cd9f1703428c678825f0afe0d07c6af7ed61954af131f9e55efb5b12485fb678504b19a58c03cb679276869 SHA512 cad65ddd4103904379d692c90f77dd7643cefde53eb65f380fb910601d4e578efeadbfb517b4edd822ef2daceff3fca5ffe97baa2486dfb1e483fa2c72cbe10c
-EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b40de377b2e3bf5bf2d9c722de9863d446c7553201be3f224be221f428ff1941da37ca1fd0e08d47ea86df23 SHA512 a9bf223ca8ebf6acbd501b34373d6cdb17dace9bab8bb0efee948f75be11bbe67db3f388c64320932e001d18ec701ee88a68ad36c5df1ec29c2434f40f5cd4ad
-EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91dedf97a2f712967b9170f01127903d625bf7085a43ec09aa2f813a917cd4ec9f94122db09fd4c02dd803d9df46 SHA512 7a3ba4a4f4a41480b04c499b86214f390d0df4dfac3e20abaf087e465a631b846fe303ee0db80d000e1f79a16bdf1722ee0e29055b311d8ba8a6c4b17c4fdc02
-EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c
-EBUILD gcc-7.4.0-r2.ebuild 477 BLAKE2B 9c87491fcf792fce171b14f36b203e339e25470bde6ab69fd7387b30efd887b02e5bff5036819bc275a048d8658d50d793d2026588a1cc050392e334072e2d7b SHA512 22837c7eeb5965c3949de57692f98f90ddbf52326358dad37fed410168fb4b04becbe22bc2c3743b81e4a63c71e9b79ec1bbb67af658b745071644db33f91c6c
->>>>>>> next
-EBUILD gcc-8.2.0-r5.ebuild 491 BLAKE2B 302b288193a8cf89d93a53e9012e7686111e5195d2015b219adab5b302245d773519ca0c3193235d0b85974e7237b22beba4d43431e46c9b6e554dcadf816198 SHA512 8270e48c6287c4674318ff5aace71bfcf79dd1e96e7be381d6e87f2c97d42440610d9351403fc7ba30733581919cd992a42fba208991970ad1fcec305f7873a3
-EBUILD gcc-8.2.0-r6.ebuild 573 BLAKE2B 812f00996ac141562556ec5f38a90d56fc208ab3a6ae19244dc2df90895fdd91568e261c1803ff9fd9fcba564b23068c41bdd40efa0b14fd7526b077663b3ff6 SHA512 27e4fb20f91ab261560a70190ab0127bb214afc776d9b168cdb32482b6d443afec1a6c479cc40ebdffd7753ba14ff66383cce6307ec0cdbef3ef30c1c7234bc5
-EBUILD gcc-8.3.0-r1.ebuild 611 BLAKE2B c6de68f5d524ed9823eadfee85fceba96d10d5f38f30861dd57238b3cd585729828b8ca880c4de07647a0a633db2f3f76eae214c2bd36a2836f550d3e5c77f3b SHA512 4160d6e5927408bae6eb959b202f79f38701d3de6ce264e35997c156e4fd0e9f186bce61d573c3bd3528022adeba3030581aa49dcdf77bb4a3a09184964c2590
-EBUILD gcc-8.3.0-r2.ebuild 567 BLAKE2B e66fd3fe5be9a0e7561bfffd36595437f571eb725a9a30144143c5ac07a339e8f2d2fc15ea146a27270bd8d59115ad4fc61485811d33f431e5ab4d3bfdd5a2dd SHA512 140fae277b34ae3c74a273d5f6db8890d4d3d004b7d6f5737c54452a1a233b26a17477bfd20313575415b4e2879d0d03ae9798127fd9963cd00c3cfc75784103
-EBUILD gcc-8.3.0.ebuild 473 BLAKE2B 0a75d6ecd08d361384ad5d351efef2f848ee0449826b6bb71405f65254beba62d86c3523ffc9fc7bfab7070781bc0fe106014c6fdc29eb15c7a7f78ac68e233a SHA512 98f7c39cb541ce430859e22298225ef9a2fd221c067ce93b736db56e144e699a3b2e85d99187ef9ffeb5fca9fc1ba33737c875adac2dfd098e20f1577d55ccbe
-EBUILD gcc-9.1.0-r1.ebuild 480 BLAKE2B a210acbb56bd1a1bc7edaf3a1b844ce9eba81b19dfb25f737c84bffb7b3f2a4ac018d45eb8add9c6c3e55379d440527d82dbd5fb2928399a9237b9bdf29649ce SHA512 85b82f7e77261559c40550d0fd5353098145e6429654c2e23622bffee0d144c096ff9b8932b224c16f391bbf140990c11e9163b8070b5bb719ab94ed6a5ad2b2
-EBUILD gcc-9.1.0.ebuild 569 BLAKE2B 37c81c52350c6d4ef28242aec8f0d35a71b69fa71cb0971e2ca8f9e6de61f4db2a56298fb26c21e7e3cfd7ab02aa37b05003a18e6f1362596fd7605e4d22dceb SHA512 5b4102d53b6dcf0c526686bc399bd345f6eb465e3bfc5e7e373fe91bc74739d71a71ac564a8077e2b3f266cb43663a5c39135c9b4174706b14be3f05d8ea953f
-EBUILD gcc-9.2.0-r1.ebuild 478 BLAKE2B a311a58900303f87c06bcae9e47bc3b72b8765a0ea5b81989c927d16a7a0ac6473c58484e360cfb697198351719d2f22d508e74e88ac0392f0e9a1c57dea9782 SHA512 bd193acc9a279a5165483c5e0e9be5b9422881b3d8374f044b2a49deb90adf4257a48a73501fe9cd717f5de4703905e6c1c9b49ef6fce271639c8c79448df8f3
-EBUILD gcc-9.2.0.ebuild 478 BLAKE2B c995e60e6445a2f6f7e3adaafa0c3606b3397f5e7dfe993a1d90e9e1fc9ec51c1c8818cf4a7477b50a4679d157b6a68d2f4b47e7c267ee887761a767cb91439f SHA512 4db08af75e195ec16264fd7f203679b2a8aa6b27e9dcaa6aacf0b3ae319f501d8eda7ddb2baf47ac806c55d115ddb398a284107b0ed5a9d5fbd020770dcb59d2
+EBUILD gcc-4.1.2-r2.ebuild 645 BLAKE2B 4e6bb17f0257f81df638f5a0fe5d21f267bcae2b1e103c35c2a1c24ec5a667895293eb43767399bc216734fd8c1505a657a07ded860c559e7474507b5efaf0c6 SHA512 9e7b1dc667d7c9713cb57dc9de6201ae5953b8c7abdcde7eb517bc5469ba9017914391190864ee8da47717712bda6474c437d445508d9ed3811e509ba29907a3
+EBUILD gcc-4.1.2.ebuild 639 BLAKE2B e05e77b33a082e8da1f2f3e4e6940b49a7380e74732ed59c0e21cd4ba64ad5ae14067a1bbfa799df8e9de9d422a570e203b0395ffc5adb0c99311f9c017dffb8 SHA512 84226545fe5f56e6cc27f56a53a2ec5259a5844ea9de13f2a5ec136597034c6c362bd90543bf4fd857244f5126576dd37729fcf4869f1c9ebb755641513328cc
+EBUILD gcc-4.2.4-r1.ebuild 384 BLAKE2B 0c2e15f263640875c8eaffb8ef818a870d8393d34864b606cc6a376a2424c6850c6584e6a033383fa86bfe7a9a8d55219d843517ac2a9336181270836e1dc26e SHA512 8cac17aa46816b7078ccb5baacf5dab88ecb6e5067fdf5baa0ea40847b2de51241d4f4c2a7df3437f71a617166d1378da679322d10740f8fd5b921f745974cda
+EBUILD gcc-4.2.4-r3.ebuild 382 BLAKE2B 1a4eaa374f6320d9d74d6838adfe15e75df48f772164ed2a29b307a2f5bb47043bf8a6ae615f684da09614be559e7d40182a86b43878867aaa40b8a9edfbc1a4 SHA512 714ce7583805a3ec20427ca3cb8674880ae6a3778eef072fa70195691e7559bfff4e5b58d670bff6ea54a0c9e0e59465c20d9a5c7e6f77894de2c8abb5bff954
+EBUILD gcc-4.3.6-r1.ebuild 620 BLAKE2B 0005548b6c588cc49c64c68357edd47b5f484b7d98bdb66e6c0a8f4e6d4393e37c43a35bb23276ffbea5f660ea0dfe726e0ec31340100681bc66366ac081f5df SHA512 6548f867b27b8cde18d2e22334c4a7cb52587491cc20553dfd31faf09633784cb9332335b45923f349c6f6769e1a8aaa43fae476a8d2db6979404b553054684c
+EBUILD gcc-4.3.6-r3.ebuild 625 BLAKE2B 05d5d5a9479619e2557469b8916bf4d97174d8a422b047b75450bae59a674540329dfc50064c9ec110a181e8dec0c37c4bdb1d7fb99fcf199fcaebcfa861a9d2 SHA512 d9b7b05da1b35aa0b32fb1cf018b5fa5e7b8cabe0227d17fd5c7d300b13e48e06bc6849de48ea79f911e8c61f8dcc474d93df2cbdce2b5ddf4cca0e7888e1248
+EBUILD gcc-4.4.7-r2.ebuild 670 BLAKE2B 26855169a9b2c3e030ab7d7726cfd49c868ddb9fa3a29b010901ad78a212a98da2d4fb6b5975dd8440670c6b8075df7898915eb07053febd8309fc307d75a495 SHA512 924332c285c4711d892ddf5cfb207768d338f49e15c98d82069f21e1359793b273fad658a660f98b06c65413ffd5fa823d42694443f2d507296289ffc964bab5
+EBUILD gcc-4.4.7.ebuild 664 BLAKE2B 9e73a4d9a1d6ee39c7c99b2ee3715271507f8dc7b9a19ef67e69608b685aedd35f8e3b8b058b9975905476ac6cf332f7896bc20dd6208d0782f2a63d83ce1c97 SHA512 59f87d093a20896ca84acf1819e3e01118ab7a87ee8206608750aac19f24d196aea9ea05d6048a64049fae45409b5b48559ea8fad53979758a59d93093b092e0
+EBUILD gcc-4.5.4-r2.ebuild 671 BLAKE2B d4c7b126e8425ea7243e7a0455a9d292d71e4400c5a1c2038924b3a82e6671a7aaae23ce25d278aeec1fc630f061cb33322a7a8252f1cc9a488594480e76b409 SHA512 9255d4766a9a7fdbcf461fd5858ce81815eee4e3360453aeefbb88d5edf1d25bf503719b4535f5dfed5c39d99eea02cd6a22f10f57ddfe05c9b4ea31b27f485e
+EBUILD gcc-4.5.4.ebuild 665 BLAKE2B 5b83269a6883147bc328c2cb773fa873ca866503555af6445549477df6f4c79bdeff45d1a6224970da5e6cb820da2fca375541f9cc75757c18e41de378b4a7f7 SHA512 b80d984dd1569a34f485d5c3cee2fb7da955849c34e6549f706e3594ca84e36d32dd0322d1264f12c7f3f1aeb6d56a21a7184311ed6b247814b6aecbc429854d
+EBUILD gcc-4.6.4-r2.ebuild 752 BLAKE2B 2ad17521fda216cebbd81f09fac5a45ea923099caa5ec565aca8d735045a44ddc11c815a41a002e695425fecc15c7cfc17bbfb5b8bfd6a940f89e5a154fbf08a SHA512 783c5306f1272268f85a259ecda8d4c6f681e5b0e4a1d44b6bc2e928191f69225083236f31ce7fd421a4c8bb68fcd1bfa2c43785f70a71b24e6a974ce6991b8a
+EBUILD gcc-4.6.4.ebuild 746 BLAKE2B cff0a4ba88b67c30dace6567e58729246c767b9e5ae38d0ab71071bdb40a1767e81fb88e95854ba8e9afdc433e6a7a9bcd4d63c0cc5cf41da396f6802a51ebe6 SHA512 1b2f1618e4ebe63cf6304e56008618611fc862b2e96279f3a09f4baecc0e624adbe7c41b9d3467a2d54c5c2a0f8fa1c26ce49e5383f799ad23b32c7484bb5c21
+EBUILD gcc-4.7.4-r1.ebuild 1266 BLAKE2B aba6e2589b35bd8e6d172941dad424aa7763d65c7ead0af50dbff1260a928a8c8fd88e6e80fb9ed946883ce66ae31ff19198532045c096471925450ac3a30266 SHA512 38d149c4a916ac0a4cf032000550285c8af692b2681058ab3af07eca5745bc3290a37b09a6fe1be1ef422dd9f2bf1531f9d32341fae4d534bea37458bced82e5
+EBUILD gcc-4.7.4-r3.ebuild 1278 BLAKE2B 7bebadeeece4abbac0aadc45a86e3cd85ee2f3acbfaa943835dd051ee4d157356a9434800371936a78f33bf7082ba216b7e205737cf9110488c60683b02df690 SHA512 fcacc27b7406fa747e7be7bab432ab9aca59d51fd0ab23a1f922ff074f6c77293791473a5630731332e4bb225d3aab9ac12b860b538e56bc3eb4a7e9567ef61b
+EBUILD gcc-4.8.5-r1.ebuild 1379 BLAKE2B 7e5b9f6c0eefbb8245ae85555db1367636a23659b44389548312eff6e1577672b12731a6ef53b514b605dfbbf056baa9ad55037828d00e7587c60eb4e22fbd55 SHA512 9e8025d98ed2503ecbc7d9eab87a9fa6f1a5f538e82a565c967f9da0cfd9ff5c2fca6fba9de6d7ab0ced4c4e8040ed21b4e2b453461a27f5133b38de575a94ac
+EBUILD gcc-4.8.5-r3.ebuild 1389 BLAKE2B 37df6ef3df83f2e01b5bb925dd9c5a2325b8901ffb7345cf1ce76be696a1b8a6d84d8e70ca0a1aeba27ed850569d88c1cbe60fb697bcb81fdae9f2d8aa49a2f8 SHA512 e24737d4c52e501dd6b18d5f5a0b02077090394fd019d6828bb20a1466203d0bf84be071c20168fbe104c9ec975e27a1e9fb6902a0b1fb8b7507cfd06f8fcb51
+EBUILD gcc-4.9.4-r1.ebuild 1448 BLAKE2B dc46a837d0c7cbf779acb42d2f594c24e31784ee3e2de2f19f105bf06afd8a1c6dea7b1b741b402c9c59f717be9c6f9311664b916a50241a009954ce5fcf621e SHA512 aa8de516f9b193eb83532761d7cc37611e70bc4e9bdc007e88935933db8ee10ef1eb1b464d79169754f98f8ae50586ac6e209dd91b7372b561fd35e39ba2d519
+EBUILD gcc-4.9.4.ebuild 1438 BLAKE2B 9c679ca2f020d789b6ff202c6e6ce4490f71a561ce39c10194f894acfb3b4c8c698e7829f412a0ab8c5261b1127256c9287a446b9f7e6c91fc59c2c5a3a084eb SHA512 8548710087c4f26a956204ea685012fd50c64ca331ddecfacca5dfc21299150d2b96dc75be2de44d13aeb315fb794396d2db57a41b6d6584835ee9f65b0a5bcb
+EBUILD gcc-5.4.0-r4.ebuild 1253 BLAKE2B cf875a9c59182778fcceae3cdcaf1328ad1b5862749357d2547d59ef0b148035437f9316fe9670af6ca1453f9c547f5f16a32e2ef6257dd07ffb3a7a3c1bb20d SHA512 57ed71a09f0450566eac1d4184336f4e1b139eb564aa5cb5252e405ca79140f40a98f0f78502db7e7ebe05873b0ddb9df97f56326b19262acafb9f7d4e1c6482
+EBUILD gcc-5.4.0-r6.ebuild 1264 BLAKE2B e8cb5d56de1caa4bce8ee9abd13b8162dcd07fd59e572d5c9612468c2826316f34e0c4691f5b9083fe56be1ee26814ff4c6c3a3d5e70d33fe6414d16496e31b5 SHA512 ee312bf2ab36a547b7b50f34362350e6da4a31c747974a5f323808fa9aa336c135a449fce0ddd3882771fc3eaf0e6f8a451b46745d35fa5ede810cc939df36c1
+EBUILD gcc-5.5.0.ebuild 1263 BLAKE2B b3b1d3b078f1ea9d1ddd25ff5af34b2de4ddbb9bedb15ee986ec09b5ae8182cf3ce4b4ef98e735d4585716a48e3dcb0341703a082fea3d17affa444f01363eca SHA512 74e4006d54a9a17f5d734b597169d2c5e9b84a1b07fb964507662e9432e2660f829abeb2b43f639d993f42333e88184aab41683f11952fcb000bc0e95d934a97
+EBUILD gcc-6.4.0-r1.ebuild 503 BLAKE2B 4e975145f5178501ab1395ff7b006c1801540658b4f22ffaa9d868a7317f9ec14a75ffb6f67152bc2f1bfa03cc18c660ae658598e93b6af7b4d6b24bbd3147a2 SHA512 7c78d60d0890b13035046021b9bf8e98429128841b3b9f8395a93c749fda540eaf74fcf2fb6eae0015bd201d19807d3c9ff868542359d85cad342eacfac8f93c
+EBUILD gcc-6.4.0-r5.ebuild 510 BLAKE2B 038be8e0a938d097fb227ff0d37f109ed8e5d4b6c27a22b0dabe1d63921e55678225e313a7eab1bcc59bbbc21d51f801a879e299982f238720ef012e16a3459c SHA512 f38908994a93fe52659c6e368ef205617c57d6aa039ab92773682b9fd5bcff3d29215114f79b52f32acb0b53064942316d1ca331a5c0257beb381dcc55717d8b
+EBUILD gcc-6.5.0-r1.ebuild 441 BLAKE2B e0c319a5db64d1c431415b6c3e855898b349f351e6bb069307d81a03d14bed0315371351cdc609409cdf17a36617404ba336dd5ed18531d17678178c474fbcd8 SHA512 b02f43a6d8b557ce5f30fa497d3264361de88ca38fc37fc7326ca295c75be6690f023f28ae1a2a7984f49ba6a55eaaad6e12dd51cdf76e4c64688d956afb3a71
+EBUILD gcc-7.3.0-r3.ebuild 512 BLAKE2B 5dcfac456882dc9fd89dc8f24b12971fc1f2b127923df8ff79a395d387cbb1394ae50b59268d0c850ee80d4867f8b2fd84b1ec8a42bbd647b8d5834150ba93ae SHA512 392d93ff982cf0d3d76b377e39120ec55e6a902b76d2de7e3c33893577040a49c93c1d82f03f058939fe5a757441becc6e1b7e941b81d97f05274f0583c5554e
+EBUILD gcc-7.3.0-r6.ebuild 522 BLAKE2B 755ad4c05d992ac021ee698b06a19d56c582ab920b609a97e97bedb3b7f89a920e579b00ab54cf8eb8cbe45c5a327389c3e069b647237b36e646bcf23e0ab159 SHA512 57d1e0ac05d6567e1676814d3e3a5e9880d74d9f468df2b015d28b296ccfa7740a8062ae152d6d398309f2ceb167f09db7da920c551b1d1a34228a016e1ef33a
+EBUILD gcc-7.4.0-r1.ebuild 462 BLAKE2B 4f6d76f13eb65955a6637a32fab88765c539766a6aa35f128520fb23f7277cf3ced0a5f7fb603ba68fa9a51926f1253f9a6006a136c5142feee110abd2fd3609 SHA512 3c2f61f81b47bfeb638549a86131c537a0085a72d33c1fd7609b7fd7549e9ee0f412493fa7da3a24ef202edd4e4ce7b37856307a70b07976c95e552b1656f8b8
+EBUILD gcc-7.4.0-r2.ebuild 454 BLAKE2B 001819ad19ea25d1d13ef1a5c882f255cfba78bbf33b88e18d99f2d7613b83ae13c6a6aa130f3e4aa3a187c99ea4361085386e5643bc060b6efcd4609f8032e5 SHA512 5eeaac1365df066b9cc664abb95f44f34d4c482607f4adc8a9cf7c52818c8179de548b1ef1d850931998add067b516d0e6da81e55a6ad0957317dc378d6b50ff
+EBUILD gcc-8.2.0-r5.ebuild 469 BLAKE2B b3692d021177644a95419aca62e9f7f11d0675cc0e5b73fee6232a2f4a8437d2735f74765420b8a4408be4c935217e915aa44a2feb174f86ab741d7d301c81ac SHA512 a91d521c557bfa79f1737d5023c3e271cce2bd88b8b9dcdd00d07e7944ff8d9a4da8175bd445fe813add966517c10398dc21fbbffdbbca906a5a938ad319e317
+EBUILD gcc-8.2.0-r6.ebuild 551 BLAKE2B ce07e5a5450b5c503b96e6000cf11cc8be10c80a7fdfb7928430cb9326470fc3ce6f86e85fe65931af282159c1d7eb075553e87d7d356c332bfcec0f6d154334 SHA512 8a773b462295156e8eda8eec0e173f667ca0bc528ed143f6da87c16628fcde56e96858cc8abe6cf72fb7226c088b95f998c8777d25f8a2f517240a3fed4a97f3
+EBUILD gcc-8.3.0-r1.ebuild 589 BLAKE2B edf51a3803f74dc734274c1598996a783c68e116cdddc7ce3ca596b87a9c6fb587c600ea0485a0a82afed3289a86f3d63d706ce3d706ccfd451bb96657ead637 SHA512 0e89f09a97f24420f100f992c6e066cc35c15ca62d9bb477088625e029e1da18a36b036a0b26954848487c5a8739dc7d6706d58d825898345c53c19c55083604
+EBUILD gcc-8.3.0-r2.ebuild 545 BLAKE2B 714a2df9755a80b710f86dbac1a4952a4c9d5cc8f4f02f8a72bbd51075f7ea4a3fc86f319a870262aabc968c4c8942f7f6ac1a3a42327c25e1fc8fae60839d97 SHA512 691189b20477748877e73e6e7084156fc64baa41057325cc1b2556745bf6509bda065e0867416b60e224e74be838615d1adea40fd0fd3ca067aa2d570eef92cf
+EBUILD gcc-8.3.0.ebuild 451 BLAKE2B 2fcdd71b1cfcf9b81cf2c2a26e859dec96abb6d749ec18bcd9926105db0dcfaca78aa3afe8ee59a52462d2a16f174c90ea33ea5fd9d59f6d88bbd2c60bec6afe SHA512 02704672e19662e9667ede97a5e85a21fbe760be3f48172bd17393701cab801e126bf585dd726fcd614002eda209bec06b60ca47f8e6139243f9c262bec3421e
+EBUILD gcc-9.1.0-r1.ebuild 458 BLAKE2B 0e85fb6cd36c50c7158df2c1116f2a022dea82b6a03a0f8680de6fc6b9350e3b1dbdcc81dd001b1a9d2897cd474d7b81234c8397a4a77f8a04dc335ed4ad94de SHA512 1aba6bc02aacd1eea97515269fac9ead83631882a69a4c01026d111a7c87860292929d914cdfd5e5749319a0be775fea852e6631f320744e0c169a21e74a4495
+EBUILD gcc-9.1.0.ebuild 547 BLAKE2B c4781dea03f7a58b88c3e860028801faf92638e50db24f2b2033a360d8de8e5519c8e3594bf59271cee087f36ab39bc8d84f8a5d42a67d76468f78bd27ba839c SHA512 d5287c6f8b1d406ba5eeec1daf7362651bef74a966241db28790d93388d46c0a807e87e880fbefdc1be76c38463591707733c8512daf35485e95dd2c824b830a
+EBUILD gcc-9.2.0-r1.ebuild 456 BLAKE2B 1168d4b532a519290ef57b889bf26ed1ddb68f2c866a0255054fefb6032f033dbbc367169e5c1930901e6e340289428a8ae275db5aad05ee30c23e54f73189a3 SHA512 1855114a1e1a815d3e4ef2316d4ae00d60900b08d160a74fce7d375371e613e07e80ed644bd8aef2376472b62634b05ba8f3233b5b055b02fbc3ca52026d3f54
+EBUILD gcc-9.2.0.ebuild 456 BLAKE2B e3274020a269fe99d86ec5f3011e76a29aeb04cf6337399b1bb282b2e057c7b2a9621d57548482c8428bd2e88477dd4c6fa8af40a8bb035874b4741867721315 SHA512 2d15d635ad6b6cae0382e2a771a184f73a1c51b472847fbd4ac12c1b019d49c7cce6ce71ff1904252d0c7ddde755f90472f334793e6707eb1b7303faf709d159
 MISC metadata.xml 3010 BLAKE2B 1a52f8672191d79b8797e777952e32728c88f7a54e05ff058129ac4281f46753beba81726e11991d3d06b3ff8f5d1613718b8e26c8897955d8438bca19a3fa60 SHA512 d6feda30c1d16d470fe5598ec28d2025f7b074899bb0a451e0b7e6dffdab2bc9c106b0cecd649e35d86b331fc220e8c4a9178acea510ebd23b08547c66089751
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index ef118a8b013c..0389c0bc4377 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
diff --git a/sys-devel/gcc/gcc-3.4.6-r3.ebuild b/sys-devel/gcc/gcc-3.4.6-r3.ebuild
index abb03a923180..3a6d9f58e5d9 100644
--- a/sys-devel/gcc/gcc-3.4.6-r3.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r3.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
diff --git a/sys-devel/gcc/gcc-3.4.6-r4.ebuild b/sys-devel/gcc/gcc-3.4.6-r4.ebuild
index 97c3f7c26634..691eeea7f8e7 100644
--- a/sys-devel/gcc/gcc-3.4.6-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r4.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
diff --git a/sys-devel/gcc/gcc-4.1.2-r2.ebuild b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
index d85b6868f570..574788a3f09e 100644
--- a/sys-devel/gcc/gcc-4.1.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
@@ -9,7 +9,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index 1bd5531ab99a..fb958bc86e3e 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -9,7 +9,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.2.4-r1.ebuild b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
index 10a790a9fa05..ccad607df6a5 100644
--- a/sys-devel/gcc/gcc-4.2.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.2.4-r3.ebuild b/sys-devel/gcc/gcc-4.2.4-r3.ebuild
index 15529ecc8370..03b5c5788ee6 100644
--- a/sys-devel/gcc/gcc-4.2.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r3.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.3.6-r1.ebuild b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
index d483c32ec950..13c159fc06a6 100644
--- a/sys-devel/gcc/gcc-4.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.3.6-r3.ebuild b/sys-devel/gcc/gcc-4.3.6-r3.ebuild
index 637aa208400d..f160e48e5044 100644
--- a/sys-devel/gcc/gcc-4.3.6-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r3.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.7-r2.ebuild b/sys-devel/gcc/gcc-4.4.7-r2.ebuild
index 7fde120f47b9..5f7a73a76bee 100644
--- a/sys-devel/gcc/gcc-4.4.7-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7-r2.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.4.7.ebuild b/sys-devel/gcc/gcc-4.4.7.ebuild
index 694e5426d2cc..34640172a986 100644
--- a/sys-devel/gcc/gcc-4.4.7.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.5.4-r2.ebuild b/sys-devel/gcc/gcc-4.5.4-r2.ebuild
index 1102974a8408..3eda7487fbf8 100644
--- a/sys-devel/gcc/gcc-4.5.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4-r2.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.5.4.ebuild b/sys-devel/gcc/gcc-4.5.4.ebuild
index f013c619a99d..0735102e9246 100644
--- a/sys-devel/gcc/gcc-4.5.4.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.4-r2.ebuild b/sys-devel/gcc/gcc-4.6.4-r2.ebuild
index 99f7924a0ced..ade4c68df1fc 100644
--- a/sys-devel/gcc/gcc-4.6.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4-r2.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.6.4.ebuild b/sys-devel/gcc/gcc-4.6.4.ebuild
index a3b35cd898a4..47155da62601 100644
--- a/sys-devel/gcc/gcc-4.6.4.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.7.4-r1.ebuild b/sys-devel/gcc/gcc-4.7.4-r1.ebuild
index 64bbec9fd4d8..e3d14526e937 100644
--- a/sys-devel/gcc/gcc-4.7.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -amd64-fbsd -x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.7.4-r3.ebuild b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
index 8aad0d383265..06c6d69ad260 100644
--- a/sys-devel/gcc/gcc-4.7.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -amd64-fbsd -x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.5-r1.ebuild b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
index 547dea86f3a1..bd652d8ed76e 100644
--- a/sys-devel/gcc/gcc-4.8.5-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.8.5-r3.ebuild b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
index 006faad08faf..4c11d5d39188 100644
--- a/sys-devel/gcc/gcc-4.8.5-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.9.4-r1.ebuild b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
index b935459e81c2..a1f1723df03a 100644
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild
index b5030ce317fb..5edaa285cb58 100644
--- a/sys-devel/gcc/gcc-4.9.4.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.4.0-r4.ebuild b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
index 181c11eabbbd..cd5748b36ff5 100644
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.4.0-r6.ebuild b/sys-devel/gcc/gcc-5.4.0-r6.ebuild
index 1c5a20716c10..e95e159b4429 100644
--- a/sys-devel/gcc/gcc-5.4.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r6.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-5.5.0.ebuild b/sys-devel/gcc/gcc-5.5.0.ebuild
index ac8d9c9e40be..629e831d74a6 100644
--- a/sys-devel/gcc/gcc-5.5.0.ebuild
+++ b/sys-devel/gcc/gcc-5.5.0.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.4.0-r1.ebuild b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
index 927fe13ced5a..a662ae793542 100644
--- a/sys-devel/gcc/gcc-6.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.4.0-r5.ebuild b/sys-devel/gcc/gcc-6.4.0-r5.ebuild
index 8f8f11741c12..138098ca5674 100644
--- a/sys-devel/gcc/gcc-6.4.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r5.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
index 32e8d79202ce..0a8f58febc87 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -7,11 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-<<<<<<< HEAD
-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"
->>>>>>> next
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.3.0-r3.ebuild b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
index 0cb2bde8a3c5..24887e44d2b8 100644
--- a/sys-devel/gcc/gcc-7.3.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.4"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.3.0-r6.ebuild b/sys-devel/gcc/gcc-7.3.0-r6.ebuild
index 9a748f4aa6b2..b1d74320f938 100644
--- a/sys-devel/gcc/gcc-7.3.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-7.3.0-r6.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.8"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.4.0-r1.ebuild b/sys-devel/gcc/gcc-7.4.0-r1.ebuild
index 76bd028c8fec..bd17a751b0d3 100644
--- a/sys-devel/gcc/gcc-7.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
index 95b9174eef81..62cdb74d516d 100644
--- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
@@ -7,11 +7,7 @@ PATCH_VER="1.3"
 
 inherit toolchain
 
-<<<<<<< HEAD
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
-=======
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
->>>>>>> next
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.2.0-r5.ebuild b/sys-devel/gcc/gcc-8.2.0-r5.ebuild
index 602acddf5607..73a14f4d9f67 100644
--- a/sys-devel/gcc/gcc-8.2.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0-r5.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.6"
 
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.2.0-r6.ebuild b/sys-devel/gcc/gcc-8.2.0-r6.ebuild
index 08707ae05afe..0fdec953b413 100644
--- a/sys-devel/gcc/gcc-8.2.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0-r6.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.7"
 
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
index eb795f49ca9d..bd9df9561f86 100644
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.1"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.3.0-r2.ebuild b/sys-devel/gcc/gcc-8.3.0-r2.ebuild
index 987d7f128651..c30baaab62aa 100644
--- a/sys-devel/gcc/gcc-8.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.3.0.ebuild b/sys-devel/gcc/gcc-8.3.0.ebuild
index e7fa7284e87f..15779b5b4bc5 100644
--- a/sys-devel/gcc/gcc-8.3.0.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.0"
 
 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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.1.0-r1.ebuild b/sys-devel/gcc/gcc-9.1.0-r1.ebuild
index 73c93d32ff1b..ac9e761fd5a8 100644
--- a/sys-devel/gcc/gcc-9.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.1.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.1"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.1.0.ebuild b/sys-devel/gcc/gcc-9.1.0.ebuild
index 16bdf7beda9d..3aeba122c2ae 100644
--- a/sys-devel/gcc/gcc-9.1.0.ebuild
+++ b/sys-devel/gcc/gcc-9.1.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.2.0-r1.ebuild b/sys-devel/gcc/gcc-9.2.0-r1.ebuild
index 29311a0ae4c0..112f62afbb3d 100644
--- a/sys-devel/gcc/gcc-9.2.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.2.0.ebuild b/sys-devel/gcc/gcc-9.2.0.ebuild
index 585bf05e13a0..6e7404c49e5d 100644
--- a/sys-devel/gcc/gcc-9.2.0.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}