gentoo christmass resync : 25.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-25 23:06:25 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-25 23:06:25 +0000
commit: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree: 6a5171dd615dfeee62a45044144c66e864738fb0 /sys-devel
parent: ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)
45 files changed, 1337 insertions, 3858 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8a0df470cd7e..246e9da47ee7 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index eafcbdeaee6b..e4a06d366627 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -1,61 +1,22 @@
-DIST binutils-apple-LP64-patches-1.tar.bz2 10235 BLAKE2B 3352170bcfe73c574217597233ca58c7d6ebeedf9dfe9da1399953dfe1a0c87fc26e9ba8864620ddd67c6f38e48aeb6950737637605f0b860eb4a0d246f3aff7 SHA512 5632d4033c39e47de3ec275d02100ed53408a63122fe722c26dda1b02275c397524b113e51e1334d3235fc7f0a3bb8e53d4ccc1c2e40f24c6129282846da22e1
-DIST binutils-apple-patches-11.3.tar.bz2 7871 BLAKE2B de4e909a084da79d139b7f07d98c55ebe8aac3fc5ba5accb365e0eb003b726a619369e7695f43faaeb6acabc1db5eba9195e8e22aeed0e864446ade48d13a826 SHA512 ae73528bd0fa47413caef0f65b0077011123ae2bcf366a09da8fcd5cb79ef76495f9c11560f039fc2f35405430d5ff0295913ba44dce1a8677bd347db179ecdf
-DIST binutils-apple-patches-3.2-r0.tar.bz2 4137 BLAKE2B 9cd7afbba5337cb9c395556b2691e4acd73ee323d643da4335f6465ccc29b06f889d01fb42c7778576607bfdb859e2df38d3ebf82d4bf7f0971079da6985f237 SHA512 5381a93d61c39993cdb294ecb238016e26cdfe283fae553f75ddc6662812709301d5208c770ac0992d1dfab92e4802c660e6fb4336ad891335ab716d3b042805
+DIST binutils-apple-patches-11.3-r1.tar.bz2 9041 BLAKE2B c881117e19e119173dd8c126859f8ebab5ff4024697c9650b8ba145c021aa6e251086d3678d80fec2672e78637a5beca795b71ae871692e832ba4e69a7a8e04c SHA512 eda63cd89f67674556dc75de719cd318f534544db50165d4faac454f67c557c9944e7e024c4443e640f987ed8c8826ccd578427743a86d7220c2ba90ed2206d4
 DIST binutils-apple-patches-3.2.6-r0.tar.bz2 3500 BLAKE2B f10dcf71400ea5d4bf7efb8ad906240765cfb56743274b3e1684eeb4273a35171aa4202d475920cff2c5c39e89f9bd1d7e5b0d38ba6c2b4705b0a592ba47e063 SHA512 4ccb8ebd49ac8eac4dbd0c1f24ee1836f216efd2e9e15b13072cbc76d8f83fbf4f1f6b3b60736bf5d5482af3e49ec1eaedfce8dd0ce1e949f915faf9c92ee0ea
 DIST binutils-apple-patches-4.3-r1.tar.bz2 37363 BLAKE2B a5ad04d4bf746a864f03a25d052197ed9a6ecada1f34460f4e38bea8cd87dfe2cb6c7f99f2096acac2231cd1e0c13c53757854b07f729a7a0c5a162a908fbe83 SHA512 f5d64ad182891c3af971e6aabd3c0c1b717b6a1cb471632339cba61b41a998d15880d18de09aafa1c3d059e528c888d6e8b914025c79bc21897d90a6d0e2ebf5
 DIST binutils-apple-patches-5.1-r2.tar.bz2 51642 BLAKE2B 1b44020a05e0a91cfe569273f1e3dc65afaeac4bcdb80a626bdcc1f30cf8fbba6cc7bb522ece93126d4035b2d309defefd17fe0cee5bcaadcc58c4fa0feb4827 SHA512 37ba0dcae6c10b54a07c6208f6893ab80b0de1bd1c2f677902f707c8290629f7671a481e256b57a18bf304b95e41e4d59519bc1c88f15de488c0ef7e142f5cd8
-DIST binutils-apple-patches-6.1-r1.tar.bz2 42189 BLAKE2B 8505acaff6343b2f4dffe9c1dd78e360762f0ad78d39fbc0227265ed8b6768dba62c1a7d6784ca685934942e1a211c70275474001b066e3292c579fa0aa2f356 SHA512 be8ee5af5c8c9f9228cf6980f032aa101058ac1a414bec89401dbc4ff32ea96d6ebf96b7b79285fa1e7b4037a9ed68b285dbe59ff8e3d3e62bfc0145199e72f3
-DIST binutils-apple-patches-6.3-r2.tar.bz2 53029 BLAKE2B c2e7d773c00d3e6e13e01ee23a8aaf1986af31d2e1390a49ff3932bec45be916af56584a1d218412e2ed528bf55bd4de3942fa1ea3e4d113f841699172ab295c SHA512 bb165ceaebbb2545ac946c94bcc930ba52de452ea71c984d3d92a5b5105507de94752c3584cf05bd27ea288f5353e459c31e97f45553f2ad993249023f486a71
-DIST binutils-apple-patches-7.0-r3.tar.bz2 57504 BLAKE2B 2c894368141fa68c2b5ee85e05309233857afed89e81a89ff9739570397042e174921c9a174b026c61cf04d4bd09b84600a6acb8ac0ac6d55b59d37667ccc0a6 SHA512 4bfe2f1f29f3ca91c093af6b95d16cc315fe8098fb5fd0230458ac2575b34110c250d848b8d9a5425136069b5022d5005fa099489ba6534dd38d1c7049dce009
-DIST binutils-apple-patches-7.2-r1.tar.bz2 2924 BLAKE2B 167fb37e5cb4cae8fe6777dceb1085eee68ce601cf158a9b67d9f77113088c745551ef1500e1fb82e9e74a15bf010fc8e07728506879b5f8ee97fe10b93cea2f SHA512 1285ae5dfcac59e3f27312cfe53683df2f3f166a28ae60e78bc4d25fab6de2a8baf99a4e166638ea90b5823b9c9f0c5feb2a16265c7713fbfe81b5f43b524c54
 DIST binutils-apple-patches-7.3-r2.tar.bz2 44551 BLAKE2B 036cd2a2e4a66b046467f2984cce1c15f0d07c6b66aa6c8df3e07360943104aabe6f2555a0094973df71a5844496cb69d97a0ff13366043e02a01d8fbb0b0239 SHA512 219c26aeb54e89e23ab91706dda0803cf0c9f2a33acb5cc676db2d2ea33ad22af0661ea19450ad8f1f006f6c1703269fd95c98c52a7bcfa0c6491bc1cfb1a0ba
 DIST binutils-apple-patches-8.2-r1.tar.bz2 10830 BLAKE2B 345db8619873e9e91b79c3fdc0685fc46f82366df0b6153c1a59fbe5c122622e799754397e980e8752ef01ef25bbac81bb8f0339e92168790211b1d9c03bef2d SHA512 e7ca8cbac75671846c044abcd5415cfcf5832ff71acd5a2799b643369b02f2f7148990398c51913a3758e589f9fbff875e333aadf568e2a8a2defeafaa2aca95
-DIST cctools-750.tar.gz 1947990 BLAKE2B b0fe71ae6972bd2b21c1ecf7a699104c51519babf67bb5fc45e31ed1d17108e7627cb46b5f65d48c33dbec9e9032e703924e9a9a687ec19bd384a3cdea243a46 SHA512 298a447757d926b3d156aaf8be27ceadeb4242336b66cb0bee0fd2dc8bb4ad3f167758ff526e4bf3fe458cb72391f5dc38f9112171883fcf28d49a18d671296a
 DIST cctools-795.tar.gz 1993795 BLAKE2B dc0915f8647eecba5352e34dfc5752b679df39ead9a4734c49955a824d2cc127308eed46a614665dfe08a9d3036eb37f587e1b765a7df727facc42a33befacb0 SHA512 5a34a73dc71d3574a357f6b0f26a48a99dd0995d62695b309cdfe85c4960934b410455b1ba6bdbc9a4e32106bb45b35555604975d2a80ad1be21f5d4eac69254
-DIST cctools-822.tar.gz 2024412 BLAKE2B 6b58499a9dfc2a1b166ff428f1e263cd44e03c50cdc8f6e467cfee93bc2dc2a9c81bf7626479dce195b152f04217e2d3a427afac45484cba4c5f2bdfbb7e46f9 SHA512 8b02cc837d5e0520f35da445f25ba86b5042d5caa27b49a599e829ed89428cf78dbd1831bcf6c18301f941fbfb31ac2114e248041d98008a466e1574f4fe1586
-DIST cctools-855.tar.gz 1699635 BLAKE2B 4d98cf2bbced6894083dc2733a35cf9a4c47f71172fe98265a8f047218cc90276085919129553e3a1ea0658416eebf3b7cf0908bd32ac1a224480554257999ee SHA512 50f5d015ce807aa5ca274dd2deea810b8b375110e60b5e334ca4b2170526b738ea5f86a5436caebbdb748badc3b89601d0f450f5b867d8393c89e336a3db4b3f
-DIST cctools-862.tar.gz 1702345 BLAKE2B de84058aa78824562b0eabf93a29badaba0908a7140336a281a6ea46a9b09d893433a908c299e8de866a76e0eeb98b730570958fc8fac559ccc6e35f5138b121 SHA512 faa401c1dc55bfb9cd2a9a9cc7bc9d473ee63b019607967c8b0da325514d6a1f7b1f52404370bcc018e86d30d75a4b01183f49b793f577110663efe43871360a
-DIST cctools-870.tar.gz 1702965 BLAKE2B c0e6ebe33ce283d1c89d52df0a6d99c7065131e215532ad5e080d22e9e4742a146a9d448043f3b9ef8cf36ff971fe52c30fe0097b2a0ae5a9a6bce271232af46 SHA512 8cd16350bc2eea576e3922f44de3d15cfcf492a5561215a3a9160f2045284a2fd0fa28e030686868bae8619993fc8901649d7576c56d86a423f9955b27f65138
-DIST cctools-877.5.tar.gz 1717664 BLAKE2B 36f64578c23689e1e056500a6368854d5c80f49984d7b910d0b347042ecdcbb613e47ab83191d07ab6daa9bc12c567fc7f5aa5d97b817f80f96bb95bec4c24f1 SHA512 cec8520450c3b1ffe77bd841ad6b8f6b0d28657e7c39ae1525bfe7ec1460c0f4bb394da316e6ed5b08cb5df26b757b9d94a9923cc7eaf9b14315d045ea891062
-DIST cctools-877.7.tar.gz 1720523 BLAKE2B 78e4d387b34504a001a5dac2db5f791fcbeae7f1fc859b794e9262464dd2a6ad088dde07e47918d1b6fb3e6aff2b9c2ca495113135abce89945f4d1d75f252a1 SHA512 5c381fe8b85d1254f660eb3c3510d9e0a49792ae5bb0e69a4dfb5a18e7f1706ee1411589f20583a9d7f12126ef616f66f1ad5c1c4ff405f66b52759c0a4272b5
-DIST cctools-877.8.tar.gz 1720708 BLAKE2B 97bce69d7c88a917ad1351635b4bd0ebd3273f7a62b10dd3d58a0df7e1de2e05dc3fa04b014dff6966e77b85e264d1be181ac4d5dafc069c72c79d803393176a SHA512 3f75fbe4eacd89f2e6372a3167ed197e2b8bda9faa10fe6bce0cf9d3d3eca536f0af5fc4ce1e4bc6a24eb68db36f5d0b1d0bc3f9807e285e67cfaa2d336d81ef
-DIST cctools-886.tar.gz 1731850 BLAKE2B c206ad8c94fa3d132726db8cbc60ed09b6f1f7aa8118a99b1e7ed350323c11b729d68c912ba7648cf900cc2a26cbff12a03072afe92efe09c8974be280448731 SHA512 49f14e165da3a9fcf16614a810b8a2a68907348bd27a60b268b330e416a0bc070fb6445e1e6b80d849026bd6ce7de4459623ab86168e2d63bb492d1ba6680c5b
 DIST cctools-895.tar.gz 1716126 BLAKE2B 9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309 SHA512 4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
 DIST cctools-949.0.1.tar.gz 1968671 BLAKE2B b38fbae5d2ec011a94c2e4ec299c1ecd173f2c2516664cf925b06aaa078e234b59068158ea29dfcbf763ca98c73bc1806a507fbbe49a8d4d0a2fd4e602f401ce SHA512 13c493a48852c980d2829d28616c18640ad5ebfe6acd55143c4c948665e0b65377a459560667074fdac5e69bb6360fea13d988303c49fd3dd4a58e9b5c54ebcb
+DIST darwin-xtools-8.2.1-r100.tar.gz 2934997 BLAKE2B d0324d47d3aa0afd0007fbbd16c74e046c643c645744cc7ef0535eeed275c2d61763a1c6708b3a0a796f0fc83e62b5e5fe907c62553b439bea750353cfac2f73 SHA512 7000bca61b1dc63d1d08a9bcf104dace4376c2656af0faddc28a7d6c3718dbe54713da96136091a2024a644eaf90758714d1e4eb3cfeec2df0e412d847f59c30
 DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
-DIST dyld-195.6.tar.gz 412518 BLAKE2B f525aac0020baa69c5d7c42a7027b0d2fdef9fa3c2e5d3831101989eab20f2eb7932c99355ca34e6e0b988b9808013739d452592e0b8832e1306cc6027cc5d0f SHA512 58a9ea27efc02e66f9d99bfa250af1d90326385385431e5279386bbd9ab53366bf7e8236543296908b7214c33523c8f60098a6298a7393b3180e2a6bce18e7c5
-DIST dyld-353.2.1.tar.gz 510036 BLAKE2B 6f355bcb87d6136d3c29b2766146303ecf092fb407296a0a93412598276ea88c4f826da75d20cc5d3e2bfac750a62c413b117ee95dd710eac83b647786fb109b SHA512 a9488620499f682e245b55b7e0e4ec02fc0bcf03bd8a70d4a4ee0ba762067ade2f41c188990c101727476d41c19368b4cc89cccf2df40231da1c777742c7391f
-DIST dyld-360.14.tar.gz 518873 BLAKE2B ebf651a8880ef337ed5ee7d5d7b9d2da77fed481f4a01c52dbc81e1192138a423bafc89b49417d1edf36167c59600a6ef63d60c2f3e080d4f77b19405e5b0755 SHA512 cfe536ea1f0ad8fbc2846417289e3e36704bf69388e083e0ece0ffa6eeee501e7e9b2ba47eed7be0e5120b5cc72f33b2fc0d2d39ba7a16beaf98db94dfb4ae40
-DIST dyld-360.17.tar.gz 518876 BLAKE2B f627c7628b0956fef040a526116d27db14010eb0769394c9130d5b0d24d0d03a471d1c44e9533a34b1832f542a98432f2045b309a85dff4e0c1756f7bc1b0fb4 SHA512 aae2a0ea1f4130de51aa920ce1affa579993b3b58a7d398ec998c0d7ac4919907ba4e508b9bfc15080b1f4f4cf15e4615bc416b6ec32b52a4b5d8fbbad1dc9ab
-DIST dyld-360.18.tar.gz 518957 BLAKE2B 536954a681a18d55f9dba6e4ec2bce116dea84f80769c57518b50b3187625a7384bb77afe3d8b24c456da3ab4d8206f1ddfdbd008e4674dc1f5e9574ca09596f SHA512 1299bd2dd5cd663917ec4a03ed0f875e0bf07d6680d3d095af12f4b11960c02a52e361bde27ff88843f80832fc6d36654e2556ee0a3ca2259fcded5b568ab2f9
 DIST dyld-421.2.tar.gz 625173 BLAKE2B 8f8325314861ae2ea10fbe78c74c7199b547973ac61a8e9cb76fb874a0e53395ea31c04e489f85ac7cfdb5715ae5051679453de75eb195e313113e7bbbc70340 SHA512 75f2fb840da980d44649aa3e045f50c4e37d4403fbdb1e2e5f1a85bf6d8859e1130053c3806f7ef992fdfc6573f7f18146263c690144bdd3df31452c6bdd8bd8
 DIST dyld-551.4.tar.gz 832297 BLAKE2B e65c5b2ed90af6ec94f1295efc984404af99f0e5dc666bfc854379f13fd2e98b8048fae84b7bc8864fe27112abf12f741a33cc404b18ae7c88b7abd6a1d9e3c6 SHA512 896281c4b2330c92ed538af58f1b60906ed0a9ffa3099a5e8ef9a15b7ed974259bf546fd2ab7562739f2c8cf1fdfb44ea0ea7567092c77f2ea2cab377da064b0
-DIST ld64-128.2.tar.gz 494361 BLAKE2B 787d145edafe56a134ead84ae376842d9994608a771d0512a6f56738e170c2498a031c77c895da79b30efa309986c8cd624f5f09cd9784f63c7b2d2e0334e0d9 SHA512 f50a3c396e6f4fddc685bb3f59f9a260bd2f47060535d24259b2b411e4f759e48daa35819da682ad9bceaa1b9a1981eb34716387d988cdc4b7eec9ab2169726e
-DIST ld64-236.3.tar.gz 624400 BLAKE2B 37c074093c312fc9720564aa9702d6007bd44252a1282c4c67e0c1b75f6f4aeaf5b6278df3d5ed5f5baee948c547a462476dfe5eabb665612e4d31d57f26a286 SHA512 e103fc5efd4d4161c7dc55b1ad53aebd455cfcd72de7873ebfdf5ba896b7b0da9c9aeb12e1e1a76425768ac1dc85d864a4ce33b5b841ba115eeab96a2e2965aa
-DIST ld64-241.9.tar.gz 639944 BLAKE2B 1aa58dbb4e42b8314421bb10867aacd6cdece7a5983ed88571349e97366b61c1de175769b2d9f7b04495f2f306406f8a6fe785548f74dd39f419f321ec24d93b SHA512 6958e7064f4fd8b47501225fc4cbc6292e5da63d7f4103ad79add177ef7382c8de3c732f14d19a9c11356b8070f578392383caccc3795e2ab8ef7b7ddbde88da
-DIST ld64-242.tar.gz 641597 BLAKE2B 09d241cbd24e98cf59cd4b25f2237fb518bbd6550d753812ea24ab7f1acdec0082319507e92b77362f61d599eef8c8abfec48dc2c87678454ced3b42fce917c2 SHA512 bde2eee69ada7f81d5e97762c371661f304372d5461da4bd843c76d0abcab518193fa71b917850af2022e586a756a3624a0ad28debfa8de6777e3c255d83dd34
-DIST ld64-253.3.tar.gz 671087 BLAKE2B 33d00185bdeb7eadc8c1f94d338ebe08c23b8944daeca794e1ee8e58528d6c9775eecf704b098a87bc0a3281b2e3dc9e634714923fea65cc22977b2cd89cfa1d SHA512 ce2c86f2f37ee37bd417315ba51815707b0ca6f24da06819fd1b2d0b4fe0762e45a08c3faf2c0c980e4913c9cbfbf6c8185f9a6810cfa1d9dad231b5bb276081
-DIST ld64-253.6.tar.gz 671838 BLAKE2B e7b05c658896a799cfb6dd8d4d74ec16d9a2c39cdbdfac1e7d3f6b5ccd4722b343a9567dbd649e71e96742d6b2eae74ac951bada8899be51f152809c579c73e9 SHA512 40b29e273ed3d69e4f92593cadea831fd618452d3f05e30c0b836ffc05db61fd345cb2f6d63271563c786ecabd47f19f8369456cbe6422800117a53c654a98c6
-DIST ld64-253.9.tar.gz 673388 BLAKE2B 65af4f3ddd49b15deecf824fd991d41e5223ff9c963a0ccc89862181353c52279897171d37a00939d6678f2260efa7f7852b9dfd71c2c7b4b00d3fa2dbd85a34 SHA512 a52b081295c19f28858f8ee47c05249bba3e15cc8bb6f7017d9f6dcf7509cdacef7a4b16b3940cd0b1f72b3b67efb503ab2e3801b31e50cda1d34c6bc8df8dcf
-DIST ld64-264.3.102.tar.gz 681509 BLAKE2B 4a0699ec761bd145b8034c8577ce9f843c9384fee5486855565d1d89858a445492d66aca2798a6e9c1bb4f59328680c05bcf1cd024d917c063e74d3549073ce0 SHA512 ec221de3624dcce3db694ec2d7b05f3c939cd1ba79c97437ba9f2d4e5d9c37369bb5df82cc37bc158bf5c4e2128cc2b96ca1a7477f98538850092bffa4601da0
-DIST ld64-274.1.tar.gz 670493 BLAKE2B 00ab46b09f29c6143c5066ffb0a12017fb2268a5f205c41851a95bc38443aa5494ce81b793a6668bcd3a8abb0ba4215f0da372c413ae52e4ca1e437ad370f8e0 SHA512 ef5d6802f759e09aa2dfab7eb84e9cd2a57b28da3f150833cf1a922c395dd696e501b1bcb10385cbe995f4945fc6c99c2d2d8c50c42f369186bdc1ac3e30ad99
 DIST ld64-274.2.tar.gz 671652 BLAKE2B f45bb65bbe65c7baff54dec633a49b8ea472a59a7978aa050b329132963b26e4a2b3ef3dd034b04247531a11a07de5135b3726a429165cbfcae50e06c09531f4 SHA512 7b4e17f199909450b697bf719564c6841d46f5116c48dd47ff483ae7ddfe2965db1b7c024ed8ebeeaf90cd983ed353b95f7f23c93c8971536977dc892e6d6a9d
 DIST ld64-530.tar.gz 744871 BLAKE2B 8117160ffe55c02b463559a52fcbd109629d6e2b4707f36391ec2151785cc1ab5be911129397af7bea05f06b2c718bc345a1e3b6b0838dae943f4083612af38f SHA512 0197ec05f9fbaf9e1902bb6e0819d0562573a433e0445809f1020e76126d3af57222a8e9e187fce793a5b581f825b48bfb5ec5cca9ae3eb77758cbc7f20e9e20
-DIST ld64-85.2.1.tar.gz 598524 BLAKE2B 92cb3c763cc067e2ee6c4fec910f078cc69daca2a328a74ebc988908b1655138873b69bfb0c19b284f0aedb678e99de3866d4f13460cb3427985704093dca37a SHA512 b5ffaffc43e74f22688fecd9fb3023a59160cf051f9412f34e6b0acf1c4f9d43ba641e199d8d6b1c6cf3bbbbf117645988fd879ded1fec8be056b6941fe79999
 DIST ld64-97.17.tar.gz 421947 BLAKE2B 56820ef28490f2e0181d6e36b87506c6f00ae5759afe304a063fb6bd1904ace566ef4aa69ff0d235d65968af547a1a5735cb23bcefa990f418740188d399b637 SHA512 841774a1a7c0e2f661ac7e66703f7578d8f11274897ffa15f8c49daf290a23465763f264a4dae99f15754891f44c425c0d327652112007b499bc8f755a7fc9d6
 DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6ffa26eff10016c8d6d175d3b671753cf8700dcdbae7f0a9c01b16e9cbd3c9fe86697608f1f08a8eceb64782 SHA512 57106eafa1516791b4e0db2de6c6336bc0c1cbd8bf098a6d3a809fafa457802c95a7aeae9137f4ca5922a3018dfd8f597907ea4187b0afbbf267500eae00041f
-DIST libunwind-35.3.tar.gz 90002 BLAKE2B d63ab0ae6e66a6f35ec17de9713d3bf4853cd80af218e868762b20dd8a44d42cd9ff8fce1d8c46fca4759144726bbf248a02a5dede5a94a2b75d3b45ddb7d018 SHA512 b7d9a86ef24f1fe9ca14517471e03a910219a229af9f0d4cf94435115971360640451107ba20c93fb1aab788f8b6eb5ed580ee08fdaa990b9fa43e9ae360c6b4
-EBUILD binutils-apple-11.3.1.ebuild 11874 BLAKE2B b254cbffd41be7f0e4dbf7d534c20ee33011fd6f2685e57595777c1e3be833d25f03bcfd2a52c40354170c5ccaa28f46bc680e020e6dddf86f434482c353c821 SHA512 314b8f699f06f285285cc4fca53b5551af50f79eaae4337d23c7ab025aae201e103498d3c25c256e028ba6aa499e4212ff7d1b63ec5ee8077dd50fbfdcf0d1a1
+EBUILD binutils-apple-11.3.1-r1.ebuild 12072 BLAKE2B 503efec8e7918f50ef1dbdc12c8c6e0e9eea9e4742e936b64f53bd62a1c9b6c088fffcf9a2e8f5efc0c35a1038cde09682b490121cd07dc7a75fabae5e93d4f9 SHA512 18ddce3981b0b7bc7f9fd15fa402d5cec01f851003f892e6b57499654b5cb681c7d1362b49f76358fca1443cc9b9082f4ee491c814b70da019bae25667b9007b
 EBUILD binutils-apple-3.2.6.ebuild 6937 BLAKE2B 649bdbc5433d05db4fca58b4cb95538fae8654ac0c91c95915f172a92a4fa61724e57876b0a9ecfb09d1942060b0298da3af5577033bb8a860807d6a7fcdba08 SHA512 617d78b58688d9f4900d65bd49f90c21c64d62de48bcc42e63ed9a5f2468e29e5dba84e17799eb2fbffa064ce5b0087fbdf5669000b0dc6a2eb30388d585f123
-EBUILD binutils-apple-3.2.ebuild 5855 BLAKE2B e709686ef502a5d015b8559b2102e45daa586b66f9e6ef60026baca48baaef4d2dee0e3ed757146d9842676de074827fdfd23dced29e631d75e22e1ed6668103 SHA512 76fa7523601c37302012453208284ff0ce5f2efd6442a2df54c8b73e86d427ea8c1d6a8fb4045b0987cff1232b0b7f93f9319a68fb553e7fad04f6046b8b14c9
-EBUILD binutils-apple-4.3-r2.ebuild 10207 BLAKE2B 8d115224cf5fc41ba2d77fcd9effc8c86e28d18ffdd97defdf9d3739136682dfd02de84ce14e429f3ebe45ec614152ebb8a574ebab6ad6f14e23dba07e3742d3 SHA512 8aa25ac3326aa24bf501201fcd8c07c98d71c8d2bda8aeafacf854318b40b101b2acc112a4d81817269908294904b1ba466fd4eb48e162f65caa8f800be77a76
-EBUILD binutils-apple-5.1-r1.ebuild 12103 BLAKE2B b01ad672d7aa2e473458f87631def8179481cad1391a353693839966b94be8e340144d72f1660bb8b45a48895b4583ff4f2f26657fa9aeb4f735a9087c0cca28 SHA512 a6fab818f451f0e1eb845f98e548aec7e089c879d5e9c543bdb7683cba16078f3ccabb7967e98d9b6c9e8bd79b0c9233c11bafbd96a69e628ebbc875e9f50957
-EBUILD binutils-apple-6.1-r1.ebuild 12177 BLAKE2B 9df959ff5bae06392acd30e5dded62c1831cf1e3bdf2434aacf599961834449e2456458ae52ff5996769a38def8c2015d8cbf77fb031f39dc856ff14d7a61723 SHA512 a27980c8b5362491fded65df6fdc35684049261794b4a996eacee63c9ba92f80b26274de351b639b4a5eb2536515ab5962158ba11b833458445ab64362986215
-EBUILD binutils-apple-6.3-r2.ebuild 12195 BLAKE2B 1aee908d1269368deeb1095faa36d6527a703d8958917ca62ad2b530f4ec6e60117e72cd99f68f989d83fe305fa7bdba370ce5fc2f8e063bf2aaa1bac92fd34e SHA512 098d4b94ab31d7f72f28bf4c911036cdcac9534a5ff1f5d4ed16d7af0eb84945e5d01b676bee326aa13e0f8a37538110800305a23afbb80189a6087c69caa3f7
-EBUILD binutils-apple-7.0-r1.ebuild 11871 BLAKE2B edce88bdcbb869fec564245f861d0f1ca6898d0fc939f8b17000cd88b3b9b4710ccc54101487b5bec5ecd923297d143f1a21a47d9d71bc9d0a6977efb13d21f5 SHA512 6a33926bfaaa7daf42b2be85f0667b91f1390c4bcc7a3053a5af078dc06bc2f06e4c34a6929fa2275e254a8926b028bf6e438f120d35ccfaec30a87abea87e43
-EBUILD binutils-apple-7.1-r1.ebuild 11871 BLAKE2B cb2c16ec3f922e2b5613a7a5dd2624542d0b867966e9fe558730324b344b2e3c28ca95f66f98736c9f8065ca1aa3459282f37bb8cf95dc39af08c23c53962cae SHA512 20db903dac989e61dee78187ff033399515301a99dd554522b6925b436cee8095d126f4221726027fb5d142ecdf77799f8dfeb973e3c699864c5b7ad56c275f4
-EBUILD binutils-apple-7.2-r1.ebuild 11943 BLAKE2B 675e352ea19134540d25f7d71c027b9abf74f87804d0d0738c751025286f45da2026dc08eef36cf1370b620e352837ddf2fa88832e0a0fac2ab58b1f47f8ed6a SHA512 63572e3c110f3911762012bab6185082a3fb65c47ce7f20199f954fc672f5aefd049148e3020c5a91c22b08efb61b541a8c318f4a21c28ecaeb48acf8fd37128
-EBUILD binutils-apple-7.3.1.ebuild 13155 BLAKE2B c436339d7c06e06e0f4dbeddabc0eecb699588f18d877cc47f555b1f1ccc749c19836e508b45f024564d2e23b2a2ae694bda53d97d07f8bfffb0a03023bbafec SHA512 c111e2eee6cf3803ff3a10e3f83fcdfecb9207803c208100c0610c0a2200263e140c1f76db85e3947aad81aa9fd1a9ba9e4d7a5a616a1003c8057961f3ef90ac
-EBUILD binutils-apple-8.1.ebuild 10340 BLAKE2B 4410c9bb7642e2ccc84224724cbba2a942f32bbc9386043613c271c9e8f93c2b9177868f3b784b84f1393a23dba62ed23e5d404d8578cead0ab6ede5af75a094 SHA512 27014523cfce9f79cc151626e6954b54c9fa73806d67ebb98197157f3edea2ccc24b57c311f67c91360cf59082a69df9c37fd0340d3c0005b0fe04733a7ffcaa
 EBUILD binutils-apple-8.2.1-r1.ebuild 11367 BLAKE2B 572af74e5a95f6c120152fc7627ac1a2634a8537ed28400c827d683cbc7447bbdd83d873678ab2e459770a1c515d43c759b0471fb3ee531d5a5c203dcccbd774 SHA512 9a49baeda4f83da08eebcaa8497e1149b490b3bb7a49d32106a3f4ab1b770d7ed0e499c8ae670ebb83f671bc20d97a8e61e924a736e408e469a4146b58418e80
-MISC metadata.xml 684 BLAKE2B 5cd10b7a5817bb4fe8b94ffbfa422e43c0f50c2d7d6db881ab82b4741f24548560fb07c6f4b1bf8164ee80ec7052147f7f5158640e4c9fa94b950871148491f2 SHA512 e588cb802b2b22ee656b9dcf45d9d372a3b306fa3574a7d859e2df9032eeeab63219a9d9b69249a5a67733dff4c484da17621f00d2b0775935f2cfa5a6f91977
+EBUILD binutils-apple-8.2.1-r100.ebuild 2543 BLAKE2B 2db8d00218bb9047adada4d64a9ff04ff877c58095198fdedd4032be79daae71ac6d08867f28737c62ad49ef8f455ba1240340942754f6ae5532ecf0dac78d9e SHA512 695fb60963860ada3848850ab55f649792948708e3eb410877f8c930d7df21ea5f5cab4bebc0d25226dadb27de975878c562879d6e6d1483fa526d86331d57cb
+MISC metadata.xml 501 BLAKE2B 98bd13a9501faa366c3a7dd9eacea30192cd55429102d920df8722e2565eac472f2d814f09c5be5c437b86a5d404af797d521f0fc1fb4dba374e23af31fccf6a SHA512 026c997212e2bec4698613ad9f5517c5a4427d6da1cd8a8afe3d2f549edbe80f3a17d0c345961a9dbbdc730e8b6b33fdee97f66b3309095803ced0fb9202b899
diff --git a/sys-devel/binutils-apple/binutils-apple-11.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
index 9263d8e00b0f..fa4886114d0b 100644
--- a/sys-devel/binutils-apple/binutils-apple-11.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-11.3.1-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
 	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
 	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.3-r2.tar.bz2
 	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-8.2-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-11.3.tar.bz2"
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-11.3-r1.tar.bz2"
 
 LICENSE="APSL-2"
 KEYWORDS="~x64-macos ~x86-macos"
@@ -79,6 +79,10 @@ src_prepare() {
 	mkdir -p include/mach-o || die
 	# never present because it's private
 	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
+	# TARGET_OS_BRIDGE is undefined in TargetConditionals.h of newer MacOSX.sdk.
+	# We don't target BridgeOS. Disable it to avoid errors when clang adds:
+	# -Werror,-Wundef-prefix=TARGET_OS_
+	sed -i -e 's/#if TARGET_OS_BRIDGE/#if 0/' include/mach-o/dyld_priv.h
 
 	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
 	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
@@ -94,9 +98,9 @@ src_prepare() {
 	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
 	epatch "${S}"/${PN}-5.1-strnlen.patch
 	epatch "${S}"/${PN}-7.3-make-j.patch
-	epatch "${S}"/${PN}-11.3.1-no-developertools-dir.patch # 7.3 failed to apply. updated
-	epatch "${S}"/${PN}-11.3.1-llvm-prefix.patch # 8.2.1 failed to apply. updated
-	epatch "${S}"/${PN}-8.2.1-llvm-shim.patch
+	epatch "${S}"/${PN}-11.3.1-no-developertools-dir.patch
+	epatch "${S}"/${PN}-11.3.1-llvm-prefix.patch
+	epatch "${S}"/${PN}-11.3.1-llvm-shim.patch
 	epatch "${S}"/${PN}-11.3.1-nolto-fix.patch # bugfix
 	epatch "${S}"/${PN}-11.3.1-segaddrtable-fix.patch # bugfix
 	eprefixify libstuff/execute.c
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
deleted file mode 100644
index 4ccf5b257b9c..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="test" # the test suite will test what's installed.
-
-# LD64=ld64-95.2.12 # can't compile this one, missing libunwind/* includes
-# http://lists.apple.com/archives/Darwin-dev/2009/Sep/msg00025.html
-LD64=ld64-85.2.1 # from 3.1.2
-CCTOOLS=cctools-750
-LP64PATCHES=binutils-apple-LP64-patches-1
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="https://opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	https://opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${LP64PATCHES}.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-3.2-r0.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="sys-devel/binutils-config"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )"
-
-SLOT="3"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-prepare_ld64() {
-	cd "${S}"/${LD64}/src
-	cp "${WORKDIR}"/Makefile . || die
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	sed -i \
-		-e '/^#define LTO_SUPPORT 1/s:1:0:' \
-		ObjectDump.cpp || die
-	echo '#undef LTO_SUPPORT' > configure.h
-	echo '' > linker_opts
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	elog "Deleted $c tests that were bound to fail"
-}
-
-src_prepare() {
-	prepare_ld64
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${WORKDIR}"/${PN}-3.1.1-as.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-as-dir.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-ranlib.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${WORKDIR}"/${PN}-3.1.1-no-oss-dir.patch
-
-	cd "${S}"/${LD64}
-	epatch "${WORKDIR}"/${PN}-3.1.1-testsuite.patch
-	epatch "${WORKDIR}"/LP64/ld64/*.patch
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-
-	# -pg is used and the two are incompatible
-	filter-flags -fomit-frame-pointer
-
-	eapply_user
-}
-
-src_configure() {
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	if tc-is-gcc && [[ $(gcc-fullversion) != 4.2.1 ]] ; then
-		# force gcc-apple
-		CC=${CTARGET}-gcc-4.2.1
-		CXX=${CTARGET}-g++-4.2.1
-	fi
-}
-
-compile_ld64() {
-	cd "${S}"/${LD64}/src
-	# 'struct linkedit_data_command' is defined in mach-o/loader.h on leopard,
-	# but not on tiger.
-	[[ ${CHOST} == *-apple-darwin8 ]] && \
-		append-flags -isystem "${S}"/${CCTOOLS}/include/
-	emake
-	use test && emake build_test
-}
-
-compile_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake \
-		LTO= \
-		TRIE= \
-		EFITOOLS= \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}"
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}"
-}
-
-src_compile() {
-	tc-export CC CXX
-	compile_cctools
-	compile_ld64
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# need host arch, since GNU arch doesn't do what Apple's does
-	tc-export CC CXX
-	perl ../bin/make-recursive.pl \
-		ARCH="$(/usr/bin/arch)" \
-		RELEASEDIR="${S}"/${LD64}/src \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
deleted file mode 100644
index b3cf69bdae49..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-LD64=ld64-128.2
-CCTOOLS_VERSION=822
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-CCTOOLS_HEADERS=cctools-855
-LIBUNWIND=libunwind-30
-DYLD=dyld-195.6
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS_HEADERS}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test multitarget"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm:* )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )
-	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )"
-
-SLOT="4"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-src_prepare() {
-	if use multitarget ; then
-		ewarn "You have enabled support for non-standard target architectures"
-		ewarn "using USE=multitarget. This includes experimental support for"
-		ewarn "ppc and ppc64 which is a community forward-port from the last"
-		ewarn "version of ld64 to officially support PPC."
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			ewarn "HERE BE DRAGONS! Your system seems to be PPC which means that"
-			ewarn "the actual usability of your Gentoo programs will depend on the"
-			ewarn "above-mentioned experimental PPC support in the linker. Be"
-			ewarn "sure to keep a known-to-work version like ${PN}-3.2.6 around!"
-		fi
-	fi
-
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-128.2-Makefile-3 Makefile
-	epatch "${S}"/ld64-127.2-lto.patch
-	epatch "${S}"/ld64-128.2-stdlib.patch
-	epatch "${S}"/ld64-241.9-register-names.patch
-	epatch "${S}"/ld64-241.9-get-comm-align.patch
-	epatch "${S}"/ld64-241.9-cc_md5.patch
-	epatch "${S}"/ld64-128.2-1010.patch
-	epatch "${S}"/ld64-128.2-ppc.patch
-
-	# We used to use our own copy of lto.h, which doesn't require llvm
-	# build-env. Current versions of llvm provide
-	# $EPREFIX/usr/include/llvm-c/lto.h as well as
-	# $EPREFIX/usr/lib/libLTO.{so,dylib}, so we just use these.
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# missing on <= 10.5
-	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
-	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
-	# missing on <= 10.4
-	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
-	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-	# add alias for newer identifiers, because ld64 uses both but cctools
-	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
-
-	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
-	# older systems
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
-		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${S}"/ld64-123.2-darwin8-no-mlong-branch-warning.patch
-		epatch "${S}"/ld64-127.2-thread_state.patch
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.0-as.patch
-	epatch "${S}"/${PN}-4.2-as-dir.patch
-	epatch "${S}"/${PN}-3.2.3-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-nmedit.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/${PN}-4.2-lto.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	epatch "${S}"/${PN}-5.1-thread-state-redefined.patch
-	epatch "${S}"/${PN}-4.3-makefile-target-warning.patch
-	epatch "${S}"/${PN}-4.3-lto-prefix.patch
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-	# __darwin_i386_float_state missing on <= 10.4
-	cp -a ../${CCTOOLS_HEADERS}/include/mach/i386 include/mach
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	use lto && ENABLE_LTO=1
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want)
-	append-cppflags -DNDEBUG
-
-	CCTOOLS_OFLAG=
-	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
-		# cctools expect to use UNIX03 struct member names.
-		# This is default on > 10.4. Activate it on <= 10.4 by defining
-		# __DARWIN_UNIX03 explicitly.
-		CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1"
-	fi
-
-	cat <<EOF > ${LD64}/src/configure.h
-#define DEFAULT_MACOSX_MIN_VERSION "${MACOSX_DEPLOYMENT_TARGET}"
-#define SUPPORT_ARCH_arm_any 1
-EOF
-
-	use multitarget && cat <<EOF >> ${LD64}/src/configure.h
-#define SUPPORT_ARCH_ppc 1
-EOF
-#define SUPPORT_ARCH_ppc64 1
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO}
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	# -j1 because it fails too often with weird errors
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		ENABLE_LTO="${ENABLE_LTO}" \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		-j1
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="clang -ccc-install-dir $PWD" \
-		CXX="clang++ -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
deleted file mode 100644
index 73ec964cbefc..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-LD64=ld64-236.3
-CCTOOLS_VERSION=855
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-LIBUNWIND=libunwind-35.3
-DYLD=dyld-353.2.1
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test libcxx multitarget"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm:* )
-	libcxx? ( sys-libs/libcxx )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )
-	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
-	libcxx? ( sys-devel/llvm:* )"
-
-SLOT="5"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-src_prepare() {
-	if use multitarget ; then
-		ewarn "You have enabled support for non-standard target architectures"
-		ewarn "using USE=multitarget. This includes experimental support for"
-		ewarn "ppc and ppc64 which is a community forward-port from the last"
-		ewarn "version of ld64 to officially support PPC."
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			ewarn "HERE BE DRAGONS! Your system seems to be PPC which means that"
-			ewarn "the actual usability of your Gentoo programs will depend on the"
-			ewarn "above-mentioned experimental PPC support in the linker. Be"
-			ewarn "sure to keep a known-to-work version like ${PN}-3.2.6 around!"
-		fi
-	fi
-
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-236.3-Makefile-2 Makefile
-
-	epatch "${S}"/ld64-236.3-nolto.patch
-	epatch "${S}"/ld64-241.9-extraneous-includes.patch
-	epatch "${S}"/ld64-241.9-osatomic.patch
-	epatch "${S}"/ld64-236.3-arm64-fixup.patch
-	epatch "${S}"/ld64-241.9-arm64-cputype.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-	epatch "${S}"/ld64-236.3-nosnapshots.patch
-	epatch "${S}"/ld64-236.3-ppc.patch
-	epatch "${S}"/ld64-236.3-constant-types-2.patch
-	epatch "${S}"/ld64-236.3-gcc-2.patch
-	epatch "${S}"/ld64-241.9-register-names.patch
-	epatch "${S}"/ld64-241.9-get-comm-align.patch
-	epatch "${S}"/ld64-241.9-cc_md5.patch
-	epatch "${S}"/ld64-253.3-delete-warning.patch
-
-	# We used to use our own copy of lto.h, which doesn't require llvm
-	# build-env. Current versions of llvm provide
-	# $EPREFIX/usr/include/llvm-c/lto.h as well as
-	# $EPREFIX/usr/lib/libLTO.{so,dylib}, so we just use these.
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# missing on <= 10.5
-	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
-	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
-	# missing on <= 10.4
-	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
-	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-	# add alias for newer identifiers, because ld64 uses both but cctools
-	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
-
-	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
-	# older systems
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
-		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${S}"/ld64-123.2-darwin8-no-mlong-branch-warning.patch
-		epatch "${S}"/ld64-127.2-thread_state.patch
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/${PN}-5.1-nolto.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	epatch "${S}"/${PN}-5.1-otool-stdc.patch
-	epatch "${S}"/${PN}-5.1-constant-types.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-5.1-ppc.patch
-	epatch "${S}"/${PN}-5.1-thread-state-redefined.patch
-	epatch "${S}"/${PN}-5.1-makefile-target-warning.patch
-	epatch "${S}"/${PN}-5.1-lto-prefix.patch
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	use lto && ENABLE_LTO=1
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	if [ "${CXX/*clang*/yes}" = "yes" ] ; then
-		if use libcxx ; then
-			append-cxxflags -stdlib=libc++
-			CXXLIB=-stdlib=libc++
-		else
-			# force libstdc++ for systems where libc++ is default (OS X 10.9+?)
-			append-cxxflags -stdlib=libstdc++
-			CXXLIB=-stdlib=libstdc++
-		fi
-	else
-		use libcxx && \
-			ewarn "libcxx only available with clang and your C++ compiler ($CXX) does not seem to be clang"
-	fi
-
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want)
-	append-cppflags -DNDEBUG
-
-	# Block API and thus snapshots supported on >= 10.6
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
-		append-cppflags -DSUPPORT_SNAPSHOTS
-
-	CCTOOLS_OFLAG=
-	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
-		# cctools expect to use UNIX03 struct member names.
-		# This is default on > 10.4. Activate it on <= 10.4 by defining
-		# __DARWIN_UNIX03 explicitly.
-		CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1"
-	fi
-
-	# if compiling with USE multitarget, extract all the known arches from
-	# create_configure and pass them back to it
-	creco=${LD64}/src/create_configure
-	ARCHS_TO_SUPPORT=""
-	if use multitarget ; then
-		ARCHS_TO_SUPPORT="$(grep KNOWN_ARCHS= $creco | \
-			cut -d\" -f2 | tr ',' ' ')"
-	fi
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	DERIVED_FILE_DIR=${LD64}/src \
-		RC_SUPPORTED_ARCHS="$ARCHS_TO_SUPPORT" \
-		$creco
-
-	# do not depend on MachOFileAbstraction.hpp to define
-	# SUPPORT_ARCH_arm_any because that's not included by every file where
-	# our ppc/arm-optional patch uses it, ld.hpp in particular
-	grep "SUPPORT_ARCH_armv[0-9]" ${LD64}/src/configure.h >/dev/null && \
-		echo "#define SUPPORT_ARCH_arm_any 1" >> ${LD64}/src/configure.h
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO}
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	# -j1 because it fails too often with weird errors
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		ENABLE_LTO=${ENABLE_LTO} \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		CXXLIB="${CXXLIB}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		-j1
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="clang -ccc-install-dir $PWD" \
-		CXX="clang++ -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
deleted file mode 100644
index 041d9a329ada..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-LD64=ld64-241.9
-CCTOOLS_VERSION=862
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-LIBUNWIND=libunwind-35.3
-DYLD=dyld-353.2.1
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.1-r1.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test libcxx multitarget"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm:* )
-	libcxx? ( sys-libs/libcxx )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )
-	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
-	libcxx? ( sys-devel/llvm:* )"
-
-SLOT="6"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-src_prepare() {
-	if use multitarget ; then
-		ewarn "You have enabled support for non-standard target architectures"
-		ewarn "using USE=multitarget. This includes experimental support for"
-		ewarn "ppc and ppc64 which is a community forward-port from the last"
-		ewarn "version of ld64 to officially support PPC."
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			ewarn "HERE BE DRAGONS! Your system seems to be PPC which means that"
-			ewarn "the actual usability of your Gentoo programs will depend on the"
-			ewarn "above-mentioned experimental PPC support in the linker. Be"
-			ewarn "sure to keep a known-to-work version like ${PN}-3.2.6 around!"
-		fi
-	fi
-
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-236.3-Makefile-2 Makefile
-
-	epatch "${S}"/ld64-236.3-nolto.patch
-	epatch "${S}"/ld64-241.9-extraneous-includes.patch
-	epatch "${S}"/ld64-241.9-osatomic.patch
-	epatch "${S}"/ld64-241.9-arm64-cputype.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-	epatch "${S}"/ld64-241.9-nosnapshots.patch
-	epatch "${S}"/ld64-241.9-ppc.patch
-	epatch "${S}"/ld64-236.3-constant-types-2.patch
-	epatch "${S}"/ld64-241.9-gcc-2.patch
-	epatch "${S}"/ld64-241.9-register-names.patch
-	epatch "${S}"/ld64-241.9-get-comm-align.patch
-	epatch "${S}"/ld64-241.9-cc_md5.patch
-	epatch "${S}"/ld64-241.9-lto-noremarks.patch
-	epatch "${S}"/ld64-253.3-delete-warning.patch
-
-	# We used to use our own copy of lto.h, which doesn't require llvm
-	# build-env. Current versions of llvm provide
-	# $EPREFIX/usr/include/llvm-c/lto.h as well as
-	# $EPREFIX/usr/lib/libLTO.{so,dylib}, so we just use these.
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# missing on <= 10.5
-	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
-	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
-	# missing on <= 10.4
-	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
-	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-	# add alias for newer identifiers, because ld64 uses both but cctools
-	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
-
-	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
-	# older systems
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
-		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${S}"/ld64-123.2-darwin8-no-mlong-branch-warning.patch
-		epatch "${S}"/ld64-127.2-thread_state.patch
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/${PN}-5.1-nolto.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	epatch "${S}"/${PN}-5.1-otool-stdc.patch
-	epatch "${S}"/${PN}-5.1-constant-types.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-5.1-ppc.patch
-	epatch "${S}"/${PN}-5.1-thread-state-redefined.patch
-	epatch "${S}"/${PN}-5.1-makefile-target-warning.patch
-	epatch "${S}"/${PN}-6.3-lto-prefix.patch
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	use lto && ENABLE_LTO=1
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	if [ "${CXX/*clang*/yes}" = "yes" ] ; then
-		if use libcxx ; then
-			append-cxxflags -stdlib=libc++
-			CXXLIB=-stdlib=libc++
-		else
-			# force libstdc++ for systems where libc++ is default (OS X 10.9+?)
-			append-cxxflags -stdlib=libstdc++
-			CXXLIB=-stdlib=libstdc++
-		fi
-	else
-		use libcxx && \
-			ewarn "libcxx only available with clang and your C++ compiler ($CXX) does not seem to be clang"
-	fi
-
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want)
-	append-cppflags -DNDEBUG
-
-	# Block API and thus snapshots supported on >= 10.6
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
-		append-cppflags -DSUPPORT_SNAPSHOTS
-
-	CCTOOLS_OFLAG=
-	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
-		# cctools expect to use UNIX03 struct member names.
-		# This is default on > 10.4. Activate it on <= 10.4 by defining
-		# __DARWIN_UNIX03 explicitly.
-		CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1"
-	fi
-
-	# if compiling with USE multitarget, extract all the known arches from
-	# create_configure and pass them back to it
-	creco=${LD64}/src/create_configure
-	ARCHS_TO_SUPPORT=""
-	if use multitarget ; then
-		ARCHS_TO_SUPPORT="$(grep KNOWN_ARCHS= $creco | \
-			cut -d\" -f2 | tr ',' ' ')"
-	fi
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	DERIVED_FILE_DIR=${LD64}/src \
-		RC_SUPPORTED_ARCHS="$ARCHS_TO_SUPPORT" \
-		$creco
-
-	# do not depend on MachOFileAbstraction.hpp to define
-	# SUPPORT_ARCH_arm_any because that's not included by every file where
-	# our ppc/arm-optional patch uses it, ld.hpp in particular
-	grep "SUPPORT_ARCH_armv[0-9]" ${LD64}/src/configure.h >/dev/null && \
-		echo "#define SUPPORT_ARCH_arm_any 1" >> ${LD64}/src/configure.h
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO}
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	# -j1 because it fails too often with weird errors
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		ENABLE_LTO=${ENABLE_LTO} \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		CXXLIB="${CXXLIB}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		-j1
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="clang -ccc-install-dir $PWD" \
-		CXX="clang++ -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild
deleted file mode 100644
index b3af64fe16d6..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-LD64=ld64-242
-CCTOOLS_VERSION=870
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-LIBUNWIND=libunwind-35.3
-DYLD=dyld-353.2.1
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.1-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.3-r2.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test libcxx multitarget"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-devel/binutils-config
-	lto? ( sys-devel/llvm:* )
-	libcxx? ( sys-libs/libcxx )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )
-	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
-	libcxx? ( sys-devel/llvm:* )"
-
-SLOT="6"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-src_prepare() {
-	if use multitarget ; then
-		ewarn "You have enabled support for non-standard target architectures"
-		ewarn "using USE=multitarget. This includes experimental support for"
-		ewarn "ppc and ppc64 which is a community forward-port from the last"
-		ewarn "version of ld64 to officially support PPC."
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			ewarn "HERE BE DRAGONS! Your system seems to be PPC which means that"
-			ewarn "the actual usability of your Gentoo programs will depend on the"
-			ewarn "above-mentioned experimental PPC support in the linker. Be"
-			ewarn "sure to keep a known-to-work version like ${PN}-3.2.6 around!"
-		fi
-	fi
-
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-236.3-Makefile-2 Makefile
-
-	epatch "${S}"/ld64-236.3-nolto.patch
-	epatch "${S}"/ld64-241.9-extraneous-includes.patch
-	epatch "${S}"/ld64-241.9-osatomic.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-	epatch "${S}"/ld64-241.9-nosnapshots.patch
-	epatch "${S}"/ld64-242-ppc.patch
-	epatch "${S}"/ld64-236.3-constant-types-2.patch
-	epatch "${S}"/ld64-242-gcc-2.patch
-	epatch "${S}"/ld64-241.9-register-names.patch
-	epatch "${S}"/ld64-241.9-get-comm-align.patch
-	epatch "${S}"/ld64-241.9-cc_md5.patch
-	epatch "${S}"/ld64-253.3-delete-warning.patch
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# missing on <= 10.5
-	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
-	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
-	# missing on <= 10.4
-	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
-	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-	# add alias for newer identifiers, because ld64 uses both but cctools
-	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
-
-	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
-	# older systems
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
-		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${S}"/ld64-123.2-darwin8-no-mlong-branch-warning.patch
-		epatch "${S}"/ld64-127.2-thread_state.patch
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	epatch "${S}"/${PN}-5.1-otool-stdc.patch
-	epatch "${S}"/${PN}-5.1-constant-types.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-5.1-ppc.patch
-	epatch "${S}"/${PN}-5.1-thread-state-redefined.patch
-	epatch "${S}"/${PN}-5.1-makefile-target-warning.patch
-	epatch "${S}"/${PN}-6.3-lto-prefix.patch
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	use lto && ENABLE_LTO=1
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	if [[ ${CXX} == *clang* ]] ; then
-		if use libcxx ; then
-			append-cxxflags -stdlib=libc++
-			CXXLIB=-stdlib=libc++
-		else
-			# force libstdc++ for systems where libc++ is default (OS X 10.9+?)
-			append-cxxflags -stdlib=libstdc++
-			CXXLIB=-stdlib=libstdc++
-		fi
-	else
-		use libcxx && \
-			ewarn "libcxx only available with clang and your C++ compiler ($CXX) does not seem to be clang"
-
-		# force gcc-apple, FSF gcc doesn't grok this code
-		export CC=${CTARGET}-gcc-4.2.1
-		export CXX=${CTARGET}-g++-4.2.1
-	fi
-
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want)
-	append-cppflags -DNDEBUG
-
-	# Block API and thus snapshots supported on >= 10.6
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
-		append-cppflags -DSUPPORT_SNAPSHOTS
-
-	CCTOOLS_OFLAG=
-	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
-		# cctools expect to use UNIX03 struct member names.
-		# This is default on > 10.4. Activate it on <= 10.4 by defining
-		# __DARWIN_UNIX03 explicitly.
-		CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1"
-	fi
-
-	# if compiling with USE multitarget, extract all the known arches from
-	# create_configure and pass them back to it
-	creco=${LD64}/src/create_configure
-	ARCHS_TO_SUPPORT=""
-	if use multitarget ; then
-		ARCHS_TO_SUPPORT="$(grep KNOWN_ARCHS= $creco | \
-			cut -d\" -f2 | tr ',' ' ')"
-	elif use ppc-macos ; then
-		ARCHS_TO_SUPPORT="ppc ppc750 ppc7400 ppc7450 ppc970 ppc64 $(\
-			grep RC_SUPPORTED_ARCHS= $creco | cut -d\" -f2)"
-	fi
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	einfo "building support for: ${ARCHS_TO_SUPPORT}"
-	DERIVED_FILE_DIR=${LD64}/src \
-	RC_SUPPORTED_ARCHS="$ARCHS_TO_SUPPORT" \
-		$creco
-
-	# do not depend on MachOFileAbstraction.hpp to define
-	# SUPPORT_ARCH_arm_any because that's not included by every file where
-	# our ppc/arm-optional patch uses it, ld.hpp in particular
-	grep "SUPPORT_ARCH_armv[0-9]" ${LD64}/src/configure.h >/dev/null && \
-		echo "#define SUPPORT_ARCH_arm_any 1" >> ${LD64}/src/configure.h
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO}
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	# -j1 because it fails too often with weird errors
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		ENABLE_LTO="${ENABLE_LTO}" \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		CXXLIB="${CXXLIB}" \
-		DSYMUTIL=": disabled: dsymutil" \
-		-j1
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="clang -ccc-install-dir $PWD" \
-		CXX="clang++ -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
deleted file mode 100644
index 7607b1e4624c..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-LD64=ld64-253.3
-CCTOOLS_VERSION=877.5
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-LIBUNWIND=libunwind-35.3
-DYLD=dyld-360.14
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.1-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.3-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.0-r3.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test multitarget"
-RESTRICT="!test? ( test )"
-
-# ld64 can now only be compiled using llvm and libc++ since it massivley uses
-# C++11 language fatures. *But additionally* the as driver now defaults to
-# calling clang as the assembler on many platforms. This can be disabled using
-# -Wa,-Q but since it's default we make llvm a static runtime dependency.
-RDEPEND="sys-devel/binutils-config
-	lto? ( app-arch/xar )
-	sys-devel/llvm:*
-	sys-libs/libcxx"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )"
-
-SLOT="7"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-src_prepare() {
-	if use multitarget ; then
-		ewarn "You have enabled support for non-standard target architectures"
-		ewarn "using USE=multitarget. This includes experimental support for"
-		ewarn "ppc and ppc64 which is a community forward-port from the last"
-		ewarn "version of ld64 to officially support PPC."
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			ewarn "HERE BE DRAGONS! Your system seems to be PPC which means that"
-			ewarn "the actual usability of your Gentoo programs will depend on the"
-			ewarn "above-mentioned experimental PPC support in the linker. Be"
-			ewarn "sure to keep a known-to-work version like ${PN}-3.2.6 around!"
-		fi
-	fi
-
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-253.3-Makefile-3 Makefile
-
-	epatch "${S}"/ld64-253.3-nolto.patch
-	epatch "${S}"/ld64-241.9-extraneous-includes.patch
-	epatch "${S}"/ld64-241.9-osatomic.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-	epatch "${S}"/ld64-253.3-nosnapshots.patch
-	epatch "${S}"/ld64-253.3-ppc.patch
-	epatch "${S}"/ld64-236.3-constant-types-2.patch
-	epatch "${S}"/ld64-241.9-register-names.patch
-	epatch "${S}"/ld64-241.9-get-comm-align.patch
-	epatch "${S}"/ld64-241.9-cc_md5.patch
-	epatch "${S}"/ld64-253.3-make_pair.patch
-	epatch "${S}"/ld64-253.3-delete-warning.patch
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# missing on <= 10.5
-	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
-	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
-	# missing on <= 10.4
-	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
-	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-	# add alias for newer identifiers, because ld64 uses both but cctools
-	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
-
-	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
-	# older systems
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
-		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${S}"/ld64-123.2-darwin8-no-mlong-branch-warning.patch
-		epatch "${S}"/ld64-127.2-thread_state.patch
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	#epatch "${S}"/${PN}-5.1-otool-stdc.patch
-	epatch "${S}"/${PN}-5.1-constant-types.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-5.1-ppc.patch
-	epatch "${S}"/${PN}-5.1-thread-state-redefined.patch
-	epatch "${S}"/${PN}-7.0-make-j.patch
-	epatch "${S}"/${PN}-7.0-lto-prefix-2.patch
-	epatch "${S}"/${PN}-7.0-clang-as.patch
-	epatch "${S}"/${PN}-7.0-nolto.patch
-	epatch "${S}"/${PN}-7.0-nollvm.patch
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	use lto && ENABLE_LTO=1
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want)
-	append-cppflags -DNDEBUG
-
-	# Block API and thus snapshots supported on >= 10.6
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
-		append-cppflags -DSUPPORT_SNAPSHOTS
-
-	CCTOOLS_OFLAG=
-	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
-		# cctools expect to use UNIX03 struct member names.
-		# This is default on > 10.4. Activate it on <= 10.4 by defining
-		# __DARWIN_UNIX03 explicitly.
-		CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1"
-	fi
-
-	# if compiling with USE multitarget, extract all the known arches from
-	# create_configure and pass them back to it
-	creco=${LD64}/src/create_configure
-	ARCHS_TO_SUPPORT=""
-	if use multitarget ; then
-		ARCHS_TO_SUPPORT="$(grep KNOWN_ARCHS= $creco | \
-			cut -d\" -f2 | tr ',' ' ')"
-	fi
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	DERIVED_FILE_DIR=${LD64}/src \
-		RC_SUPPORTED_ARCHS="$ARCHS_TO_SUPPORT" \
-		$creco
-
-	# do not depend on MachOFileAbstraction.hpp to define
-	# SUPPORT_ARCH_arm_any because that's not included by every file where
-	# our ppc/arm-optional patch uses it, ld.hpp in particular
-	grep "SUPPORT_ARCH_armv[0-9]" ${LD64}/src/configure.h >/dev/null && \
-		echo "#define SUPPORT_ARCH_arm_any 1" >> ${LD64}/src/configure.h
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO}
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		LTO="${ENABLE_LTO}" \
-		LTO_LIBDIR=../../../lib \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="${CC} -ccc-install-dir $PWD" \
-		CXX="${CXX} -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
deleted file mode 100644
index 46382b1d6785..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-LD64=ld64-253.6
-CCTOOLS_VERSION=877.7
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-LIBUNWIND=libunwind-35.3
-DYLD=dyld-360.17
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.1-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.3-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.0-r3.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test multitarget"
-RESTRICT="!test? ( test )"
-
-# ld64 can now only be compiled using llvm and libc++ since it massivley uses
-# C++11 language fatures. *But additionally* the as driver now defaults to
-# calling clang as the assembler on many platforms. This can be disabled using
-# -Wa,-Q but since it's default we make llvm a static runtime dependency.
-RDEPEND="sys-devel/binutils-config
-	lto? ( app-arch/xar )
-	sys-devel/llvm:*
-	sys-libs/libcxx"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )"
-
-SLOT="7"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-src_prepare() {
-	if use multitarget ; then
-		ewarn "You have enabled support for non-standard target architectures"
-		ewarn "using USE=multitarget. This includes experimental support for"
-		ewarn "ppc and ppc64 which is a community forward-port from the last"
-		ewarn "version of ld64 to officially support PPC."
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			ewarn "HERE BE DRAGONS! Your system seems to be PPC which means that"
-			ewarn "the actual usability of your Gentoo programs will depend on the"
-			ewarn "above-mentioned experimental PPC support in the linker. Be"
-			ewarn "sure to keep a known-to-work version like ${PN}-3.2.6 around!"
-		fi
-	fi
-
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-253.3-Makefile-3 Makefile
-
-	epatch "${S}"/ld64-253.3-nolto.patch
-	epatch "${S}"/ld64-241.9-extraneous-includes.patch
-	epatch "${S}"/ld64-241.9-osatomic.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-	epatch "${S}"/ld64-253.3-nosnapshots.patch
-	epatch "${S}"/ld64-253.3-ppc.patch
-	epatch "${S}"/ld64-236.3-constant-types-2.patch
-	epatch "${S}"/ld64-241.9-register-names.patch
-	epatch "${S}"/ld64-241.9-get-comm-align.patch
-	epatch "${S}"/ld64-241.9-cc_md5.patch
-	epatch "${S}"/ld64-253.3-make_pair.patch
-	epatch "${S}"/ld64-253.3-delete-warning.patch
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# missing on <= 10.5
-	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
-	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
-	# missing on <= 10.4
-	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
-	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-	# add alias for newer identifiers, because ld64 uses both but cctools
-	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
-
-	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
-	# older systems
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
-		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${S}"/ld64-123.2-darwin8-no-mlong-branch-warning.patch
-		epatch "${S}"/ld64-127.2-thread_state.patch
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	#epatch "${S}"/${PN}-5.1-otool-stdc.patch
-	epatch "${S}"/${PN}-5.1-constant-types.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-5.1-ppc.patch
-	epatch "${S}"/${PN}-5.1-thread-state-redefined.patch
-	epatch "${S}"/${PN}-7.0-make-j.patch
-	epatch "${S}"/${PN}-7.0-lto-prefix-2.patch
-	epatch "${S}"/${PN}-7.0-clang-as.patch
-	epatch "${S}"/${PN}-7.0-nolto.patch
-	epatch "${S}"/${PN}-7.0-nollvm.patch
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	use lto && ENABLE_LTO=1
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want)
-	append-cppflags -DNDEBUG
-
-	# Block API and thus snapshots supported on >= 10.6
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
-		append-cppflags -DSUPPORT_SNAPSHOTS
-
-	CCTOOLS_OFLAG=
-	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
-		# cctools expect to use UNIX03 struct member names.
-		# This is default on > 10.4. Activate it on <= 10.4 by defining
-		# __DARWIN_UNIX03 explicitly.
-		CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1"
-	fi
-
-	# if compiling with USE multitarget, extract all the known arches from
-	# create_configure and pass them back to it
-	creco=${LD64}/src/create_configure
-	ARCHS_TO_SUPPORT=""
-	if use multitarget ; then
-		ARCHS_TO_SUPPORT="$(grep KNOWN_ARCHS= $creco | \
-			cut -d\" -f2 | tr ',' ' ')"
-	fi
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	DERIVED_FILE_DIR=${LD64}/src \
-		RC_SUPPORTED_ARCHS="$ARCHS_TO_SUPPORT" \
-		$creco
-
-	# do not depend on MachOFileAbstraction.hpp to define
-	# SUPPORT_ARCH_arm_any because that's not included by every file where
-	# our ppc/arm-optional patch uses it, ld.hpp in particular
-	grep "SUPPORT_ARCH_armv[0-9]" ${LD64}/src/configure.h >/dev/null && \
-		echo "#define SUPPORT_ARCH_arm_any 1" >> ${LD64}/src/configure.h
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO}
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		LTO="${ENABLE_LTO}" \
-		LTO_LIBDIR=../../../lib \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="${CC} -ccc-install-dir $PWD" \
-		CXX="${CXX} -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
deleted file mode 100644
index e7e593598c92..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-LD64=ld64-253.9
-CCTOOLS_VERSION=877.8
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-LIBUNWIND=libunwind-35.3
-DYLD=dyld-360.18
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.1-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.3-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.0-r3.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.2-r1.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test multitarget"
-RESTRICT="!test? ( test )"
-
-# ld64 can now only be compiled using llvm and libc++ since it massivley uses
-# C++11 language fatures. *But additionally* the as driver now defaults to
-# calling clang as the assembler on many platforms. This can be disabled using
-# -Wa,-Q but since it's default we make llvm a static runtime dependency.
-RDEPEND="sys-devel/binutils-config
-	lto? ( app-arch/xar )
-	sys-devel/llvm:*
-	sys-libs/libcxx"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )"
-
-SLOT="7"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-src_prepare() {
-	if use multitarget ; then
-		ewarn "You have enabled support for non-standard target architectures"
-		ewarn "using USE=multitarget. This includes experimental support for"
-		ewarn "ppc and ppc64 which is a community forward-port from the last"
-		ewarn "version of ld64 to officially support PPC."
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			ewarn "HERE BE DRAGONS! Your system seems to be PPC which means that"
-			ewarn "the actual usability of your Gentoo programs will depend on the"
-			ewarn "above-mentioned experimental PPC support in the linker. Be"
-			ewarn "sure to keep a known-to-work version like ${PN}-3.2.6 around!"
-		fi
-	fi
-
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-253.3-Makefile-3 Makefile
-
-	epatch "${S}"/ld64-253.9-nolto.patch
-	epatch "${S}"/ld64-241.9-extraneous-includes.patch
-	epatch "${S}"/ld64-241.9-osatomic.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-	epatch "${S}"/ld64-253.3-nosnapshots.patch
-	epatch "${S}"/ld64-253.3-ppc.patch
-	epatch "${S}"/ld64-236.3-constant-types-2.patch
-	epatch "${S}"/ld64-241.9-register-names.patch
-	epatch "${S}"/ld64-241.9-get-comm-align.patch
-	epatch "${S}"/ld64-241.9-cc_md5.patch
-	epatch "${S}"/ld64-253.3-make_pair.patch
-	epatch "${S}"/ld64-253.3-delete-warning.patch
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# missing on <= 10.5
-	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
-	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
-	# missing on <= 10.4
-	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
-	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-	# add alias for newer identifiers, because ld64 uses both but cctools
-	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
-
-	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
-	# older systems
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
-		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${S}"/ld64-123.2-darwin8-no-mlong-branch-warning.patch
-		epatch "${S}"/ld64-127.2-thread_state.patch
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	#epatch "${S}"/${PN}-5.1-otool-stdc.patch
-	epatch "${S}"/${PN}-5.1-constant-types.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-5.1-ppc.patch
-	epatch "${S}"/${PN}-5.1-thread-state-redefined.patch
-	epatch "${S}"/${PN}-7.0-make-j.patch
-	epatch "${S}"/${PN}-7.0-lto-prefix-2.patch
-	epatch "${S}"/${PN}-7.0-clang-as.patch
-	epatch "${S}"/${PN}-7.0-nolto.patch
-	epatch "${S}"/${PN}-7.0-nollvm.patch
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	use lto && ENABLE_LTO=1
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want)
-	append-cppflags -DNDEBUG
-
-	# Block API and thus snapshots supported on >= 10.6
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
-		append-cppflags -DSUPPORT_SNAPSHOTS
-
-	CCTOOLS_OFLAG=
-	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
-		# cctools expect to use UNIX03 struct member names.
-		# This is default on > 10.4. Activate it on <= 10.4 by defining
-		# __DARWIN_UNIX03 explicitly.
-		CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1"
-	fi
-
-	# if compiling with USE multitarget, extract all the known arches from
-	# create_configure and pass them back to it
-	creco=${LD64}/src/create_configure
-	ARCHS_TO_SUPPORT=""
-	if use multitarget ; then
-		ARCHS_TO_SUPPORT="$(grep KNOWN_ARCHS= $creco | \
-			cut -d\" -f2 | tr ',' ' ')"
-	fi
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	DERIVED_FILE_DIR=${LD64}/src \
-		RC_SUPPORTED_ARCHS="$ARCHS_TO_SUPPORT" \
-		$creco
-
-	# do not depend on MachOFileAbstraction.hpp to define
-	# SUPPORT_ARCH_arm_any because that's not included by every file where
-	# our ppc/arm-optional patch uses it, ld.hpp in particular
-	grep "SUPPORT_ARCH_armv[0-9]" ${LD64}/src/configure.h >/dev/null && \
-		echo "#define SUPPORT_ARCH_arm_any 1" >> ${LD64}/src/configure.h
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO}
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		LTO="${ENABLE_LTO}" \
-		LTO_LIBDIR=../../../lib \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="${CC} -ccc-install-dir $PWD" \
-		CXX="${CXX} -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
deleted file mode 100644
index 9497b6024a8e..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ /dev/null
@@ -1,393 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-LD64=ld64-264.3.102
-CCTOOLS_VERSION=886
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-LIBUNWIND=libunwind-35.3
-DYLD=dyld-360.18
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.1-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-6.3-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.0-r3.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.2-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.3-r2.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="lto test multitarget"
-RESTRICT="!test? ( test )"
-
-# ld64 can now only be compiled using llvm and libc++ since it massively uses
-# C++11 language features. *But additionally* the as driver now defaults to
-# calling clang as the assembler on many platforms. This can be disabled using
-# -Wa,-Q but since it's default we make llvm a static runtime dependency.
-RDEPEND="sys-devel/binutils-config
-	lto? ( app-arch/xar )
-	sys-devel/llvm:*
-	sys-libs/libcxx"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )"
-
-SLOT="7"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-src_prepare() {
-	if use multitarget ; then
-		ewarn "You have enabled support for non-standard target architectures"
-		ewarn "using USE=multitarget. This includes experimental support for"
-		ewarn "ppc and ppc64 which is a community forward-port from the last"
-		ewarn "version of ld64 to officially support PPC."
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			ewarn "HERE BE DRAGONS! Your system seems to be PPC which means that"
-			ewarn "the actual usability of your Gentoo programs will depend on the"
-			ewarn "above-mentioned experimental PPC support in the linker. Be"
-			ewarn "sure to keep a known-to-work version like ${PN}-3.2.6 around!"
-		fi
-	fi
-
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-264.3.101-Makefile Makefile
-
-	epatch "${S}"/ld64-264.3.101-nolto.patch
-	epatch "${S}"/ld64-241.9-extraneous-includes.patch
-	epatch "${S}"/ld64-241.9-osatomic.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-	epatch "${S}"/ld64-264.3.101-nosnapshots.patch
-	epatch "${S}"/ld64-264.3.102-ppc.patch
-	epatch "${S}"/ld64-264.3.101-constant-types.patch
-	epatch "${S}"/ld64-241.9-register-names.patch
-	epatch "${S}"/ld64-241.9-get-comm-align.patch
-	epatch "${S}"/ld64-241.9-cc_md5.patch
-	epatch "${S}"/ld64-264.3.102-bitcode-case.patch
-
-	# workound llvm-3.9.{0,1} issue
-	# https://bugs.gentoo.org/show_bug.cgi?id=603580
-	# https://groups.google.com/forum/#!topic/llvm-dev/JY6nuKE__sU
-	# http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20160829/169553.html
-	sed -i -e '/COMPILE_TIME_ASSERT/d' ld/parsers/libunwind/*.hpp || die
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# missing on <= 10.5
-	cp ../../${LIBUNWIND}/include/libunwind.h include/ || die
-	cp ../../${LIBUNWIND}/include/mach-o/compact_unwind_encoding.h include/mach-o || die
-	# missing on <= 10.4
-	cp ../../${DYLD}/include/mach-o/dyld_images.h include/mach-o || die
-	cp ../../${CCTOOLS}/include/mach-o/loader.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-	# add alias for newer identifiers, because ld64 uses both but cctools
-	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
-
-	# mimic OS X Leopard-style Availability.h macros for libunwind.h on
-	# older systems
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \
-		echo "#define __OSX_AVAILABLE_STARTING(x,y)  " > include/Availability.h
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		epatch "${S}"/ld64-123.2-darwin8-no-mlong-branch-warning.patch
-		epatch "${S}"/ld64-127.2-thread_state.patch
-	fi
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	#epatch "${S}"/${PN}-5.1-otool-stdc.patch
-	epatch "${S}"/${PN}-5.1-constant-types.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-5.1-ppc.patch
-	epatch "${S}"/${PN}-5.1-thread-state-redefined.patch
-	epatch "${S}"/${PN}-7.3-make-j.patch
-	epatch "${S}"/${PN}-7.0-lto-prefix-2.patch
-	epatch "${S}"/${PN}-7.0-clang-as.patch
-	epatch "${S}"/${PN}-7.3-nolto.patch
-	epatch "${S}"/${PN}-7.3-nollvm.patch
-	epatch "${S}"/${PN}-7.3-no-developertools-dir.patch
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	use lto && ENABLE_LTO=1
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want)
-	append-cppflags -DNDEBUG
-
-	# Block API and thus snapshots supported on >= 10.6
-	[[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -ge 10 ]] && \
-		append-cppflags -DSUPPORT_SNAPSHOTS
-
-	CCTOOLS_OFLAG=
-	if [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] ; then
-		# cctools expect to use UNIX03 struct member names.
-		# This is default on > 10.4. Activate it on <= 10.4 by defining
-		# __DARWIN_UNIX03 explicitly.
-		CCTOOLS_OFLAG="-D__DARWIN_UNIX03=1"
-	fi
-
-	# if compiling with USE multitarget, extract all the known arches from
-	# create_configure and pass them back to it
-	creco=${LD64}/src/create_configure
-	ARCHS_TO_SUPPORT=""
-	if use multitarget ; then
-		ARCHS_TO_SUPPORT="$(grep KNOWN_ARCHS= $creco | \
-			cut -d\" -f2 | tr ',' ' ')"
-	fi
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	DERIVED_FILE_DIR=${LD64}/src \
-		RC_SUPPORTED_ARCHS="$ARCHS_TO_SUPPORT" \
-		$creco
-
-	# do not depend on MachOFileAbstraction.hpp to define
-	# SUPPORT_ARCH_arm_any because that's not included by every file where
-	# our ppc/arm-optional patch uses it, ld.hpp in particular
-	grep "SUPPORT_ARCH_armv[0-9]" ${LD64}/src/configure.h >/dev/null && \
-		echo "#define SUPPORT_ARCH_arm_any 1" >> ${LD64}/src/configure.h
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO}
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		LTO="${ENABLE_LTO}" \
-		LTO_LIBDIR=../../../lib \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	# upstream is starting to replace classic binutils with llvm-integrated
-	# ones. nm and size are now symlinks to llvm-{nm,size} while the classic
-	# version is preserved as {nm,size}-classic. (BTW: otool is a symlink to
-	# otool-classic for now but a wrapper llvm-otool that is calling
-	# llvm-objdump is present already.)
-	# Since our binutils do not live in the same directory as the llvm
-	# installation, we have to rewrite the symlinks to the llvm tools.
-	# This also means, that these tools still appear to be versioned via
-	# binutils-config but actually always run the currently installed llvm
-	# tool.
-	for tool in nm size ; do
-		# ${EPREFIX}/usr/x86_64-apple-darwin15/binutils-bin/7.3/$tool
-		# -> ${EPREFIX}/bin/llvm-$tool
-		ln -sfn ../../../bin/llvm-$tool "${D}/${EPREFIX}/${BINPATH}/$tool"
-	done
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="${CC} -ccc-install-dir $PWD" \
-		CXX="${CXX} -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
deleted file mode 100644
index 945873754651..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-LD64=ld64-274.1
-CCTOOLS_VERSION=895
-CCTOOLS=cctools-${CCTOOLS_VERSION}
-DYLD=dyld-421.2
-
-DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}"
-HOMEPAGE="http://www.opensource.apple.com/"
-SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz
-	http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz
-	http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.0-r3.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.3-r2.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-8.2-r1.tar.bz2"
-
-LICENSE="APSL-2"
-KEYWORDS="~x64-macos ~x86-macos"
-IUSE="lto tapi classic test"
-RESTRICT="!test? ( test )"
-
-# ld64 can now only be compiled using llvm and libc++ since it massively uses
-# C++11 language features. *But additionally* the as driver now defaults to
-# calling clang as the assembler on many platforms. This can be disabled using
-# -Wa,-Q but since it's default we make llvm a static runtime dependency.
-RDEPEND="sys-devel/binutils-config
-	lto? ( app-arch/xar )
-	tapi? ( sys-libs/tapi )
-	sys-devel/llvm:*
-	sys-libs/libcxx"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/perl-5.8.8 )"
-
-SLOT="8"
-
-S=${WORKDIR}
-
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-src_prepare() {
-	cd "${S}"/${LD64}/src
-	cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h
-	cp "${S}"/ld64-274.1-Makefile Makefile
-
-	epatch "${S}"/ld64-274.1-nolto.patch
-	epatch "${S}"/ld64-236.3-crashreporter.patch
-	epatch "${S}"/ld64-264.3.102-bitcode-case.patch
-	epatch "${S}"/ld64-274.1-unknown-fixup.patch
-	epatch "${S}"/ld64-274.1-notapi.patch
-
-	# workound llvm-3.9.{0,1} issue
-	# https://bugs.gentoo.org/show_bug.cgi?id=603580
-	# https://groups.google.com/forum/#!topic/llvm-dev/JY6nuKE__sU
-	# http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20160829/169553.html
-	sed -i -e '/COMPILE_TIME_ASSERT/d' ld/parsers/libunwind/*.hpp || die
-
-	# provide missing headers from libunwind and dyld
-	mkdir -p include/{mach,mach-o/arm} || die
-	# never present because it's private
-	cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die
-	# use copies from cctools because they're otherwise hidden in some SDK
-	cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die
-	# provide all required CPU_TYPEs on all platforms
-	cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h
-	# add alias for newer identifiers, because ld64 uses both but cctools
-	# header only defines the older
-	epatch "${S}"/ld64-236.3-missing-cputypes.patch
-
-	local VER_STR="\"@(#)PROGRAM:ld  PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\""
-	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
-
-	epatch "${S}"/ld64-123.2-debug-backtrace.patch
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${S}"/${PN}-4.5-as.patch
-	epatch "${S}"/${PN}-5.1-as-dir.patch
-	epatch "${S}"/${PN}-5.1-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${S}"/${PN}-3.1.1-no-headers.patch
-	epatch "${S}"/${PN}-4.0-no-oss-dir.patch
-	epatch "${S}"/cctools-839-intel-retf.patch
-	epatch "${S}"/${PN}-5.1-extraneous-includes.patch
-	epatch "${S}"/${PN}-5.1-strnlen.patch
-	epatch "${S}"/${PN}-7.3-make-j.patch
-	epatch "${S}"/${PN}-7.0-lto-prefix-2.patch
-	epatch "${S}"/${PN}-7.0-clang-as.patch
-	epatch "${S}"/${PN}-8.1-nolto.patch
-	epatch "${S}"/${PN}-7.3-nollvm.patch
-	epatch "${S}"/${PN}-7.3-no-developertools-dir.patch
-	epatch "${S}"/${PN}-8.1-llvm-tools.patch
-	cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die
-
-	# do not build profileable libstuff to save compile time
-	sed -i -e "/^all:/s, profile , ," libstuff/Makefile
-
-	# cctools version is provided to make via RC_ProjectSourceVersion which
-	# generates and compiles it as apple_version[] into libstuff. From
-	# there it's picked up by the individual tools. Since
-	# RC_ProjectSourceVersion is also used as library version, we can't
-	# just append our local version info. So we hack the libstuff Makefile
-	# to include our Gentoo version.
-	sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \
-		libstuff/Makefile
-
-	eapply_user
-
-	# clean up test suite
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	local c
-
-	# we don't have llvm
-	((++c)); rm -rf llvm-integration;
-
-	# we don't have dtrace
-	((++c)); rm -rf dtrace-static-probes-coalescing;
-	((++c)); rm -rf dtrace-static-probes;
-
-	# a file is missing
-	((++c)); rm -rf eh-coalescing-r
-
-	# we don't do universal binaries
-	((++c)); rm -rf blank-stubs;
-
-	# looks like a problem with apple's result-filter.pl
-	((++c)); rm -rf implicit-common3;
-	((++c)); rm -rf order_file-ans;
-
-	# TODO no idea what goes wrong here
-	((++c)); rm -rf dwarf-debug-notes;
-
-	einfo "Deleted $c tests that were bound to fail"
-
-	cd "${S}"
-	ebegin "cleaning Makefiles from unwanted CFLAGS"
-	find . -name "Makefile" -print0 | xargs -0 sed \
-		-i \
-		-e 's/ -g / /g' \
-		-e 's/^G =.*$/G =/' \
-		-e 's/^OFLAG =.*$/OFLAG =/' \
-		-e 's/install -c -s/install/g'
-	eend $?
-}
-
-src_configure() {
-	ENABLE_LTO=0
-	use lto && ENABLE_LTO=1
-
-	export CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${PV}
-	fi
-
-	# CPPFLAGS only affects ld64, cctools don't use 'em (which currently is
-	# what we want)
-	append-cppflags -DNDEBUG
-
-	# Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it.
-	DERIVED_FILE_DIR=${LD64}/src \
-		${LD64}/src/create_configure
-}
-
-compile_ld64() {
-	einfo "building ${LD64}"
-	cd "${S}"/${LD64}/src
-	emake \
-		LTO=${ENABLE_LTO} \
-		TAPI=$(use tapi && echo 1 || echo 0)
-
-	use test && emake build_test
-}
-
-compile_cctools() {
-	einfo "building ${CCTOOLS}"
-	cd "${S}"/${CCTOOLS}
-	# Suppress running dsymutil because it will warn about missing debug
-	# info which is expected when compiling without -g as we normally do.
-	# This might need some more thought if anyone ever wanted to build us
-	# for debugging with Apple's tools.
-	emake \
-		LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \
-		EFITOOLS= \
-		LTO="${ENABLE_LTO}" \
-		LTO_LIBDIR=../../../lib \
-		COMMON_SUBDIRS='libstuff ar misc otool' \
-		SUBDIRS_32= \
-		LEGACY= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-
-	cd "${S}"/${CCTOOLS}/as
-	emake \
-		BUILD_OBSOLETE_ARCH= \
-		RC_ProjectSourceVersion=${CCTOOLS_VERSION} \
-		RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \
-		OFLAG="${CCTOOLS_OFLAG}" \
-		DSYMUTIL=": disabled: dsymutil"
-}
-
-src_compile() {
-	compile_ld64
-	compile_cctools
-}
-
-install_ld64() {
-	exeinto ${BINPATH}
-	doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump}
-	dosym ld64 ${BINPATH}/ld
-	insinto ${DATAPATH}/man/man1
-	doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1
-}
-
-install_cctools() {
-	cd "${S}"/${CCTOOLS}
-	emake install_all_but_headers \
-		EFITOOLS= \
-		COMMON_SUBDIRS='ar misc otool' \
-		SUBDIRS_32= \
-		DSTROOT=\"${D}\" \
-		BINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCBINDIR=\"${EPREFIX}\"${BINPATH} \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		MANDIR=\"${EPREFIX}\"${DATAPATH}/man/
-	cd "${S}"/${CCTOOLS}/as
-	emake install \
-		BUILD_OBSOLETE_ARCH= \
-		DSTROOT=\"${D}\" \
-		USRBINDIR=\"${EPREFIX}\"${BINPATH} \
-		LIBDIR=\"${EPREFIX}\"${LIBPATH} \
-		LOCLIBDIR=\"${EPREFIX}\"${LIBPATH}
-
-	# upstream is starting to replace classic binutils with llvm-integrated
-	# ones. nm and size are now symlinks to llvm-{nm,size} while the classic
-	# version is preserved as {nm,size}-classic.
-	# Since our binutils do not live in the same directory as the llvm
-	# installation, we have to rewrite the symlinks to the llvm tools.
-	# This also means, that these tools still appear to be versioned via
-	# binutils-config but actually always run the currently installed llvm
-	# tool.
-	budir=${D}/${EPREFIX}/${BINPATH}
-	for tool in nm size ; do
-		# ${EPREFIX}/usr/x86_64-apple-darwin15/binutils-bin/7.3/$tool
-		# -> ${EPREFIX}/bin/llvm-$tool
-		use classic && \
-			ln -sfn ${tool}-classic "${budir}/${tool}" || \
-			ln -sfn ../../../bin/llvm-${tool} "${budir}/${tool}"
-	done
-
-	# Also, otool is now based on llvm-objdump. But a small wrapper installed
-	# as llvm-otool remains, providing command line compatibility.
-	use classic && \
-		ln -sfn otool-classic "${budir}/otool" || \
-		ln -sfn llvm-otool "${budir}/otool"
-
-	cd "${ED}"${BINPATH}
-	insinto ${DATAPATH}/man/man1
-	local skips manpage
-	# ar brings an up-to-date manpage with it
-	skips=( ar )
-	for bin in *; do
-		for skip in ${skips[@]}; do
-			if [[ ${bin} == ${skip} ]]; then
-				continue 2;
-			fi
-		done
-		manpage=${S}/${CCTOOLS}/man/${bin}.1
-		if [[ -f "${manpage}" ]]; then
-			doins "${manpage}"
-		fi
-	done
-	insinto ${DATAPATH}/man/man5
-	doins "${S}"/${CCTOOLS}/man/*.5
-}
-
-src_test() {
-	if ! [ "${EPREFIX}"/usr/bin/clang ] ; then
-		einfo "Test suite only works properly with clang - please install"
-		return
-	fi
-
-	einfo "Running unit tests"
-	cd "${S}"/${LD64}/unit-tests/test-cases
-	# provide the new ld as a symlink to clang so that -ccc-install-dir
-	# will pick it up
-	ln -sfn ../../src/ld64 ld
-	# use our arch command because the System's will report i386 even for an
-	# x86_64 prefix
-	perl ../bin/make-recursive.pl \
-		BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \
-		ARCH="$(arch)" \
-		LD="${S}"/${LD64}/src/ld64 \
-		CC="${CC} -ccc-install-dir $PWD" \
-		CXX="${CXX} -ccc-install-dir $PWD" \
-		OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \
-		| perl ../bin/result-filter.pl
-}
-
-src_install() {
-	install_ld64
-	install_cctools
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-${PV}
-}
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
new file mode 100644
index 000000000000..247ce794be10
--- /dev/null
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake  # keep dependencies down
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Darwin Xtools matching Xcode Tools ${PN}"
+HOMEPAGE="https://github.com/iains/darwin-xtools"
+SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -> darwin-xtools-${PVR}.tar.gz"
+
+LICENSE="APSL-2"
+SLOT="8"
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+IUSE="tapi"
+
+DEPEND="sys-devel/binutils-config
+	app-arch/xar
+	tapi? ( sys-libs/tapi )"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/darwin-xtools-gentoo-${PVR}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# make prunetrie a static archive, because the dynamic libs aren't
+	# installed, for there really are no consumers
+	# fixed for next release
+	sed -i -e '/add_library/s/prunetrie/& STATIC/' \
+		ld64/src/CMakeLists.txt || die
+}
+
+src_configure() {
+	CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} ]] ; then
+		if [[ ${CATEGORY} == cross-* ]] ; then
+			export CTARGET=${CATEGORY#cross-}
+		fi
+	fi
+
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/xtools-${PV}
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/xtools-${PV}
+	if [[ ${CHOST} != ${CTARGET} ]] ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/xtools-${PV}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/xtools-${PV}
+	fi
+
+	is-host-64bit() {
+		case ${CTARGET} in
+			x86_64-*|powerpc64*)   echo YES   ;;
+			*)                     echo NO    ;;
+		esac
+	}
+
+	local mycmakeargs=(
+		-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
+		-DPACKAGE_VERSION="Gentoo ${PN}-${PVR}"
+		-DCMAKE_INSTALL_PREFIX=${EPREFIX}${BINPATH%/*}  # cmake insists on /bin
+		-DCCTOOLS_LD_CLASSIC=NO  # fails to link, and is useless anyway
+		-DXTOOLS_LTO_SUPPORT=NO
+		-DXTOOLS_HAS_LIBPRUNETRIE=YES
+		-DXTOOLS_TAPI_SUPPORT=$(use tapi && echo ON || echo OFF)
+		-DXTOOLS_HOST_IS_64B=$(is-host-64bit)
+		-DXTOOLS_BUGURL="https://bugs.gentoo.org/"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# cmake insists on installing in /bin, so move bins to the place we
+	# want them
+	mv "${ED}${BINPATH%/*}/bin" "${ED}${BINPATH}" || die
+
+	keepdir "${LIBPATH}"
+
+	doman ld64/doc/man/man*/* cctools/man/*.[135]
+	dodir "${DATAPATH}"
+	mv "${ED}"/usr/share/man "${ED}/${DATAPATH}/" || die
+
+	cd "${S}"
+	insinto /etc/env.d/binutils
+	cat <<-EOF > env.d
+		TARGET="${CHOST}"
+		VER="xtools-${PV}"
+		FAKE_TARGETS="${CHOST}"
+	EOF
+	newins env.d ${CHOST}-xtools-${PV}
+}
+
+pkg_postinst() {
+	binutils-config ${CHOST}-xtools-${PV}
+}
diff --git a/sys-devel/binutils-apple/metadata.xml b/sys-devel/binutils-apple/metadata.xml
index b6fa3676524c..93df0e9db7f7 100644
--- a/sys-devel/binutils-apple/metadata.xml
+++ b/sys-devel/binutils-apple/metadata.xml
@@ -7,10 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="lto">Add support for Link-Time Optimization with LLVM</flag>
-		<flag name="libcxx">Add support for libcxx</flag>
-		<flag name="multitarget">Compile for non-standard target
-			architectures (ppc and ppc64) -- experimental, Gentoo
-			only</flag>
 		<flag name="classic">Use nm, otool, etc. from this ebuild
 			instead of llvm-based tools</flag>
 		<flag name="tapi">Build against <pkg>sys-libs/tapi</pkg></flag>
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index dfd77b10615e..b645efc1274d 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -15,7 +15,7 @@ DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc4
 EBUILD binutils-2.32-r1.ebuild 12354 BLAKE2B 1771cb776e87efa9b0ad69a78df051db44b2078e323645ce185815987a540ffd4e82ed2ae5b3d92ffa3837f117ec7737188b9920f59b8b5e0f55cda03afbf888 SHA512 4233627432a43ab46dac5e10d90a07dc9e085455f3140fb0a731fdb1ef2bfd2245dae3c47e9ba32bdb7a8650f32e7a9f49b911999ee32a18d41c32be4c697fcd
 EBUILD binutils-2.32-r2.ebuild 12173 BLAKE2B fb2dd9286d25b3e9b6bfbebfd70965e72b0458b3d87830be8f8e2f14866818441118f809392c34f2ea535d2f54821c3460108ed71bbd9e78286cad1190a669c3 SHA512 cb442d2e13a2c33fd3e89cd948b5bfbb453d7f37ba18cd061c21c69fceb8cdcfb047d4b009d1ec5d6f3d90c37ad9fa30cdfaf2422ccc6c410720ee0989c11cae
 EBUILD binutils-2.33.1-r1.ebuild 11908 BLAKE2B 7d4a576a037a162d329977822aa08807115e7d6775df73a047bc1c82bdf1cfb3a7f51e31c21c2682553673dca8bbb5db0359a65f3f9722fe751b7871b2bcf91a SHA512 2837ab896d900e9dbb19e7d5584bede1fa19e50ba0dc432d02644ee4c8c791a1219b6fb35213b5e8f50d2d11d24ac1cb393cfd2db20346e7eafc23a8a0da82a7
-EBUILD binutils-2.34-r2.ebuild 11872 BLAKE2B efb68c0c189489561a6d90eb72016f0872f503eb5cd846091fa29361fa843b2e8e15f572c1244d7be244360d599c3c36cf1726642694e0e7d5dd0debf1aef488 SHA512 cbe9447d81fc67e89519042129f2dbab8c4274ad52a915e1c9065507ef335d87d57f361a5b81e81bd892089a83822a9e46b72f38db9668a17a1462337b976cc7
+EBUILD binutils-2.34-r2.ebuild 11870 BLAKE2B a7501d3cb895043c2b8c6e6d87099b6dc6dd52a8eb9b44bb83a2056231eff864171ca9c7031826341744d252b8e5c75af5490f4aa40c1dcbd543bb49e90c038b SHA512 59a910b2ee6a134095739be9c8429b2128ac74b4e82e57517af8c08bfa1295edee143717f2a1a6f8ba0f3bc114eb45f31d17f438d08c0d346c8f5b20fb7a16ed
 EBUILD binutils-2.35.1-r1.ebuild 12468 BLAKE2B 43658cefb152986e42607766f8b263b53b66cea2fd6cb5f6933ad616e4a8a612f2fad907a10fe3aa675b6ffc8810d03f3a70253eae0a00b78a2734ee85ea7165 SHA512 2feeeea71ad8f112284067407fcae8c02850608f6ec246971e4ac6a0ac496397475c2122be830c8578fd3464dd3654858de76985d111c45678121bf0379aa0a0
 EBUILD binutils-2.35.1.ebuild 12468 BLAKE2B 92daee225625599510aec7656338a8a91853c4541cfc75b0f72ed2814941ad3765f51bab88b694543e180b9e0f88799fcff680ea24140b511145ffd0d4f2ac5d SHA512 fa18f03f24cb6880ad1ef246fe382a33187d822b571c7183418a228721578f4cf9cd1807524c04594dd5ac342c8b7bfcbe0c82135d196e2ae025d40016b48f08
 EBUILD binutils-9999.ebuild 12469 BLAKE2B f99ef61b216d5e1948898a1f79aa35a7e8dc439240b6ce9cca8cd88e9a11497e2a937930c3ef31b3d844c180f2352cb33d98c189d4ec8aa46d24e38a80b089f9 SHA512 6cf1f15697a42b4931e1bcf1180ed658ef975df3053b16c41acdebf2c200075b11583aa4a2d20fb84ff6b8d3c1c3744c37317117ba6235b024df080059fe17c9
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
index 517ec9a28bee..b18c16bc3c90 100644
--- a/sys-devel/binutils/binutils-2.34-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -33,7 +33,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 		;;
 esac
 
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 7b20bf64e127..02a9e0151f70 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,15 +1,9 @@
-DIST bison-3.1-patches-1.0.tar.xz 7268 BLAKE2B 9195c00be1706664762598926913cd8fc18a32a6ae6ae4ec58748d5e8fc4877f63258db51cbe3bf84f3345ea0fc7c27d2e1190632c529615d9e6922baef74915 SHA512 5569b7901b40ea01eb7bccdc1b090207bc1ea6c50d144b561b2725ae79f3bcd51e7ea4e8ea37b60ea50ff4882e82110a07986cba1d2397a0333e7e01ae466e79
-DIST bison-3.1.tar.xz 1990536 BLAKE2B 6223642f2934927ca118410e2655f7c677bb1d3d981875ca2224f5aa344a43efbbbea34e79dff94ea489853e505b1d7f5920f4d159d1464ce61d8956ca0401ad SHA512 2a8e217ffb55ed5b1fcc989377ac348a066e62b8a4b0b0da40c3c7202f3ea487b2aab6a704a10b48d2d17673be0e22f6ff1be91fc05c4e0a57969b42a59d0152
 DIST bison-3.6.3-patches-01.tar.xz 10316 BLAKE2B a99e12e69334371316e5841f8c86ed716a9fed108800a33099e99f8fe432374259bf5477188d054b6d474bc905f821939691fc97f0c891d17a79968466f0c7e3 SHA512 5c97a183232ad31f231580193ed1853aba18010703b0c22105eaf6834241c9828d180eaafbc5d1da751b2d45a7e8195493e10ca2321b35680b2b3cd4ec39e3ca
 DIST bison-3.6.4.tar.xz 2472456 BLAKE2B d2efe7ff1a349efe5a8c79eb69aa296dbc7eb9fde549afc91986460f27976e033dd793e904dda2f919f11e011ff6c458805288dff4939dcd1ee20e2b316cb9e6 SHA512 041cd87f4ca6b012031719a49aa81e62d3c0817c6364289732e6a3cb9a0762498760e0f2ce84c03ca9e9b74eb74bdffd1b8b86d2b4a6e4a0d8c8a4b864b672dc
-DIST bison-3.7.1-patches-01.tar.xz 11072 BLAKE2B e68dc42fdeebd9c530d04ba906fb49dec3f2df0a68186a54de9671564ee47f9adc9ca4cb167ddaa3e15458dd339570191b2fe6debb33fdf47f29d1a7aa8d868f SHA512 d167f5278cf3136a96450b2bd664b2563c94205d7c82298951b0b08a6b4b0733101e25636f905c8d4033b5e6d1aaaddab70b7772c28e8c1d6c31a05e23df7ce5
-DIST bison-3.7.1.tar.xz 2605940 BLAKE2B a00e8af6a74100154d2dad1597c901f8473dbdcc57826eff947878c3568bfc9070d92857b3b3e349302e9fcfd67eb3287e7a04f6fcff3b897a6fecf43c1cd03d SHA512 9c4097b6ff26e819be14a9d4ef39f6f259c04627cd305e11da8e67897a369b2bba5ce96bf19fa5f6088670e90a9c5bc5c45172f8f482252aeec546b285dd0797
 DIST bison-3.7.3-patches-01.tar.xz 11336 BLAKE2B 2648dacd99c64c366946dad34f9e5fd838b43257df47bf74e3a3b63b03099152b4884d9b1c5943ee5c47afb090369278874c5f2b40dfa69b3abfa4eaa556843f SHA512 a53d541a550cc45f6c677fb6fa830640b64ba2c9a4ab4e6aef1f52ecd5fa38501e2391707d66c2958dd7a139dfba74ae5734e80d15360a3aa544fdea8ecf5500
 DIST bison-3.7.3.tar.xz 2613028 BLAKE2B a6f1063fb9441ae9102b29dc2786b7eb7104f7f13288d537080c26e7982e63f7a954abf1903f2a79a88578d88e9f3c30da8dcf12b7d6c89de0b60943186332c7 SHA512 34fe630749dc015f15a830ad13742c4b0b9163143a11e987c16954bee0451e819ec2fa7b43bd34c867e5ce72c758eb9070348d1d581c9435b9531a99caa46eed
 DIST bison-3.7.4.tar.xz 2617336 BLAKE2B e49a4a6fba1dc93314133541c24c6619b465a81850d6b8c4ff63074df46fa7d6e1d9645797c14be32a87c0ffee6830b24e49137b6357d3284d736b407fe7d118 SHA512 3fc13ab21e28218afc9b7f1196a5607de7ff4403c4126df359848422a8057ac6c17ce4344864dd320b7c47a08d98e0f3e2929f25b06be3b1f1c867c0568f367c
-EBUILD bison-3.1.ebuild 2482 BLAKE2B 2595a1242d213c2839fd7cf1d3a069b666d3915d1e86a4903ee35136be9018bc5d0a960c9e4c24927c9f0573d76802a764ab8da9157ab399dd000238d196760c SHA512 97f27e6390787b602ad7aad377e1d8313d58036e7b3f3acb141b009bd8327839e2cac72ae3231d8ffed5fbaeb66298c356834956c8ea5665d1b0e674751457db
-EBUILD bison-3.6.4.ebuild 2456 BLAKE2B 3d5bf57304e3cc58529ab940baa619b0300592dffcd9de892afb694a0efe1e023e10960998418c2bea6f06f8438eb6a59772da67f077040b4f13b61a64e55cc1 SHA512 4034360fdeb456588bc8e0c86709efb1cdd4e775c484fecb93c5d0f804229f108d0470fad4f3964ba18cfb6d4a268c775dc159548a30ebfe238ce846191d4b2d
-EBUILD bison-3.7.1-r1.ebuild 2564 BLAKE2B 39e2951e7b56da27efe14877358c2f290cca25c60a4beda65854edc4923b10ed8e51074dffa8578ae03ab6c673fd07d1345269e30b296cdc7fa4d3ab7a0a106c SHA512 b377a5c91dfc518f51778d9ff81b5410b7631cf7c3a24618ecb21e1b80084afbe2f8a128bfbae0c753f72ea1bc1f2640624755316737294158a445646151f09c
-EBUILD bison-3.7.3.ebuild 2464 BLAKE2B 85280ad28d338d5dbca25fd0b7a47c33c9cf20a15964d03351c38c2d2fb4b429334f5e44a4d35c04e8be3f71a5c3cfe024e92363f50ff42b1d4ecee891fed61f SHA512 e87895ecf45dc64ea08413cbe65333518e7092ce4538eb4610d3e72589bcb5fa0b4deab6a2730d0e90c8900ac6e822354a8d59fe8fcd93d07d4b2b98d8059d9b
+EBUILD bison-3.6.4.ebuild 2450 BLAKE2B e0f12639263a3ec5110e336ccb617f6092c8710b1d472e53a02365c3df0b1fa4afeb60aa5df893359fc52b92b6bccff30cab24e48e1d6ff767b435f6640eab98 SHA512 84ee2cc222833074b115f277e5a97dc9825aa919a8aa63fe8df3b8d3a739cfb6be6f48d1c659ec54ee5acc0b58ffb33b2a425fef8c144dfc361bc1d28e9ba8c3
+EBUILD bison-3.7.3.ebuild 2463 BLAKE2B f1b79a57e017e834b3ea0a19c1d61c237a223e543c74fc56d43a04b46f9aec56e7f37b6c13f9cd3db871daa12dc474ad597d238a81adc095bd37f9fed78b13d7 SHA512 733c04bcb3d01b99103b8cc07dec16a4fd93196587dfea3a6a7ec7d4e3c7ab39884b9e494f551d6fb25913757e9ab3cf541e73d81c6460d5a9df0706583315ac
 EBUILD bison-3.7.4.ebuild 2472 BLAKE2B eb303a11c93c006e1c90ba0b7f1fdf00f7ba5220d2b7ac64b49e1206cf43fd76f07dfd4a44f323e39a6eea666fa4e5ae858e9bee398e0b497d0cfe813adac68f SHA512 c4b89e95de226dfe0f74b366ce65ff27bd58a48b50e55c4fc1df776c5f4d6b7cd88b6ce1e182a70987b56be4041231ffd6fc517a4f363ab932163fa2344da282
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.1.ebuild b/sys-devel/bison/bison-3.1.ebuild
deleted file mode 100644
index 2b76fbf12f7f..000000000000
--- a/sys-devel/bison/bison-3.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic
-
-DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
-HOMEPAGE="https://www.gnu.org/software/bison/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/bison/${P}-patches-1.0.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples nls static test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=sys-devel/m4-1.4.16"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	examples? ( dev-lang/perl )
-	nls? ( sys-devel/gettext )
-	test? ( dev-lang/perl )"
-
-DOCS=( AUTHORS ChangeLog-2012 NEWS README THANKS TODO ) # ChangeLog-1998 PACKAGING README-alpha README-release
-
-PATCHES=(
-	"${WORKDIR}"/patches/${P}-optional-perl.patch #538300
-	"${WORKDIR}"/patches/${P}-avoid_autoreconf.patch
-)
-
-src_prepare() {
-	# Record date to avoid 'config.status --recheck' & regen of 'tests/package.m4'
-	touch -r configure.ac old.configure.ac || die
-	touch -r configure old.configure || die
-
-	default
-
-	# Restore date after patching
-	touch -r old.configure.ac configure.ac || die
-	touch -r old.configure configure || die
-
-	# The makefiles make the man page depend on the configure script
-	# which we patched above.  Touch it to prevent regeneration.
-	touch doc/bison.1 || die #548778 #538300#9
-
-	# Avoid regenerating the info page when the timezone is diff. #574492
-	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		$(use_enable examples)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# This one is installed by dev-util/yacc
-	mv "${ED%/}"/usr/bin/yacc{,.bison} || die
-	mv "${ED%/}"/usr/share/man/man1/yacc{,.bison}.1 || die
-
-	# We do not need liby.a
-	rm -r "${ED%/}"/usr/lib* || die
-
-	# Move to documentation directory and leave compressing for EAPI>=4
-	mv "${ED%/}"/usr/share/${PN}/README "${ED%/}"/usr/share/doc/${PF}/README.data
-}
-
-pkg_postinst() {
-	local f="${EROOT%/}/usr/bin/yacc"
-	if [[ ! -e ${f} ]] ; then
-		ln -s yacc.bison "${f}"
-	fi
-}
-
-pkg_postrm() {
-	# clean up the dead symlink when we get unmerged #377469
-	local f="${EROOT%/}/usr/bin/yacc"
-	if [[ -L ${f} && ! -e ${f} ]] ; then
-		rm -f "${f}"
-	fi
-}
diff --git a/sys-devel/bison/bison-3.6.4.ebuild b/sys-devel/bison/bison-3.6.4.ebuild
index 4247649b27f7..abac383069b0 100644
--- a/sys-devel/bison/bison-3.6.4.ebuild
+++ b/sys-devel/bison/bison-3.6.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/bison/bison-3.7.1-r1.ebuild b/sys-devel/bison/bison-3.7.1-r1.ebuild
deleted file mode 100644
index a7ca15209937..000000000000
--- a/sys-devel/bison/bison-3.7.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-PATCH_TAR="${PN}-3.7.1-patches-01.tar.xz"
-
-DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
-HOMEPAGE="https://www.gnu.org/software/bison/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/bison/${PATCH_TAR}
-	https://dev.gentoo.org/~polynomial-c/dist/bison/${PATCH_TAR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples nls static test"
-RESTRICT="!test? ( test )"
-
-# gettext _IS_ required in RDEPEND because >=bison-3.7 links against
-# libtextstyle.so!!! (see bug #740754)
-DEPEND="
-	>=sys-devel/m4-1.4.16
-	>=sys-devel/gettext-0.21
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/flex
-	examples? ( dev-lang/perl )
-	test? ( dev-lang/perl )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) # ChangeLog-2012 ChangeLog-1998 PACKAGING README-alpha README-release
-
-PATCHES=(
-	"${WORKDIR}"/patches/${PN}-3.5-optional-perl.patch #538300
-	"${WORKDIR}"/patches/${PN}-3.7.1-avoid_autoreconf.patch
-)
-
-src_prepare() {
-	# Record date to avoid 'config.status --recheck' & regen of 'tests/package.m4'
-	touch -r configure.ac old.configure.ac || die
-	touch -r configure old.configure || die
-
-	default
-
-	# Restore date after patching
-	touch -r old.configure.ac configure.ac || die
-	touch -r old.configure configure || die
-
-	# The makefiles make the man page depend on the configure script
-	# which we patched above.  Touch it to prevent regeneration.
-	touch doc/bison.1 || die #548778 #538300#9
-
-	# Avoid regenerating the info page when the timezone is diff. #574492
-	sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		$(use_enable examples)
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# This one is installed by dev-util/yacc
-	mv "${ED}"/usr/bin/yacc{,.bison} || die
-	mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die
-
-	# We do not need liby.a
-	rm -r "${ED}"/usr/lib* || die
-}
-
-pkg_postinst() {
-	local f="${EROOT}/usr/bin/yacc"
-	if [[ ! -e ${f} ]] ; then
-		ln -s yacc.bison "${f}"
-	fi
-}
-
-pkg_postrm() {
-	# clean up the dead symlink when we get unmerged #377469
-	local f="${EROOT}/usr/bin/yacc"
-	if [[ -L ${f} && ! -e ${f} ]] ; then
-		rm -f "${f}"
-	fi
-}
diff --git a/sys-devel/bison/bison-3.7.3.ebuild b/sys-devel/bison/bison-3.7.3.ebuild
index 65c3feb74108..d41c7bbdc0a0 100644
--- a/sys-devel/bison/bison-3.7.3.ebuild
+++ b/sys-devel/bison/bison-3.7.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 8c838707d9de..f0881033e217 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-common-10.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 EBUILD clang-common-11.0.0.ebuild 591 BLAKE2B 306d03beefbfc18bb39355d549d30b62b651efef5e462564822075d3407f5b5267cf3e1bb241bf97db24d6d3faffe73eac6609d994d196b85374f7a246957a5e SHA512 9ffc10f89e5240e2622ca46a682e5172884baaacc5e1ef6e7aedbe1b2e30376f6c5d238f2cb3d1d6dd69dadbc7f6caac61f14e2f52766feca1f15115c809c127
 EBUILD clang-common-11.0.1.9999.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
 EBUILD clang-common-11.0.1_rc1.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
+EBUILD clang-common-11.0.1_rc2.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
 EBUILD clang-common-12.0.0.9999.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
 EBUILD clang-common-9.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild b/sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..c9abcb48cca8
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-11.0.1_rc2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 9145951400c6..e7b84bcb4e56 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -2,6 +2,7 @@ EBUILD clang-runtime-10.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d
 EBUILD clang-runtime-11.0.0.ebuild 703 BLAKE2B 083804754e5d7c82f8a63095d81cd31349425b1a37da512e80c0e2b1e0e0e48955f75d49535c8d28d2c1c084aeecb692b214246a22c503f380aae782863286f6 SHA512 16afe60399c075bb6f64156246255db2f5914909ad51a9e82fe1ad4607034418f311fc635e5ae66dc750604a7139541553b0e0c1c6d3b533ddcb09aaf7f9eefa
 EBUILD clang-runtime-11.0.1.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-11.0.1_rc1.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
+EBUILD clang-runtime-11.0.1_rc2.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-12.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-9.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
 MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a
diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..2713d1f397ff
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-11.0.1_rc2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 7300df9599b5..720f80d4c72f 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -7,11 +7,13 @@ DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-10.0.1.ebuild 11828 BLAKE2B e6ee6571b0be8983ea5d23acb899e562758a1cc6f28acc1e82d0b4d8cf5854262fb5f059abf0154e523c075f49ef804255a1ae106982276a1276fd9106d39da3 SHA512 c076072d0c3a1dc91b50dc58af34a0d274217f2d3b138c5fcdeda5e0d669511c1cc5dc3ef2b2332e9bc5b6d8660520def5f03dfb8890c1d7a4701e2915b122ab
 EBUILD clang-11.0.0.ebuild 11582 BLAKE2B 90fae946ded4ba69c2ccd2b3f489255f16e3d1568d6e01f700c26ccf075db7bf313a2190f0495b82fd604f1c14331172f3e0ba517fbbc19cb0d7695f7d0c1353 SHA512 6d1de2f567c938bafecba2536eddd6629b388c3dd9f14130e13eaf8ce64550b9e3745bb35328ec481becc0ba67720a20ea4a6146a4971695b14b913d7d5d5236
 EBUILD clang-11.0.1.9999.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
 EBUILD clang-11.0.1_rc1.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
+EBUILD clang-11.0.1_rc2.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
 EBUILD clang-12.0.0.9999.ebuild 11498 BLAKE2B 4e715e105fe646e9c3af7708685ca1758702f1becb42436611b628dfeec7241a63c5e8feb407ce25f708c4ac58ecacd41a2677e05fb687e8d96a0869633319dd SHA512 adf5827949ccdc26cb159caa96dccd42b21100898a73cf98388cd4cb42d0dbe054b245c18957f4de36b0a6141a7bee7e1393fcc3d6c290f2a7c88285b6593bf8
 EBUILD clang-9.0.1.ebuild 9020 BLAKE2B 7c5f8d85d4c6c4d1541c14ff36f2b93ebd553b3ff11e1c9d90dc6eb406b9a7f4072ec08d508cad4efebdfc0d622750a0cba8b24a21b8a053ccabac99bfa750e5 SHA512 6eb0b5558982ad0c43b9478f4ca25c4aadc7a7ed0e4cabd0b918b75613e7d3fac88c0cd09d1616fa88618b7b5b5783b35d3a5b9b9a3b2f7366863aac738e2743
 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-11.0.1_rc2.ebuild b/sys-devel/clang/clang-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..4a3a05b4df86
--- /dev/null
+++ b/sys-devel/clang/clang-11.0.1_rc2.ebuild
@@ -0,0 +1,431 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}
+	test? ( sys-libs/compiler-rt )"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )"
+
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	mv ../clang-tools-extra tools/extra || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# headers for clang-tidy static library
+					clang-tidy-headers)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-clang-man
+				docs-clang-tools-man
+			)
+		fi
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			# normally copied from LLVM_INCLUDE_DOCS but the latter
+			# is lacking value in stand-alone builds
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index f82621e67dfc..fa231d4105b1 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,8 +1,6 @@
-DIST crossdev-20200801.tar.xz 28268 BLAKE2B 36f22a2d1422d5f9e27a5559a8c141462853c4dc011ec98c66d235ef262ea9408fd5054b578963fd17ef630ea63e72c068d216f6ffbea7d191d1374a6ecc4033 SHA512 331af1525cdfc66380621b764bfc63178ce962b9071408d1ee08480caad9c0e4782a8fa5e5f3500fd2ea03ccd322895cc95d80106ad9e5b97a0e09ef5d88c94b
 DIST crossdev-20201122.tar.xz 28308 BLAKE2B 66da19024dd03e98ff0f388cdb9bf76a968ef4ac920249e9a782d46c1d32a4cb3047a0aa2d9619a054b9894ef30624ce99bb45f9c45b937fbb280a8a298aede8 SHA512 bbd7ab6a8ea0d2cb13f822277d9b8c19478368b2f365aaa60bd2548b47f9e7a582805593b683631ebb20bfb6d2f496f2d3a5eb6d144207fab58607565a8d1a41
 DIST crossdev-20201129.tar.xz 28372 BLAKE2B b59d94a69b83f8db9193bd54ff6059b20617b6dd60c0f9a0ec5acdf4b93adf747886598b9af7d69d2fd9705fab709041a96c149286e623b6557ea709bf2f840a SHA512 7b49795ea266d90e45c48b092bffa485a7207c66550d797297cb7e0756f7c497d045b3cb9b90f50b80a3ada4916a3ba273b2c19b9d02c834fb47d906efe3a8ba
-EBUILD crossdev-20200801.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5
-EBUILD crossdev-20201122.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9
+EBUILD crossdev-20201122.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5
 EBUILD crossdev-20201129.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9
 EBUILD crossdev-99999999.ebuild 856 BLAKE2B 8ec9e78dc63a9bdf766b1010b0953b7da86c164f221fc31058dc0e02e160091241d68d38b75f155bd8c55074019f626e9b0c272899574927f7aec9560207e357 SHA512 bffbd553b032998e649c5b505d1e7758d06d7b6f8b9d25487c8d034884dbe01259585597f731dee3e10a0e3d7bbc2ecab606ae2612fac7e46b03c91f74778490
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20200801.ebuild b/sys-devel/crossdev/crossdev-20200801.ebuild
deleted file mode 100644
index 7a6c51ec73f2..000000000000
--- a/sys-devel/crossdev/crossdev-20200801.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20201122.ebuild b/sys-devel/crossdev/crossdev-20201122.ebuild
index 809478863946..7a6c51ec73f2 100644
--- a/sys-devel/crossdev/crossdev-20201122.ebuild
+++ b/sys-devel/crossdev/crossdev-20201122.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index eaac31c800e2..879828d8e9e4 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -13,6 +13,7 @@ AUX gcc-spec-env.patch 1544 BLAKE2B ebd019ff63f6a8526f741f1760925538f10b25c7d5fc
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa0a0973b3d55bd6e12baf9e6495afd0fec855fefd223172c23f11449769996c18359abacfac36f62681310c861d5d2850 SHA512 6ebf5875ecc9f10dea67d4793fcc47178ddd6abe8959fc0390c6ff967fba7318013b4bf251abf451999b86697e97390c8698685b12086956c8e6bc2e97708bc9
 DIST gcc-10.2.0-patches-4.tar.bz2 23266 BLAKE2B 8173474d3dea27a440b36eb80c89aabb08c37528c3ec2382839c46fc36336aff7f9cdf3dfbc66947df9286b1cfe9f479d615f77d81ab24ff68a3edf5df5b2350 SHA512 17080f358a3f231837de35188ad1a6ae554a4ca6199efae6dacf9b17706937379559d6c8de330b4237480fea6f5cffffc1158c1d5ecc36ec3a7b410546a2684b
+DIST gcc-10.2.0-patches-5.tar.bz2 24415 BLAKE2B 08d1e2409a6013f8ba3c14b60a5db773b0ca18b2df71bb1c11aa3ae76bba69d88ca4e7a33d2a7a012bd36bff15c55d5ada9b53d3e36c210b9a5e7aba178327f8 SHA512 04292690aa221849c16432ee165a3aef8ad81dec0acc68a0499b3a4256eb8dacf6c1160ac91053c0b84f30a019bfeb121bb21b6ffed3dae15a5b8c24f1e870df
 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
 DIST gcc-11.0.0-patches-5.tar.bz2 12815 BLAKE2B fb5d467422de29bee6cd4e1b822ecbe1cc1a0364288f6ff37b43ceb12cf96618dcc072ddc5b1311e205996cb1d528be28641870ce03a51fa1d65ccf0c8c4d075 SHA512 6ebc28998b02c2fdd6cbc8b70a9c67a9de08226880b11bd87f512e9b81a04d9d78597faab3814c27f7bd6bed51513119d580eb828b0d4891768819c028aa48db
 DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89
@@ -20,16 +21,19 @@ DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccd
 DIST gcc-7.5.0-patches-3.tar.bz2 11613 BLAKE2B 84d59103bffaec8fc57e69dbb17f53882935b20c23d54db5f805e8270fa16d8e572ee4a369ecc82d2279cf66a71d1eb2a7f0c9792d4495d2f68946d6b6403f15 SHA512 6e5bea150c56ce3d43c9b0878691ed54ecc5d2a12482e99261efa74af7f1d59ec94c2d0c363792d99e0d3a0abd739d5d06b861da4dea2c1676e5d498b5815d55
 DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acdf27419f1067f5c3d087333d9eea0c8db427b8bd895af646990bb00ee173069980ca49cec848434a4127256f SHA512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
 DIST gcc-8.4.0-patches-2.tar.bz2 16254 BLAKE2B 5ee50ee1a3f6cdb392b370a0f62af7e8fd2fb2cadc46d4faf37ddbae23812a0e9f2e35a4ed6a08c41ffe648c21e9982e965d3ab91f68ae941c6cad74098afa2f SHA512 26fd2ad9f29dfd1db671d4966c16165a6fb75bd74f440871fb41dcb9b6102f07347ae8df67baa9e4d52aec91d3d67803a952b7bd45159fde56e1a1f28237c5eb
+DIST gcc-8.4.0-patches-3.tar.bz2 16890 BLAKE2B 29b537faf6fbf5ee43a72ea622090c17a28e19b903807d64302ef9a53c4eddc796c32e4f522ae0b724dda527ee073ba436e8803384d6d73d5e715653f89f59a3 SHA512 3f44e05d271c877eb2183731d4faccfdd66ac392bb8a541256d4d58c9e26bd205a53b9c881cc9c457cece55596cfbd8c6278be9509f3b151bb5e43206ce80188
 DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389 SHA512 54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
 EBUILD gcc-10.2.0-r3.ebuild 434 BLAKE2B ba1fccc8fa386407cee7f758fa6d0b9b989825f6a796d2d18e90e9fea25f5dbd07ac911e61eb11edc226cc0aebb6b27016d8be008755d7e6a9ec0eb1e35e0169 SHA512 3b24b9f05039720b05ba55e2399f0b6251dbb0cfc15587855ba888620d459cd9f1dc0b49c3df0a49414f0f713c021d800108226a4f88897491c47ff3828d18ff
+EBUILD gcc-10.2.0-r4.ebuild 434 BLAKE2B 36c6583bfbec07d3b1f264e640c5ad9422f6833fa4dd9e382bd22e0177f1485e3aef68290cc1104f9796bd380823538fbc14e76874c3ace2196dc0ed5e18eaa4 SHA512 57eca9be43d772c7f5ca9e8c1729ff33647afcc49cc3a62fc4c5b5dbaa4b87a186734baa9ceb6f7bbeab0a3174159745cf8dd2353d172a0ad34758d2bd7a6fd3
 EBUILD gcc-10.2.1_pre9999.ebuild 807 BLAKE2B 08c2172ac50d043050dcfb3d69c138c51fb8d58f2601c14bcbaa4df5d9e844639f0bd345b14a702a86cebb7c420ca4cd831e0b8a995b036e7fd261963663e331 SHA512 0c05fc611f569a49d95d766048f6a1f3972108f7cbf2d03d5dc9a0f0ad29bf1ce4dd2269edabb0912628c9d5e8e377e9be586dbd07f182ebadbe7721a7cd5108
 EBUILD gcc-11.0.0_pre9999.ebuild 511 BLAKE2B c439da4d9eaf4512ac7ad516a2ce726e08a64e2bd60b2288738f6997855ef873a046e679781a237bbbfbc57b8ea36e1a92d428a06f0dbc3c797716127a6b55ef SHA512 b5f39fdd33f9dca702963492e010f0e397580ab1d0a7fedaa23c2e6da63ecda14db6253a02a4aee30c0151ea9437a2ce2ec1027d01574a076ee267737272b132
 EBUILD gcc-6.5.0-r3.ebuild 436 BLAKE2B 8b219613160b1d152efeebae97d56e1110473c31949b6c09b9f721afc36c765a8a499fe1ab43ec5e115197f4b9ec3f73cd6cff2d7716993a93353b8556bb5115 SHA512 b83c39a6a99971a0bc4f3ab57b5bc8c5477a1da8fb82a6b56a0dec1e0225761dbdd080606e6abf4b06d56a9b39e766ebac8b347ae56c535f7bf2a381212530ba
 EBUILD gcc-7.5.0-r1.ebuild 447 BLAKE2B b7465ed897cd3f2c0716e7fc1fe384dd93de4f29a090948857af9cbb04af1acee54557a2185e08852efb63ece42f72bf0c6289ac63f059d31bf32936bcb3dead SHA512 73b7cd1af8c1a45e0303085b95f8fa25831af50ad9999d7268847c970af9ece183dd68334bb0b57a153c8e4ed4ca3baa93c61a4ee6376bbaa944dfd529dd9bdd
 EBUILD gcc-8.4.0-r1.ebuild 443 BLAKE2B 7263728f3a730bcba73bb779ab11b4951f1171be0a0c0f2dc0efa3299e33cb0880c33d53672d369c2266816aa8f165b0d0295fa66c7fd92779ab80846428640a SHA512 2ea31641f37460d7951767780868c7e4b582531f7e0a0a732f5ce4d981a559b3f0750dd51c8dfc91154da9e4205114353ad883df35b9910d361bccaceaeb5711
+EBUILD gcc-8.4.0-r2.ebuild 452 BLAKE2B a08af9f8f55166a07894145a6d53a4c6988b9a419e95386e28f6875d6a81a6a02db25a051506c981e17c68846056a919697cad6f5ee3461b4f3167777974921d SHA512 1991ba970e5e56eda9a8e1391514de8028ed6741b379375d23ae3e13f267203cdd29ac0aee9f8faf8dc6a42c0291095521257886c77bea64159665f0ebb00c1a
 EBUILD gcc-9.3.0-r1.ebuild 443 BLAKE2B 0f43c582049ee55a5627d2a05e6dec513b4078d57e322fcadcc917056e840db4bd58dab264f068135569c0f06baf75e95d43302e89b2caf4bf4dac420e052872 SHA512 4efda3a2cbf371a688bfecb74369e7215dec1d5e8b72612f13a50644a884e738842f8ea25aa6800931c39bf0571c8f494972f413cc187b967f9b7a533a4237ad
-EBUILD gcc-9.3.0-r2.ebuild 450 BLAKE2B 98c2f2f85c6952ff3178a0f4a06d4fa307dd03e94473c7cf63846d2e17a8564c15ef44294bde0c9ec96cc1177e2a6ad73b23d9dd09a0ff98b96a5591d5d89f55 SHA512 ab8c5fe26c4a858f9e511dbc98b0ff6b140b025c8ff1499951a57422105f8bef22f4cac8c34ff0ee7495d336c1bc2feb7e67411cc1eaf8f7f91f983ae555b8f9
+EBUILD gcc-9.3.0-r2.ebuild 447 BLAKE2B 21486596a97d2b46ac76e3f669927fc6ab936fd1ef7ba90b6eeae67880ea68f9fecb19b6fdf8c1e8f8fbcfd7df7c8a6f7e3c353ec3160bbdbcec48cdcf2406e2 SHA512 edc497faaa3e5793e7a90b2e3561b56dd9f60bd5bf742d36154b374755db45667b42e000d37cb62df792bd1586ed309fe42197bb43b2a48043d654ccfa635e99
 MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df
diff --git a/sys-devel/gcc/gcc-10.2.0-r4.ebuild b/sys-devel/gcc/gcc-10.2.0-r4.ebuild
new file mode 100644
index 000000000000..1e1a7574abd6
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.2.0-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="5"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-8.4.0-r2.ebuild b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
new file mode 100644
index 000000000000..576f5446974d
--- /dev/null
+++ b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="3"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+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
diff --git a/sys-devel/gcc/gcc-9.3.0-r2.ebuild b/sys-devel/gcc/gcc-9.3.0-r2.ebuild
index d5204e8c95a9..775f1c3be30b 100644
--- a/sys-devel/gcc/gcc-9.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-9.3.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="4"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index eb8f22818384..52c441067cb9 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B 1c55c1e99e5e8bedbc1e3ab1b8159ee04e9128f7ddecc2fcb1800e12c62c1543cf16f9fc016eada3773c263f7a86c5199ead1f75d28db9126c6df3de6a9f0fba SHA512 9d22766d1b5915fade4ed73e1a5ba1eeb276d1cca640ba13d76502cf58025e03a96c4c162bbdfa328a29bc612d954771249300fe4724614b910b97f5313693c3
 EBUILD lld-11.0.0.ebuild 1396 BLAKE2B f57f7373326fee82fd0816e61ac0c4c45a2efac0cd4261b545c751d023f9986bd36be88e3afda9bee7a8d7b226577e0494fd11236a6683ea9ea2bad7f457efbf SHA512 57c50fd9b83a26dfdfb1732867a74264905241f77d31acf1a82e7b3ef09c4867105ec0ce99dc45b3373bd45285c043858f9befc167c44a8d0f25fa3cd89bce29
 EBUILD lld-11.0.1.9999.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
 EBUILD lld-11.0.1_rc1.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
+EBUILD lld-11.0.1_rc2.ebuild 1367 BLAKE2B 63a086f319f38c76f13fa2b2a9b61e42c42bf86c519f592161ff4a1575145720ddaaf44482caa38fc762ab1580e15baef9ce23a5ce6675e9f6133af204acf243 SHA512 f47feac0acc03f9f2aaa5cff60a5921a0ee2a71d736b40718f2a2c5cf66a94bbb445c4506cc04761b0f8b27f487d8bf9af92c9eef70a484fa952aff4ab802505
 EBUILD lld-12.0.0.9999.ebuild 1777 BLAKE2B 69690e21b7c4a63f24b873ae13ab37f57f7b7a4c564be295ed185657508e5ca0fcf108a4f114506cdf793dfb3986f65bedfa3886a0d548827de172217718af01 SHA512 3aa55f77f6c966f6bdce54cade8c957b8ad6a5d3152c6cf1d104c145ea35536dc8ec577c81f476577028a7828eb6401323fe6deb5fcddbac2865f165f81294c3
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-11.0.1_rc2.ebuild b/sys-devel/lld/lld-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..4b86a2bdffef
--- /dev/null
+++ b/sys-devel/lld/lld-11.0.1_rc2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)"
+
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
+
+src_install() {
+	cmake_src_install
+	# LLD has no shared libraries, so strip it all for the time being
+	rm -r "${ED}"/usr/{include,lib*} || die
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index ed3c1267e52f..46176f156381 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-common-10.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 EBUILD llvm-common-11.0.0.ebuild 606 BLAKE2B 38a0872487be62c2b5c554dab6e675b9f730de7d41cd703257fceb5a2cde35f8565ff517b44491db27cfa1a3656e3881712ca174aa4065005dc8437cda89a3c7 SHA512 dcd3d8b45d1215402eff9ed81eb24e72910e4dd40cee5cf8a5b5c2603eb650635c9afbfa4a06e2debd574ee39fde5090e2f9036419d4dbdb0c5739f8ca6bd01e
 EBUILD llvm-common-11.0.1.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-11.0.1_rc1.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
+EBUILD llvm-common-11.0.1_rc2.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-12.0.0.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-9.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild b/sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..4804d9640098
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-11.0.1_rc2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index d2563aa12d84..5c2d7736e54a 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -5,8 +5,10 @@ DIST llvm-rocm-ocl-3.10.0.tar.gz 123600166 BLAKE2B 9b69dab6c7d1a8dfe0d90c76b5444
 DIST llvm-rocm-ocl-3.7.0.tar.gz 116973132 BLAKE2B c1cc8a3b95292d726626d3cb59ec1b96549682bfcbec16030e47cf1318c6ea01bc76f3349f012ce4f1e4d8b9fe192c51a025c2d08cf593622c61fe7c61969ba6 SHA512 0626075bedb3898c96c0bb0be7a2aba4662050a1c738115f661bedc03d744ace7a4581b55c6325060740c13a0e50e72e09272bb02c1186c2c4a40fc9b961dcbe
 DIST llvm-rocm-ocl-3.8.0.tar.gz 117004300 BLAKE2B 13c3213f0fb951fb9d574e8f6d76bb6c632fecadfe93dbe68a9720baa22e35aa3269deef8b533c5a5ff50a2c1ee3dd7a1ea0fae4b8ab8573ec5bfc5ca5d04f4f SHA512 4eca387a132c9d1237ebec7c80319e99c80088766209d05a697d09890f4a82c56ba5f48a5c8c8749bb051c177bb5eab67e00405b04d3191681d0ac7cf1ae868c
 DIST llvm-rocm-ocl-3.9.0.tar.gz 123591368 BLAKE2B 54b44d705e7704921df1914bac6dc1da8e420f9383efb698a9cf6a339b653d71cad29aa077a9e24d6764ca81fb8dc55fa70abb0cfac004d40f7d811e20ec9945 SHA512 3404390506b33c1de1d05980fafb219692985f38b52d852e9a47ab94e57228caa25ccd0d0d69da656281de32c75e001f60cb9f22453e70fea7b39d065d4333af
+DIST llvm-rocm-ocl-4.0.0.tar.gz 123595983 BLAKE2B 69dd47a50a53cf7d8168f872778bcda0e028907c2341b165f40152bdf03b668ee6c209dc60fa1018dde2a946d891f15eb92a38cfbc12bb5798dd132c1ce79bf1 SHA512 2ac3d643e0bee72239089003cd2889711a7cd58dc588467fb0ca0a50bec264fda992aa2e3352d5210011a9dc1eea4dd9eacdc7d0c313cd69c7b491df126a4e4e
 EBUILD llvm-roc-3.10.0.ebuild 1536 BLAKE2B 60a1d393a5df2291d971e67f9bbd2675611f935530410e9f9f18cc2178606de298266200c258c2d23bd857198ff41b292d072d0e2c03154b9a640a9ecabf94af SHA512 46771c99d57027271c61dc45d057ee5848745affa5018d218da166dfd4c20f58a38ab2dfede1c42ccb306264b0c81ea6d267353bad34cb6a0d34c2d7255a3608
 EBUILD llvm-roc-3.7.0-r1.ebuild 1397 BLAKE2B 08aec56b8ab26093f28a9118ca043adb35dcb84ae5899da5890cbeecb5d10f8d6b08e767a490272a5f35d1b3a5ee8d912a52b448ee57582cda9f99fce57ec8ec SHA512 745f2a9fa18bc3b9d76a324beb1e5165f9be8f720ef133b35e1509c08c08e48872ec4c7402e52d29a3b493e27729a43081fd0e90afe90d30b64d6da3f046e824
 EBUILD llvm-roc-3.8.0.ebuild 1492 BLAKE2B 73fd9fd2c47a18b5de44222b84fead548f85b4e67c18838050c52917b6836debee77bc83db6aa0a378516b48a56e5daaac53dde84bdbe1dbefd02494b06498d8 SHA512 d45f0e60c2f12e9b98425310fe370aeeb5d29cd24bfa83b1b908bcbc25866a49e6e1fc7facb04e699bd897f1960a394f2e3a4c5a8308ad9af6177f735dc40631
 EBUILD llvm-roc-3.9.0.ebuild 1529 BLAKE2B 07aac1728864214e61ed45cee3ca718c7830835502fe9e6c1e5ba5d6fc8303f3b644b0bb3476f8a1adcaabf09e961b3b55bfce34312b953e8ba855b7f36cdecb SHA512 5b9755c9c06ed465b58d8ca7c677211c04cb05eafaffee1e558b26d3d3bc033a1b8d6b1b3e69732441edd9f14cbf608da919f4eac3e283f5f4226dc332ffb68c
+EBUILD llvm-roc-4.0.0.ebuild 1536 BLAKE2B 60a1d393a5df2291d971e67f9bbd2675611f935530410e9f9f18cc2178606de298266200c258c2d23bd857198ff41b292d072d0e2c03154b9a640a9ecabf94af SHA512 46771c99d57027271c61dc45d057ee5848745affa5018d218da166dfd4c20f58a38ab2dfede1c42ccb306264b0c81ea6d267353bad34cb6a0d34c2d7255a3608
 MISC metadata.xml 461 BLAKE2B 5a060c417f0bb9bf1fba8375292e7bff20b2c50c3a2ab490bd436f81a954dbd370d61ba59b305b8bdaad9887e9c6a872eb30fea31c566dc6d74d3493b40d0a26 SHA512 a82c2186fc0642dab37608155dcf0aafd20701cb7e2769c6eb3aae88d4df6690743769a75f47efdb36fd8a3d6771f0feecd3efd01c98460fe195394c16d95660
diff --git a/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild b/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
new file mode 100644
index 000000000000..2d3f39394110
--- /dev/null
+++ b/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Radeon Open Compute llvm,lld,clang"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
+SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
+
+LICENSE="UoI-NCSA rc BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug runtime"
+
+RDEPEND="virtual/cblas
+	dev-libs/libxml2
+	sys-libs/zlib
+	sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+PDEPEND="dev-libs/rocr-runtime"
+
+S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
+	"${FILESDIR}/${PN}-3.9.0-tensorflow.patch"
+)
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
+	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	PROJECTS="clang;lld"
+
+	if usex runtime; then
+		PROJECTS+=";compiler-rt"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
+		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
+		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
+		-DLLVM_BUILD_DOCS=NO
+		-DLLVM_ENABLE_OCAMLDOC=OFF
+		-DLLVM_ENABLE_SPHINX=NO
+		-DLLVM_ENABLE_DOXYGEN=OFF
+		-DLLVM_INSTALL_UTILS=ON
+		-DLLVM_VERSION_SUFFIX=roc
+		-DOCAMLFIND=NO
+	)
+
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	cat > "99${PN}" <<-EOF
+		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
+	EOF
+	doenvd "99${PN}"
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index ed7852cd35f3..ef2a83819ec6 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -9,11 +9,13 @@ DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-10.0.1.ebuild 11900 BLAKE2B 069cd18c06aeb6a52f32736bbfe8bd7f9af7050e16298b5653b1b02c326255c41385ab6047052adc2b4c4efd44ccd61ffd20dde8160f48265e1500280612b018 SHA512 576336d3cef1257bf7ae1577d47fd3dc354b9e9d174ff5c75c055f1c306f110fc42313e235caf008308699a66820d1e67de7da3776d40fec3a9e0337f94d0c1f
 EBUILD llvm-11.0.0.ebuild 12856 BLAKE2B 15e4f40259f637a12a67bff0ed1c76c9e80547304370f48a31c00abe73b74a65d34e63b606e43b91e3bae87ac45c0804128bfc1946899b3f1685f7e6cd6296e4 SHA512 4d0cb037ec5919f3a0a3b56e3c59b7e16a5d0c1284908a709cb08faf2cdbbed9c6fbd3d77e59103938614ec7471293043c6dbe80a842ea03ae5c02538dfac4b5
 EBUILD llvm-11.0.1.9999.ebuild 12575 BLAKE2B 12f9dbad338a4b0cd05c8fcddb5da262802da300aae463b2b2ab9f64f96c4cd0d37d4bc9ea69a9f00f71373d807f67e871456a7a069b1812d045c240674f1249 SHA512 a383cfb2901dcdebb49f5451e462168bd0c1991205d6d52d7cff950168ec7ac20bde2e3cc4cd8cdf8004dabcd8ff4fc7f4bb036409c62046279497aaa3074b5b
 EBUILD llvm-11.0.1_rc1.ebuild 12575 BLAKE2B 12f9dbad338a4b0cd05c8fcddb5da262802da300aae463b2b2ab9f64f96c4cd0d37d4bc9ea69a9f00f71373d807f67e871456a7a069b1812d045c240674f1249 SHA512 a383cfb2901dcdebb49f5451e462168bd0c1991205d6d52d7cff950168ec7ac20bde2e3cc4cd8cdf8004dabcd8ff4fc7f4bb036409c62046279497aaa3074b5b
+EBUILD llvm-11.0.1_rc2.ebuild 12575 BLAKE2B 12f9dbad338a4b0cd05c8fcddb5da262802da300aae463b2b2ab9f64f96c4cd0d37d4bc9ea69a9f00f71373d807f67e871456a7a069b1812d045c240674f1249 SHA512 a383cfb2901dcdebb49f5451e462168bd0c1991205d6d52d7cff950168ec7ac20bde2e3cc4cd8cdf8004dabcd8ff4fc7f4bb036409c62046279497aaa3074b5b
 EBUILD llvm-12.0.0.9999.ebuild 12664 BLAKE2B e1a606a81a25bac625bf7847b779e79a27ccf7558b4e0438304146730609cf9f4150e7f585fa02805cac0d58b6dda7f748751413cd6165895be34d4884fe41c5 SHA512 e71e509e3dab84173da46e18ef19c172141b96b4824a12e46b2f70ea8016cd3c79aad2fec43e3978869cdb3c56307db1d0d1083ee889a86af488ebaef66d6339
 EBUILD llvm-9.0.1.ebuild 8399 BLAKE2B c296c1b0575c295bb14db4d3ac8fac06395e327cf95fda0c7e2263062de7eec6d6ea90cc264ac2b806ee2e6071fdc1c66c496502c2349d44b2364165258b6b7d SHA512 92c550916a048de53623aba4f7c2e32b6e6a35fde794116310f1a265e7e6124bfc8b48f27ae6830415802b5a2ffde222948f40c607d1ae5d96fecbf2d9c5591d
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-11.0.1_rc2.ebuild b/sys-devel/llvm/llvm-11.0.1_rc2.ebuild
new file mode 100644
index 000000000000..9c6edd92398f
--- /dev/null
+++ b/sys-devel/llvm/llvm-11.0.1_rc2.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_MANPAGES=build
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+	# reorder
+	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
+		eqawarn "ALL_LLVM_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
+		eqawarn "Expected: ${all_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-elfabi
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-lib
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-pdbutil
+			llvm-profdata
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-undname
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 6a8ccaff9d8d..e888b728769b 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -8,5 +8,5 @@ AUX make-4.2.1-pselect-non-blocking.patch 4476 BLAKE2B da96e19c42a4a98714fa1de17
 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
 EBUILD make-4.2.1-r4.ebuild 1689 BLAKE2B d90f4430b958d6d34f307847d3eac7f7ff6f2012963bbc78c07c0f51d04e85552b9fdd18d58f994275aee3192ccdc37e3db3cac081a8a4e2765c459ffbeab32b SHA512 8fe65ba4f107d4d1ad030567f257233837f961697c64556cd02511a26382ea28975f95aa6ce1f25f75628455000a17a3e3de642f59394038529127c63b8b1e2d
-EBUILD make-4.3.ebuild 1451 BLAKE2B 89bd23b716efd63a8ef599bfe477f635fb588b10f3cef1560d2e3395f832efb4fd2963969ec977d7f31c0ad5b18fefe2866b11cdf85911ad6bb10015ac8f0c5c SHA512 dd0c9fffe1aeb67ff0aecdd67a55ae3b1f40942529e0a393ac603aafca7d36ce236228837899dd9a5605e75585dc9c5e31ac1e4dd5cd1cf70a3540fe9f06820e
+EBUILD make-4.3.ebuild 1444 BLAKE2B 08f6c824591e5688575a8d81b710751a03eaf95eaf1a2eb99c1c3ee4bdb78a07f40dbf3508474ac26d8ac4cd93a8b1a54cfd7914db9bc8167d939275674f8272 SHA512 bb6304dedbb84b6a811be7688d23c5c53df1ebde06e3ee3fb9125432e881bd02aa06498c0030318400c366da1762167599078cdc5ced3aacb24c34d73b487a50
 MISC metadata.xml 327 BLAKE2B c4ff5632d2d92cd0e1c073808261cc162799e186abc0cbf06bec9c3cb18757e325e63dc060e417196faec853dd740701f1bce0436754e8856399e4aee0ef950a SHA512 579ef7fc6e14f725bb29802f350035bc3619e6f06c72e3c496a92c056f15c6baa5f07d7b1aabbf13467629f30137bf2160b9d13aa6fdd65dbd04ee94472d00a1
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild
index 08f05795abe4..2117d8090eab 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.3.ebuild
@@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then
 	SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz"
 else
 	SRC_URI="mirror://gnu//make/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-3+"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-25 23:06:25 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-25 23:06:25 +0000
commit	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree	6a5171dd615dfeee62a45044144c66e864738fb0 /sys-devel
parent	ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)