gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /sys-devel
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
70 files changed, 746 insertions, 3404 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index b17ab73de199..6e24e2d31d8f 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 4a20dc40f053..20abe3c9c7a3 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -41,16 +41,16 @@ DIST ld64-85.2.1.tar.gz 598524 BLAKE2B 92cb3c763cc067e2ee6c4fec910f078cc69daca2a
 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-3.2.6.ebuild 7058 BLAKE2B 59f2bab0976b4fd0965bbc62759fdac8aef15a323b72ccd59cec3d1e8ff6011a1f844e6ad03155a3a2b81f14dc9a8375087818255df4b415e847110a7aab4ec7 SHA512 b15cd358c5af87abcf993c57e3dc7662d519e27da5254abaf9d70d5a4072ef9f636eb390f9ba7213ca6ef8c4c2acd87bc74310a4ec7d8a78d6dfbc245596ba69
-EBUILD binutils-apple-3.2.ebuild 5973 BLAKE2B 15d365c5ca7c8fd214c42ab2439882dce3b6f4a1fb1434a15aaee9f0e063444d0a437ced4a86046971318bfd65aae27157921c2250ea619c324fc56b1df74982 SHA512 34e780324652137a5cb1104fc98b2391d32cbba830481bd8c6e877ed713cc195f01c26482acdc2386c66042292672165621900e9569e30942872f818c145f1d1
-EBUILD binutils-apple-4.3-r2.ebuild 10304 BLAKE2B 851d53617c780d5c472c693fbc8651cf7d976d071a1a47cce0ce867898d9cd38be3e221426717eb12da1f77fa41926c5fab7a09112f3b350c54313255879a510 SHA512 4efbb4a108d1e8bd67360cff47bc0a5aa36af7fb84ff42bafd0ffbb1e97337939454b05e46345ca25ca2d0243fad825e07a0a6d8356bdc7a193f101cc1b52335
-EBUILD binutils-apple-5.1-r1.ebuild 12200 BLAKE2B 18430125ede7c5b78ff0d371f2738159904c60a94ebe2b0ea60cff711af0c256526eb947b950fd8ec63753e8d417d6a8011b23995cd7d277603cdf688dc41786 SHA512 22277d1c8b67ac500cea2afed290cb61f9ce5d42a1b16eeaad33c5bd6014ea75d85870bf179968db619998ccb73b2374f4ce9fb6c721edf3f035c6239ee2667a
-EBUILD binutils-apple-6.1-r1.ebuild 12274 BLAKE2B b87b0d76d2f8e63b594abaa70a0814e27dac81be77adb39d33d50b98820111fd87aeddf74e271889e608c733ab0b1dd192883d84bf613ca141717c2877591d35 SHA512 137ecc2c62f9c75a7efa5679b77e0c1b53f7754fd7b62b4e889f40079212fb3e3ad716fc6b1afd399920592fc05784f446612ad3f5bed6396d37ac2ecf67a3b4
-EBUILD binutils-apple-6.3-r2.ebuild 12289 BLAKE2B 18fbe6f0ded25c575b87a86f25cce781d3d292658b86709b7935f8bb576038b49f48121ec9ac52bcdc8bb927d052803d5dbff3c82e5e5b5631d189b650f9327b SHA512 ef1167ace0ea242bd6eb560fa644c775766a84148e76c4b52097ea20831094f6ef675bbcdb9e0e39bfbaf60a780687b4a1d71173b32a1b33568007c6b6893f4f
-EBUILD binutils-apple-7.0-r1.ebuild 11965 BLAKE2B 9243f909c7ea61ade67bac29a8e3f9f901f1388755736ad3ed45ff081af22c80bf307ff7211ebfcca0e72b3632361481c738ac07838ff32ee9c0a5eba3c48267 SHA512 6920c285fbe036588e07ad85c99574f64a23782a616735ac3ec7b4adda1bb656efb728b6b7ef1bf6ddad8f65f6e147673eb734f59335de3996566b6eecead55f
-EBUILD binutils-apple-7.1-r1.ebuild 11965 BLAKE2B 52140489c1029bce2b654d33671f696cd4e1c48830ea12d538297a99bc665ea0c97bd6f7d1061b377df5ea94bd66e44eeea0a397c054151c9ead74ea8979377c SHA512 d147d5a9c7d348437c405b742cd8491e9fd61032d9411fdfcd62ebdb1782eadcd0ff88dd18457e0951fba54a203322f0b7a0d0ee10bf084743ba6d2ad4720e6c
-EBUILD binutils-apple-7.2-r1.ebuild 12037 BLAKE2B 7819e038c237db5a2bab467e7d145f534536d415857601a3b72dfac614f7e3000a3b68e4d193d59c6d991b065126646437355ed669ab026010eb59ade562e9dc SHA512 c86bbc0f738232c3377eda1e76b4f386cddc2e503ae5acb4b1830270e51583f6674168c22cb11bbb67b5a71ded5b407572fed00edbf10de6b61e317e64e60ac4
-EBUILD binutils-apple-7.3.1.ebuild 13249 BLAKE2B ce5fd452793b603e5a387f52ee9e6fd6e38448c06e3a85ad5dc3c3fada9e4c04434b74b82efb9454e6df6e41b6252742b351000629e315ddc78f143ec78c12ab SHA512 2bcdb3baba49a59f4f5e230d57f50999ae9cb216390307df5d08f0acf21979820b22ea2a7afac2752644084c4380a59664ce4e38bf52a8cf0bd4103c5a5fa35b
-EBUILD binutils-apple-8.1.ebuild 10434 BLAKE2B d94604496029909ecabb7d34684a1a8d34822303dcf59255659c82357fef05e45a761c4b4755888b4418f0b8b33ebb66348b9ffeca2d7f1190f16284a949f3ed SHA512 0ffc730c89e13fd2ddb1179357d18d637bb2ad11a72a7906eaa5c377429af3e213dc0e658a58da6821876c8a6a76cae5e4b3f28a3dfe34927d1d4aa5af3777b5
-EBUILD binutils-apple-8.2.1-r1.ebuild 11461 BLAKE2B 835e688c5fdcbdb62b6ae2aa5bf4772dd27b8388b9acedd65e9af531bf1b03f620e2271833512bafb1e6422aa3c5b6348f4aa258c9b56a43f6deaf3873d42c1e SHA512 b4ffe2df4fe11997a805bc2a564770f5ff3e6e41289ee4f0c5855829ce71b1045e8c0711be9b185a6ee2125e6df4a30c14fe6d7a9acf893ddbd4c8f5f5f544be
+EBUILD binutils-apple-3.2.6.ebuild 7045 BLAKE2B 0d4ecf82f94d4f5535f9e284e14fabab71aa7b22cf143af6b34e848b8f86003775a8621b7643d3696a8128d20a2761100dcd86c8f4f3d3d879acc722f9a10500 SHA512 bdfd09e4171ca227cc9f2e012be79df9ed358306662c35b1d043e557d9dc4b3de47779350b3e7e37335c346312238db47189c74947a56515a85c27d521568d2a
+EBUILD binutils-apple-3.2.ebuild 5960 BLAKE2B b095de2357934565412385d2dfb2dde82ae5676b492a9547793288b8b3333a6be4c53d7f9755c8923af84cb259186511b18b9d1cb88407e42f4929713e798f58 SHA512 d6e36569763260d8f6a14ed0ecf7fd6a82830698124ce916bb2f4116802c9aaaf30d8eb99bf1be70eaaf61d73ffa82a21f6a4c3e3fd5d4e8ee0a1415da2c7f27
+EBUILD binutils-apple-4.3-r2.ebuild 10288 BLAKE2B 0adae8b255451d11ea984c2b2a8b3707a90d434078ba5e57ad4429a21ee0ae83a87e195a896d32a3fa7a3cce2a6841069b80b60845b1321873d918e6dad09111 SHA512 4bc67e66ac627e062b5255943d32c31637ce232aa0677eda688d20d9b547834a2f278dbbf87337c896d6d8ee39fb5ff343feaf8dc0bfdedbda228f8ee7b0a52b
+EBUILD binutils-apple-5.1-r1.ebuild 12184 BLAKE2B 8c8b278f746191b77f7c9bbe19c53a714c63978731a68d0fb1dfbadfc0aaa279c6fdd39230e35748589f65285b147ada0922bbcd4cb71919330aab6162111b8c SHA512 6d3525f8ce9a4902cbf8b62bfe8b63af0296153769aafd5689edbf2f8879497edc67ab25f9fae1f9546c04375f08030a4fb7b8b010e74b1236ae2525e19364ac
+EBUILD binutils-apple-6.1-r1.ebuild 12258 BLAKE2B d86b5096990fa8b56ee1e9b09423a706b8ed8ecf86e634faa23f0bdad0c11322a542ca5c5e02aecbc425c974f64b44c361a623eb928570954b1328e0fddb5e51 SHA512 12068923ee646491f6ff5bc9ab2a5cd02e102d76e484a12b7cd253e267949c07328fa2b72b071d2f71b2a34a3bba9455b15de92652a3c906746da4a62a68e0e6
+EBUILD binutils-apple-6.3-r2.ebuild 12276 BLAKE2B 922d465186288a988a9244aaaf991db881660fd2c9b44ee7853486e80f102740ec12823dce2e313dfd56fc8bdfc1cbff9193f1d478851c4c6b9a0fed276d233b SHA512 6bf46d3c9b4f60a8e7cc3518e6f0e6925d2008838c4d455f6f723aca28bfc80ec8c15c38c5a512c50b439179b94d3873e48b9ae006a7e8514f93dd6df3bd4ede
+EBUILD binutils-apple-7.0-r1.ebuild 11952 BLAKE2B 8bce6a51fac7c3d568f6c30e0f6454888234555e8c7404bb7b262606d7c51229421c83797eded2f262c2345dbf54e386d91d1e4586a79ecb436f2aa2865b2e04 SHA512 be677927f6b2e4280936ffec90f93dcec76cca9fb2e88011db2c0b764d322f19a5036c898acf2c6e91a1168b25e62252b56c01d77775826bf15e8a0bf542e2d2
+EBUILD binutils-apple-7.1-r1.ebuild 11952 BLAKE2B 2a626c2e6081954cc0aafc8beb224a498ad328dca4919cdeb59800d491a76fc810fdf0c0214eb46e7b8eb21ea1b8a5789202505f84365f04a3228e04d399fea3 SHA512 21bcab913bc16e970bb380c82cc15dbc742473a68ecf83bba22320ef79dc1d684244e680de0b1cf33fe857c4d6e356de9604df702cb1eec2b261ae9c17293f7d
+EBUILD binutils-apple-7.2-r1.ebuild 12024 BLAKE2B 9a8888e7f6df8f28b6e580cd7849a7222b1e6841bdfedec6fa6d23b721546671abc83059c3483f1a5c2588182546f0d1af9faee70805d1258b2952059943814b SHA512 4a044388002635aedd7e9d987549f2a8ded996db877295e28033594dd3eabb42f90b5c74042c19943181180b9e3504b39ffaa111b14d4fee80b5f13f3544d857
+EBUILD binutils-apple-7.3.1.ebuild 13236 BLAKE2B 0659a9739a542fbc9df783e17579056d0910eaf8f09fcc6d9de905f8b5ff832d45b3cb5bd1247392724376206d93e8190a295217424c0bb972fcdc5c4197cb9c SHA512 2b07f398f52fe85ef107efa4dab9f78feba5e6686e27b7a96d268be641641cf26dbc1540facad4de007f15f85a50de3bdb5075d60979312e064668db51db95d2
+EBUILD binutils-apple-8.1.ebuild 10421 BLAKE2B ae5ac54f54734bdbb75e7ddc8b85fea7801cb0eacd074c6df53dab1adeb4dcb1dbeaf3a69f8d332fb9a4df1c9c40345299a5e9e4c95c31b18744cfd2b2269181 SHA512 c56d11eb5730ba5f3053bddf7d31264e3623c8bdc647adcf490e30a2e668d57654728f78b21d1bea16380d53462759ca57898195f36a676d0632b89d43004340
+EBUILD binutils-apple-8.2.1-r1.ebuild 11448 BLAKE2B 5704b902429780dd645a81b2cfa4454b279132f0de99850bad30424464a861d29c8d00cbd6daf86b933ee5cba4fa79a835431575d3e439312d597bd8dcdf6c10 SHA512 90ae060f543df5f5954179ea7a5a112392b9a38ed2b439d41b00ba6d2867ea0e207b58333e6eba8bed019ef8c8547725046f5df5516cb19764235edbeb6b5bd6
 MISC metadata.xml 684 BLAKE2B 5cd10b7a5817bb4fe8b94ffbfa422e43c0f50c2d7d6db881ab82b4741f24548560fb07c6f4b1bf8164ee80ec7052147f7f5158640e4c9fa94b950871148491f2 SHA512 e588cb802b2b22ee656b9dcf45d9d372a3b306fa3574a7d859e2df9032eeeab63219a9d9b69249a5a67733dff4c484da17621f00d2b0775935f2cfa5a6f91977
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
index 972e7b728562..6636b170fc58 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild
@@ -13,7 +13,7 @@ LIBUNWIND=libunwind-30
 DYLD=dyld-132.13
 
 DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2.6"
-HOMEPAGE="http://www.opensource.apple.com/darwinsource/"
+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
 	http://www.opensource.apple.com/tarballs/libunwind/${LIBUNWIND}.tar.gz
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
index 6e37ac06e4cf..e60586c9425b 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
index 021608d46827..b22d2eadae76 100644
--- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
index 4920826c0166..8054c9ae0d53 100644
--- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
index bd3202442311..8d7aa6d2cf36 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild
index 763bdb041109..c84b2b5c8f2d 100644
--- a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
index 1d46085dfbc5..6082903fa5af 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
index 9bf30b1f105c..98eccefbd990 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
index 7bf3b8b52ade..ac2ac3a6ec47 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
index 78efc1276def..b903419b7ccf 100644
--- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
index 69ff01d148f8..0658f9816910 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
index c664dedee156..7df83c36da89 100644
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ 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/darwinsource/"
+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
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 11b2ac676e18..c44230242343 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,12 +1,10 @@
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.0.1.src.tar.xz 12488668 BLAKE2B b80247b5caf81661dfa715d9bf454b8023221bd27ce49b6bd8cd66f40ffe01448e40fb828fbcc64e49f059af7a7c5a95a0737b0b998454ac5c1dd39388150fa6 SHA512 df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194
-DIST cfe-8.0.0rc2.src.tar.xz 12861448 BLAKE2B b4f671b6597b46cb84b241bf602d7e1b12c896b9d3d5857c61a731c9ea0d94dc850c79cbbcb4a56cf2b54f2ffbc81e04f2062c59d4c5b800841e60eccd0dcfe9 SHA512 2bf1e39f5fc7842039b8e20913b3c71fea46b541825c703ce329f3fa01e45cf66c2cd39d9a0f92cf2c38eeb856e42023b087da0765baa0377226534a554c0d9a
-DIST cfe-8.0.0rc3.src.tar.xz 12863708 BLAKE2B 1a05ee86b305de0d1e2cda1f89f22405e3c7826214e83b2275d14682374c31d72fd984a2b5d8da7fc906fb95003aee6a00e6e1700f7938f3042df2229fee9c50 SHA512 afc9d7bce817a9d8faf12efb273934539b18471fb4ece8fed56249628b17a302427c4e7ecbfa096287547e01f3823b9b7a1be4bf18417cc1c942776057b90db1
+DIST cfe-8.0.0rc5.src.tar.xz 12864516 BLAKE2B b1c982d83e0a911a7375d07f9f2f52956b3595674252e6e7d8d8ef4015b51171c59a2d3306c00fcd83ae2fff2eb3d58cc9d4cdeadaca02c4fc3a6242f57959fe SHA512 40f3b6069e40fc4f831662912a8f4c3ab1579587bf48c1fcd9e80287b7e26e8b70becfce525a0b55b1b8283f20a9d67d232cf5ce10189a39d655e2fe3fb3dd73
 EBUILD clang-common-6.0.1.ebuild 777 BLAKE2B 3f19ef0457ce59dffd312ee898a72b4b5e6d21a2f9403d159c2f92c76dd16f212beec6a906fc8652487a7bd7f0b773b86620ceb03ceeaa1974e9fd8bd021a830 SHA512 e469a91c0619ae0aca5f0c25bb14cb22fb5b773c452dbb212a32a499ff5101878455b28b2948fe118713ee5d9d15b24d470fde9a57ce38bbe46f26c0ed2c33da
 EBUILD clang-common-7.0.1.ebuild 782 BLAKE2B 8afe6fcd75128ff16981bceccf9558b9e4a98135ecc2298bfceb0cb5c42aeb2e283f55077b6f13cb68d5986c7b77b0d48887c5bc2bfc4109b483be14378f4ce8 SHA512 ecf255096b76c75ab26de6b86db0633ab09a253fc9e4cf9bbe7adb8e5cf5eeab75309b5548ae6622761eb59743720058975ea48e62f553e097eae6f32bc8bc29
 EBUILD clang-common-7.0.9999.ebuild 666 BLAKE2B f6c1fe58d00db323baffd3c426bb31d1835cf44b5554fbb8d7cbfd3a0ddfcfe968e0007465fdd13297c7aad3bf94b219c6d156e12fcfc95ea72e44a6f273dd40 SHA512 3ad6ab3333f0cbb4aea199b9409668f1ae5d3a1ba8e31f0a68e1dc1d2b4489cef0a54cf144c56ccb256feabe4bada8e764331ddf91c682eb4752527ce8bd54ad
-EBUILD clang-common-8.0.0_rc2.ebuild 785 BLAKE2B 3f041a9e2685e76261ee3354ba4d466ea85c15928bb7d4f509578014a250cc8cfcf39ce9e6b388707fb66d4d9634c71d527e842d47246f90a35602eef6a660d1 SHA512 1bfb10e4b0dda4f97c00f2dcaba686ee460d876fda0fa4bed195bb0ad50ca2be9369c36030508c8cae1330ea801b79d7337bcf28a2efa76ce5dea1c21129d969
-EBUILD clang-common-8.0.0_rc3.ebuild 785 BLAKE2B 3f041a9e2685e76261ee3354ba4d466ea85c15928bb7d4f509578014a250cc8cfcf39ce9e6b388707fb66d4d9634c71d527e842d47246f90a35602eef6a660d1 SHA512 1bfb10e4b0dda4f97c00f2dcaba686ee460d876fda0fa4bed195bb0ad50ca2be9369c36030508c8cae1330ea801b79d7337bcf28a2efa76ce5dea1c21129d969
+EBUILD clang-common-8.0.0_rc5.ebuild 785 BLAKE2B 3f041a9e2685e76261ee3354ba4d466ea85c15928bb7d4f509578014a250cc8cfcf39ce9e6b388707fb66d4d9634c71d527e842d47246f90a35602eef6a660d1 SHA512 1bfb10e4b0dda4f97c00f2dcaba686ee460d876fda0fa4bed195bb0ad50ca2be9369c36030508c8cae1330ea801b79d7337bcf28a2efa76ce5dea1c21129d969
 EBUILD clang-common-8.0.9999.ebuild 663 BLAKE2B 07c756fdc01c6a437104bd9c60d18e1aaed3605a2b2055d125077d001c61070b92aa663ffdf9e06ee0d7c2c02eafbaf584fe9733edce6dc19c6f0d434f9ca6bb SHA512 364a317e9cad676067a4b13990a4ba6a63270b10fb98a60c1bdbdb6ec94ba96db782b722d506e8735a9db9a8247a02632e11a70ad3b017af2ca515c1c08380cf
 EBUILD clang-common-9999.ebuild 641 BLAKE2B 81f3432382ffcf77a61d9142a0ae83df84499da1ba31cbd542d2080bde11d92676efd0a9a19f1392f55a300fd9aaf7b0268a8dec7f017cd229eec4dde1b7091a SHA512 0e8661594be1482cda90f240792ae7a9e77c0ba167d874735f89994a24ebf232a5cb10858fc9099c9f639174f2fbf79b7eb16e05ca54d17c636002c72f68d7d5
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-8.0.0_rc3.ebuild b/sys-devel/clang-common/clang-common-8.0.0_rc3.ebuild
deleted file mode 100644
index cdd11c2dce8c..000000000000
--- a/sys-devel/clang-common/clang-common-8.0.0_rc3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-MY_P=cfe-${PV/_/}.src
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-PDEPEND="sys-devel/clang:*"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/bash-autocomplete.sh" || die
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	newbashcomp utils/bash-autocomplete.sh clang
-}
diff --git a/sys-devel/clang-common/clang-common-8.0.0_rc2.ebuild b/sys-devel/clang-common/clang-common-8.0.0_rc5.ebuild
index cdd11c2dce8c..cdd11c2dce8c 100644
--- a/sys-devel/clang-common/clang-common-8.0.0_rc2.ebuild
+++ b/sys-devel/clang-common/clang-common-8.0.0_rc5.ebuild
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 9640d124e6bc..3b1723e09ac5 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,12 +1,10 @@
-EBUILD clang-runtime-3.9.1.ebuild 569 BLAKE2B 58fa2d4ee5d80c7540e8030015fe085ad6969f57103face3c2f38088495e017813946ff451d39b0fcbb2dea13a95afd742efc96ce97cf09bb0d5240280c84db4 SHA512 b78a53021a94b191c3c48a0db9b8e0a395714dfb204569180eedc4cb390d948ad78d9f87d6974cc6ff036fc05ed10aa30cadfc521d18205cdf6d556814d92a29
 EBUILD clang-runtime-4.0.1-r1.ebuild 757 BLAKE2B 027d495eb3a9203db1ca76f1f6c99d6ab103bbeb76407bf52ed1eb2793988ba037c1ae9985bca3c48360c38ea3a7a2b19826071464a36a86fc110e30aa195cb3 SHA512 62f6fbe3e9f927efee18cd382a088adb0c7281c2af869e595fa3bd48b3bcae907eb1660c39748831c2309fe2aa6f790a3f5030a438477e09ad5b153722b5477a
 EBUILD clang-runtime-4.0.1.ebuild 639 BLAKE2B 62665ccfdb77a3635995b6ec9a59589e3d5e5b39c3940b378acc314fc9fcb4af23f7d44fba89f61eceb4055622b9d7c35ae26724b3cc207c06ac60bd2eda5a75 SHA512 b42d5fbf0082e194f4fc4ddf987a2d1dd0f06fc673b590ec278b45cacb8854c207b26cd159fe4cccdd1a123884037fff7c9e5908d0f329b93ff4ef0238e550da
 EBUILD clang-runtime-5.0.2.ebuild 820 BLAKE2B 52c56a71db4514803c8ecc070e21a479bad960fdaa40e3fbd6de2229f6f71c0f5fbbfc2dfc5fee8bcb8570c5e71c73be921cd3fcaabe442551d10ccf9a4736e7 SHA512 bcde7bededdae2f422da56eb68ed862fcafb618b8ce6cd1932a5472e325f0c0231429c7914806915b2f4b579655d0f46d82e19f5f83420d204f53a81a9596e47
 EBUILD clang-runtime-6.0.1.ebuild 819 BLAKE2B ce5fe6e1f47830366c00f80149adfb9f0ac25742fe57dd1cb1f35c30186a919b89cdb679b342ff1db3ed676bc48c58f28c85b5c74e1adaaab18875293b8be1c1 SHA512 25d88ca2c1d51c0140fbb7572fc45786a61902ff27534ad8e2bd8d12155a69229cadeee3c4827533207a265aa290e829de2141f96bc7d2181c59731ce0fbacfc
 EBUILD clang-runtime-7.0.1.ebuild 824 BLAKE2B ea493dd4bc3f7f0d043d6dfffcbcd33f1de6544ca39eacd9f9de57416fed31e6efb4826387b621b14629aef90cc8c73d9d6120e90f5f8f65086de4a7e43eb58c SHA512 875abc4cfc5a4d63016699c7b95b398e8ad1a4bcae6aa90ef198918e9e7d419bfc604ec8e7efc9387f1be36954fd2cd9530487f96b9387e86af8cada2c26ac2a
 EBUILD clang-runtime-7.0.9999.ebuild 780 BLAKE2B c911019fb106da9d2c2010921b3e410a83249dc8b1d776a0b98b8cf8024a259d0fb0daaa12558ac994155be97ac831987b18672975cae40b9544828e0369fad2 SHA512 87183412251e82acd10c3a33921ee0e87f24ec9d37feadeb128094684523fb6512efe6216993b0cef4ed19a00138fee372359eedde58752b48cf85c0f10b9888
-EBUILD clang-runtime-8.0.0_rc2.ebuild 824 BLAKE2B cb29c1792ab83a7ff72636ff43c4363be47aa1034cd37af4b1a458c2f907cd34ab95f56dd4f5c5f5d0ac2a810a18f5baa0f0fc69a974c34dc218c26fae78cfee SHA512 f6047b9351eccfcdf85daafa93717d27c42f87f671b029bafb4f9b111c56338f1b2b8436f2aaafe923c575e436adc1af742ac6295781df53d2e9d498544a705a
-EBUILD clang-runtime-8.0.0_rc3.ebuild 824 BLAKE2B cb29c1792ab83a7ff72636ff43c4363be47aa1034cd37af4b1a458c2f907cd34ab95f56dd4f5c5f5d0ac2a810a18f5baa0f0fc69a974c34dc218c26fae78cfee SHA512 f6047b9351eccfcdf85daafa93717d27c42f87f671b029bafb4f9b111c56338f1b2b8436f2aaafe923c575e436adc1af742ac6295781df53d2e9d498544a705a
+EBUILD clang-runtime-8.0.0_rc5.ebuild 824 BLAKE2B cb29c1792ab83a7ff72636ff43c4363be47aa1034cd37af4b1a458c2f907cd34ab95f56dd4f5c5f5d0ac2a810a18f5baa0f0fc69a974c34dc218c26fae78cfee SHA512 f6047b9351eccfcdf85daafa93717d27c42f87f671b029bafb4f9b111c56338f1b2b8436f2aaafe923c575e436adc1af742ac6295781df53d2e9d498544a705a
 EBUILD clang-runtime-8.0.9999.ebuild 777 BLAKE2B d63ec3b09f8c2c7d2ff3e3801c3ddefcc59f0086832b96eb014d2a928ffea163c61527e149986bb5f81cb55b466a44bcdee00aead81e1a1dc95ed83133618f13 SHA512 c51f0a4cf46ecb01481e6c4613e399ef3801e7e38963b6b4a94f652a305ebfc45f7afd849f170a4da2333c8372cb27ae129fa054a57f5734ee3cf966c52aeca5
 EBUILD clang-runtime-9999.ebuild 777 BLAKE2B b8dd34360665cae1564b7b6f18d06e5bb7c40d4da1a1315104fa8b530229301ee1a1643c8481657782cae55c6f7921de33cadbc8e46b206d66db438c244b7025 SHA512 0598b3a3381374f377637bacfae6dd8fe8efaba5901692c8a1efb4fe7c2faada61c821602bbfd0f1ba5553642383507acd4ae10207e98fb7bf01cfd78c1f99eb
 MISC metadata.xml 708 BLAKE2B 56cc586deba4a72cc9ebf5d0ac6b9dbb3767b736a96f1c0e4f8d9a715076645be25e42f1c610f55ba69e500bc828d629e7f2253e7c9ed6fd4b01032722bec3c8 SHA512 764eefdff5358c66cad9e8fe18fc7b938c7656268208639cbb92a4b5ae76f7de0dee86a729cc1e6745ddbf7308180885ef99047502e0e040020e738e3d0d1425
diff --git a/sys-devel/clang-runtime/clang-runtime-3.9.1.ebuild b/sys-devel/clang-runtime/clang-runtime-3.9.1.ebuild
deleted file mode 100644
index 9d158ddc2ccf..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-3.9.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="libcxx openmp"
-
-# compiler-rt is installed unconditionally
-RDEPEND="
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang-runtime/clang-runtime-8.0.0_rc3.ebuild b/sys-devel/clang-runtime/clang-runtime-8.0.0_rc3.ebuild
deleted file mode 100644
index 97c0d55cf2a5..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-8.0.0_rc3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+compiler-rt crt libcxx openmp +sanitize"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	crt? (
-		|| (
-			sys-libs/netbsd-csu[${MULTILIB_USEDEP}]
-			sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang-runtime/clang-runtime-8.0.0_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-8.0.0_rc5.ebuild
index 97c0d55cf2a5..97c0d55cf2a5 100644
--- a/sys-devel/clang-runtime/clang-runtime-8.0.0_rc2.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-8.0.0_rc5.ebuild
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 74ada38c7c12..aa5e23012cd8 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -12,14 +12,12 @@ DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.0.1.src.tar.xz 12488668 BLAKE2B b80247b5caf81661dfa715d9bf454b8023221bd27ce49b6bd8cd66f40ffe01448e40fb828fbcc64e49f059af7a7c5a95a0737b0b998454ac5c1dd39388150fa6 SHA512 df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194
-DIST cfe-8.0.0rc2.src.tar.xz 12861448 BLAKE2B b4f671b6597b46cb84b241bf602d7e1b12c896b9d3d5857c61a731c9ea0d94dc850c79cbbcb4a56cf2b54f2ffbc81e04f2062c59d4c5b800841e60eccd0dcfe9 SHA512 2bf1e39f5fc7842039b8e20913b3c71fea46b541825c703ce329f3fa01e45cf66c2cd39d9a0f92cf2c38eeb856e42023b087da0765baa0377226534a554c0d9a
-DIST cfe-8.0.0rc3.src.tar.xz 12863708 BLAKE2B 1a05ee86b305de0d1e2cda1f89f22405e3c7826214e83b2275d14682374c31d72fd984a2b5d8da7fc906fb95003aee6a00e6e1700f7938f3042df2229fee9c50 SHA512 afc9d7bce817a9d8faf12efb273934539b18471fb4ece8fed56249628b17a302427c4e7ecbfa096287547e01f3823b9b7a1be4bf18417cc1c942776057b90db1
+DIST cfe-8.0.0rc5.src.tar.xz 12864516 BLAKE2B b1c982d83e0a911a7375d07f9f2f52956b3595674252e6e7d8d8ef4015b51171c59a2d3306c00fcd83ae2fff2eb3d58cc9d4cdeadaca02c4fc3a6242f57959fe SHA512 40f3b6069e40fc4f831662912a8f4c3ab1579587bf48c1fcd9e80287b7e26e8b70becfce525a0b55b1b8283f20a9d67d232cf5ce10189a39d655e2fe3fb3dd73
 DIST clang-tools-extra-4.0.1.src.tar.xz 581788 BLAKE2B 52ca89eda6fe1e0fbbdc46e17f4067f03a9a9440dcdcc98811651087d0c9ab24dfe3eefb0b80a32ec41abe0766cb3e47031de61c4cff02b7d0e08c8fd03e3faa SHA512 ea26d926f428e62e76cf8a073e63ffe05645f6592e05d7717d5c257908870ae9217727d3e1578227b14eda5937085872463f1a8e99970256179c68b8a92e69e0
 DIST clang-tools-extra-5.0.2.src.tar.xz 646272 BLAKE2B 8a15a0c3ed9e8c31706d744017aa8be52616037790075c2314c3a613c9e1aa86b0b980c4e3bd9a775b234440f17436392196b41f1691ab25a33b432a25affb68 SHA512 241d85652e7c3ad5d77754ad9a694bddab3c14098067da4119223007c5a4a765d1cd7e7c7dba91666ccd5506f8703c82c9ee487f28249a00c2c4edbd0d1f2640
 DIST clang-tools-extra-6.0.1.src.tar.xz 757256 BLAKE2B 1d91d7459a34e7251007af91db1803ee6d04f1ef3e0fcf134a7e0d1d3456b094a80339ee60db3f0bdd12961f3a05caee7edfc5c6b9c48d49cd55a5dc3c102c3a SHA512 cf29d117b6dabcb7a8e5f6dab5016ce5a5c8f475679001a43fd5c935f2c368f37cdef50aae2080a1e4524f647f6d83458d4a5dec5b45d03fb374f463caf7c3f5
 DIST clang-tools-extra-7.0.1.src.tar.xz 901368 BLAKE2B 9d99f825e35bc2ef3c56c5c498778d2dcbc578e84920b44345b5734f5799ee7cffdbc77e2ee29b4a8fc03e0d451e31fff1abce042c71cee9984e00083d4dcdd3 SHA512 f0aa73217560f952261201e9049310e4a038bc5d4b4120a4c5d13a42aacfbbfe702f1891745755e1702269751d3df19237271caecba43c810a6f50d35494c798
-DIST clang-tools-extra-8.0.0rc2.src.tar.xz 1061132 BLAKE2B 4cc8190c209e0d9cdac6bb292d45edb019bc4e20877cf8fe2277db9154d13eeb0d62fcc73c35c51291f4cdc538355830b2c0a9961a91fdd9021d3aa148b6cdf5 SHA512 0ce06a1132321a269fe781945989e1e154d2c4f6d7d86d1e648d805567d22c3ef1df3d4ac1197c552aaf37bcc09899ef2d6189fc82531dd5547d712a33c919ba
-DIST clang-tools-extra-8.0.0rc3.src.tar.xz 1996500 BLAKE2B 9f81c97f72dd47dd1da5bf2ff2076a5248869927bc60a7421d910118fc48a498cea6c0d9e25f2bca6b8c4e51c15613f8ba02b0e025d9c562bbb9fd294214ff95 SHA512 d349ab481ec4b449967bfa9a8da40c76cb2642a20b5ba9cc55df63e156b77e68b0a95b3c9907f14ac1a1347d2d1f38a68f6de28fbe130ffb2e7d3826f865456c
+DIST clang-tools-extra-8.0.0rc5.src.tar.xz 1996164 BLAKE2B d20bd1c3dedb5559496ffacc11adaca39551f9ea055dde68274c6612a9d0446faa5a880e9e857b864143922d15acdfc8f0d957d19b496b16d42e9c743eeca551 SHA512 98f0f66b970295fda5706a0e4c1f517805b42e55ed10d1f7bcfba84d77a21f7aaa177e678e2bf8145409dd3eebf8a1d8f89defe2abec24ec3b2e6bed07b6d4e0
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492ccdc9fd2c26cc7dfbd8fb2b9e68418ca8fdf42cdc303c361e649cc6939bf5229cbad017bdccbd5d791e92752328252f SHA512 568615bce5a75d42e4b6d592557472d366d49a99f8e81be10ae679804f1fe674c7fd0bbdac09af44fc67ee5aa34c4ed2153c2767c536ac8e45dd15c811c92dcb
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
@@ -27,21 +25,14 @@ DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df545
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.1-manpages.tar.bz2 121157 BLAKE2B d209e292dde0b528bca6e6438eac83d3a762e83fb333fa075f973806ec802a19e24ec6f0212fffe4757257f2840a5f00960d121024db2d8ab8b99d95bb42b1da SHA512 56dce233d17c4c3c1e4860f31d30e227364c99f04527e8e8372f308e30d09a297ca21a37b4eb2eddab69bee88ef5867446affd1ccd5d7cb1c12d9c9002a1101c
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
-DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
-DIST llvm-8.0.0rc3.src.tar.xz 30507604 BLAKE2B c9baaca537d292af9f12368df86090750508113eb7db393fe44c1ba7579df947f0a7092e6ddd4403bda9f9ed75fe8c049f3baf6d8671faa0c91e3267c584893a SHA512 82199841c2084cffe4e86b4f2d5ebe404059196f1f6d000ee69cfddba05d78c4500ad7499615fa67e9774ead6cba5a23db484dd85f752c8d08e8067f7d7b98ca
+DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
-EBUILD clang-3.4.2-r100.ebuild 972 BLAKE2B b11888e71750e7de7363d0e74a43999b31baf54dd43438c98d037b5b49d4043a74fdda70dd2b0eb405451c2579ee0285404b28792cc525c1c26e81a07bfd2dc9 SHA512 b42ec4379b4a70eb638ae6a6d45a287cd83f5ac339ac25ade2c6c77bd8d05c208d389d6f09e4cfe567e67d3e616adfbaffa1b1a9a7f35f5ecb7a0e7ccdc720fc
-EBUILD clang-3.5.2-r100.ebuild 972 BLAKE2B 0f17918969ee1034e1febc34afe95a29dddcf6056caa53920ade66a887b57939933f31b022fb68fb29bf8a5e387f659f6e3b618594cda4cd50f913ec14d0f0de SHA512 1e9a9f67ecd1cea111599376e676c665c6c1e731514a06065751502d221f8c6d7033dc23376f21850a63d036a33fbf241845a9127beca6ee8549348866cdce3e
-EBUILD clang-3.6.2-r100.ebuild 972 BLAKE2B 865d1b2ca82dc3e4965f676adee77bcebb285fd3071caa37a399795426f541cbfb4a380e615673a2a1ca6c2832becd21e6252b678f2c1047a0605fdb5db2845c SHA512 604f7551a0081e7de09875f54a64502e8d2e97341bd44e4d2ae35ecd2392b22b7aea5fdf4923cf196cde1de5711f05868943d3f802d975118426ee43d0877f6f
-EBUILD clang-3.7.1-r100.ebuild 972 BLAKE2B 10a79e07cdf78a7204011d44605c00eb8677a24317370f9f995fc9f58b6d27643cfcf1905c9de5707d0b27ac9493fef387570387d825cd1442c84cbb333857a9 SHA512 676dcd0c40316909dace046635877c6bb7255845111da2a675e76dd5d0259b91c7dbeb48ddaca78a834aa15e24b4d66299093cbd8da22fc4a5d7da81edb37888
-EBUILD clang-3.9.1-r100.ebuild 1471 BLAKE2B a3f8f43d3f07cc8598a4bdd8e0c59d1da6528a64bf3c7d3b5f54ac972ff8ec49d83bed04a6646d1f87b525db1dcb597184fd7fc0bc6bc1c5ad85052990ea7f40 SHA512 6868f0fff8faf5a10e9573e76a26000078a94dabe442398d454b3e06a4e1e678670fa57ce10c60ec607601ef72a2f328ef6483a369ecd23b1f6cc59b2755e5b6
 EBUILD clang-4.0.1.ebuild 9614 BLAKE2B ef0c63cfe38db99be4b9236d04eba4107092869e6c4dcc64e5a4cddf2d7931652607fce6292a8158ea9ff545ffb0296bca3670fd386e132c05239384190bbde9 SHA512 77045fdf3606b88c4f7f3021399c34b61876e80be7fa84ccb3a464e8caa19fcdbc896eb4f2d08d4f9f39dd7bdb03b9557135a710a00b92714ac2b29d6ba8e2d5
 EBUILD clang-5.0.2.ebuild 10452 BLAKE2B 2f0af78f8cdaf88e643bccc474ff186db268307373cfe5130c09c2f07753c5eaa92220ab4f117ae1396ae5ff7cb13fb42765bcc44f7e0aa3decd1c7ce1c93dd2 SHA512 3dc65b62475430748da620f6dcd83943b5de88a28d666b321f107439a8cec88694285c6cf2cd90e0cca78b8f75d3c7af98ca70099500dfd1a59685aadb4fc630
 EBUILD clang-6.0.1.ebuild 10272 BLAKE2B 7f179071a60dad773c4fedd95aae8c7529e84f891f6001808576bf6523baebe92eee713522c03accdcbeff76afc0c0a1329e159eef2cd307a2ff4ba6b598edc1 SHA512 508dc2b7c6758f63e931f83ec851ccf6e07433719e4e8dcb1f366c736bd22cb4fc19723dc2f05f7ff90f1828fc41a71d808d4f7f8332625134294516dc52ce79
 EBUILD clang-7.0.1.ebuild 10292 BLAKE2B 09856bbb082206962b40968f0553d40005a9b47000c2f612d2052bbca72e8c0e6e1bd5f3605deae0779167263e054e3f3c403a4bf5317cc48855dcc85664218f SHA512 f6239ddbad9a90e2006ab6358594ea035782a5f44fd5ffb76714c3ec85fd1f3711b1d9242f1e51a494a403b60eb03d8cade16bc2bf2e81af614d4942cc2a3583
 EBUILD clang-7.0.9999.ebuild 9427 BLAKE2B 60c2334a185dec4b05de6eb73eccd498bd707703dd80c429f6ffdfd74b2fb9ee82b916df14ff7433857cab5d5381b9e9527ab53560c4362a57f187fefc7e6e71 SHA512 dcdef2d19e4c10302607595349a2ad5b5e58fdcabb16a798713cf2e8f2dda0cd2d778b7f8b1769b8326bb75043daafeb2bcf48c722614c11dfcadc1b0861e49f
-EBUILD clang-8.0.0_rc2.ebuild 10167 BLAKE2B d69b142cfcf2ab5ff98eadb6ba6d936d636411b655974cb5628f8ff7295afe6d5ad8db9a756d4a776c839f1820ce59be5c441c9b976f0bb134c2f1acb92b818d SHA512 42651ac794deabfd24c529c1ebd8462256554df766b77a0edefdf7694cbdd40c6d6bc7060e90649f99ce1874aa19b62a98aac50d341e810c40aff4c583207592
-EBUILD clang-8.0.0_rc3.ebuild 10167 BLAKE2B d69b142cfcf2ab5ff98eadb6ba6d936d636411b655974cb5628f8ff7295afe6d5ad8db9a756d4a776c839f1820ce59be5c441c9b976f0bb134c2f1acb92b818d SHA512 42651ac794deabfd24c529c1ebd8462256554df766b77a0edefdf7694cbdd40c6d6bc7060e90649f99ce1874aa19b62a98aac50d341e810c40aff4c583207592
+EBUILD clang-8.0.0_rc5.ebuild 10167 BLAKE2B d69b142cfcf2ab5ff98eadb6ba6d936d636411b655974cb5628f8ff7295afe6d5ad8db9a756d4a776c839f1820ce59be5c441c9b976f0bb134c2f1acb92b818d SHA512 42651ac794deabfd24c529c1ebd8462256554df766b77a0edefdf7694cbdd40c6d6bc7060e90649f99ce1874aa19b62a98aac50d341e810c40aff4c583207592
 EBUILD clang-8.0.9999.ebuild 9439 BLAKE2B ee444ec3a9b2eb53f5099460abb1aacf3e4ff66508f41e37187cc2ff55d03e20e114e9e0adbfd7688823f0ab43064905246e77048c3692b0ea3386780781844a SHA512 410a534f8ed61a4928b6dbfcd4e9b851131fe789dd188953a86722a617ac90284799041da9aa94843858c3c41d4d62a5a00eda4ab3ea49cc0d2861df85a6ef55
 EBUILD clang-9999.ebuild 9504 BLAKE2B e4cde897640df7698df594f3f64785b8e1980b909cd6aba4cb6b5126c60b4d5dc3c85679e80d071e6b09932cf44432261619d65d3782e90ab24b7a563fbb7af5 SHA512 35b7656ae05016917109f7eae5dcf96f25686cd37d3a7d3a4604f79f806826e97226056a041818ed681a9e23b6e026ddf4ff703e6f858d89dc930110d5e7de62
-MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932
+MISC metadata.xml 1377 BLAKE2B 8b580be2bcaddb98c2d2b8defd1730c69a7478248f7d241dd00f533d36d750a3f45c1e55161a4fd2731b6211a22c658046cf8ad5a87028c32928dfe0cd4a862f SHA512 b08ea2bd3454abb09abfa92b62e6dae4f4e10db0266c1e4895bef0f6a2d2fadea0b36b9b861831389413e1cca0e3c412b4cf474fc8c4170902b40deeab06686a
diff --git a/sys-devel/clang/clang-3.4.2-r100.ebuild b/sys-devel/clang/clang-3.4.2-r100.ebuild
deleted file mode 100644
index 7d2979d5fa09..000000000000
--- a/sys-devel/clang/clang-3.4.2-r100.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.4"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),${MULTILIB_USEDEP}]"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
diff --git a/sys-devel/clang/clang-3.5.2-r100.ebuild b/sys-devel/clang/clang-3.5.2-r100.ebuild
deleted file mode 100644
index a10346be855c..000000000000
--- a/sys-devel/clang/clang-3.5.2-r100.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.5"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),${MULTILIB_USEDEP}]"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
diff --git a/sys-devel/clang/clang-3.6.2-r100.ebuild b/sys-devel/clang/clang-3.6.2-r100.ebuild
deleted file mode 100644
index a68d706db02c..000000000000
--- a/sys-devel/clang/clang-3.6.2-r100.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.6"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),${MULTILIB_USEDEP}]"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
diff --git a/sys-devel/clang/clang-3.7.1-r100.ebuild b/sys-devel/clang/clang-3.7.1-r100.ebuild
deleted file mode 100644
index b62b2983d2be..000000000000
--- a/sys-devel/clang/clang-3.7.1-r100.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.7"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),${MULTILIB_USEDEP}]"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
diff --git a/sys-devel/clang/clang-3.9.1-r100.ebuild b/sys-devel/clang/clang-3.9.1-r100.ebuild
deleted file mode 100644
index 0fadd936ed9a..000000000000
--- a/sys-devel/clang/clang-3.9.1-r100.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="UoI-NCSA"
-# keep in sync with sys-devel/llvm!
-SLOT="0/${PV}"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug multitarget python +static-analyzer ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,python?,static-analyzer?,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]"
-
-REQUIRED_USE="
-	|| ( ${ALL_LLVM_TARGETS[*]} )
-	multitarget? ( ${ALL_LLVM_TARGETS[*]} )"
-
-# Please keep this package around since it's quite likely that we'll
-# return to separate LLVM & clang ebuilds when the cmake build system
-# is complete.
-
-pkg_postinst() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
-		#add ccache links as clang might get installed after ccache
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		# --remove-links would remove all links, --install-links updates them
-		"${EROOT}"/usr/bin/ccache-config --install-links
-	fi
-}
diff --git a/sys-devel/clang/clang-8.0.0_rc3.ebuild b/sys-devel/clang/clang-8.0.0_rc3.ebuild
deleted file mode 100644
index 4644b194f6e8..000000000000
--- a/sys-devel/clang/clang-8.0.0_rc3.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eapi7-ver flag-o-matic llvm \
-	multilib-minimal multiprocessing pax-utils prefix python-single-r1 \
-	toolchain-funcs
-
-MY_P=cfe-${PV/_/}.src
-EXTRA_P=clang-tools-extra-${PV/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	https://prereleases.llvm.org/${PV/_//}/${EXTRA_P}.tar.xz
-	test? ( https://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-#	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? (
-		dev-lang/perl:*
-		z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	)
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${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} )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-PATCHES=(
-	# add Prefix include paths for Darwin
-	"${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch
-)
-
-# 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_unpack() {
-	# create extra parent dir for CLANG_RESOURCE_DIR
-	mkdir -p x/y || die
-	cd x/y || die
-
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-	einfo "Unpacking ${EXTRA_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${EXTRA_P}.tar.xz" || die
-
-	mv "${EXTRA_P}" "${S}"/tools/extra || die
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/lib/Testing/Support \
-			"${LLVM_P}"/utils/{lit,llvm-lit,unittest} || die
-		mv "${LLVM_P}" "${WORKDIR}"/llvm || die
-	fi
-
-#	if ! use doc; then
-#		einfo "Unpacking llvm-${PV}-manpages.tar.bz2 ..."
-#		tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
-#	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	eprefixify lib/Frontend/InitHeaderSearch.cpp
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		# ensure that the correct llvm-config is used
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
-		-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=ON
-		-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_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# z3 is not multilib-friendly
-		-DCLANG_ANALYZER_ENABLE_Z3_SOLVER=$(usex z3)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=$(usex doc)
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
-		)
-		use doc && 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
-		)
-		use z3 && mycmakeargs+=(
-			-DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
-		)
-	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_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	# 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-utils_src_make check-clang
-	multilib_is_native_abi && cmake-utils_src_make check-clang-tools
-}
-
-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() {
-	cmake-utils_src_install
-
-	# 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
-
-#	# install pre-generated manpages
-#	if ! use doc; then
-#		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-#		doins "${WORKDIR}/x/y/llvm-${PV}-manpages/clang"/*.1
-#	fi
-#
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	# 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 [[ ${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 "To use these scripts, you will need Python 2.7. Some of them are vim"
-	elog "integration scripts (with instructions inside). The run-clang-tidy.py"
-	elog "scripts requires the following additional package:"
-	elog "  dev-python/pyyaml"
-}
-
-pkg_postrm() {
-	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-8.0.0_rc2.ebuild b/sys-devel/clang/clang-8.0.0_rc5.ebuild
index 4644b194f6e8..4644b194f6e8 100644
--- a/sys-devel/clang/clang-8.0.0_rc2.ebuild
+++ b/sys-devel/clang/clang-8.0.0_rc5.ebuild
diff --git a/sys-devel/clang/metadata.xml b/sys-devel/clang/metadata.xml
index 03502538f638..04b324c4b057 100644
--- a/sys-devel/clang/metadata.xml
+++ b/sys-devel/clang/metadata.xml
@@ -29,7 +29,6 @@ Conformance with C/C++/ObjC and their variants</longdescription>
 	<use>
 		<flag name="default-compiler-rt">Use compiler-rt instead of libgcc as the default rtlib for clang</flag>
 		<flag name="default-libcxx">Use libc++ instead of libstdc++ as the default stdlib for clang</flag>
-		<flag name="multitarget">Build all host targets (default: host only)</flag>
 		<flag name="static-analyzer">Install the Clang static analyzer</flag>
 		<flag name="z3">Enable the static analyzer constraint manager backend using <pkg>sci-mathematics/z3</pkg></flag>
 	</use>
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 0c40a99a3c1c..48df64bfd59d 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,8 +1,8 @@
-DIST crossdev-20171230.tar.xz 23016 BLAKE2B 4661b3f9fac314b7346f0de7227d12ae2d6851e448f6d065471499df8ada5d699ef91c6b6bca285b2aefcbf67ab351fefbe9344c0884a7c0d33ff27215c8ed9c SHA512 bf8761a3018790501adb4bb173e3281d1d7628de8f65a1aa5df0b328a4af8088be466dbe8c185e7ed44aca31b078320a4f62c56351f4b7cbf832349184d9709f
 DIST crossdev-20181020.tar.xz 27172 BLAKE2B 8a388d5201ab419b865b96a4314190a693a7e00f3b5ecc2db2efdf36efca102206b5c4c5633e5e4ee508f5433ff4e086460501462bacc86c2adb10cab33a0244 SHA512 dd7fa9522ce6f58684b54ddc57e088f19a8ad5392ff45ed5b2b1f95f4be7dbc753442adc1c2591a785d94070979200936ca713913e547e84ae02b05c83bf8cde
 DIST crossdev-20181202.tar.xz 27184 BLAKE2B d1770f5148d666b22a20576b638e71bf6325e8a61776b8b47ecaf2e5437150554f6973c5306d233a836e4ffe3ff0480167c9b877c5f9e733681fd502016a19d4 SHA512 896bf050c81f3f34b2be187a851832494c039aa93177c806b689a75d16567f178e4ca33c21282fc320506b76e09b0cde8a45976b6309bf9bc5be8290db3dd8af
-EBUILD crossdev-20171230.ebuild 854 BLAKE2B d10029ed5c6d5c9333a949d3d0a9df31a3b5b180328036c90188ce326bc83a3801638379a6b856010fedf04ae12ebf14e9a8953084acec7ec87dc889d21057d2 SHA512 955cee7f5bb76c933c2c206d65cb6c25ba78725e6f414a0860fb9c09d244221837a2ac25767828c97acbff46b6d3241582ba0a54f2ebcc31d34ed616d1ce8a33
+DIST crossdev-20190311.tar.xz 27176 BLAKE2B 444828314b4e5363e9603a1fea8034e0b2b604a164d8efd6c31bf15591080daebd936eb2881c83e165f945742d11f54b04bf5f59b4ff39c048e55fef9989d268 SHA512 1f572df09204e297efd6e97001aad929226f26e9ddc706568680d75b1746a624e86c1578c5d3ee1e52ece0bbafdd17ae59565f3098864f018768c2901821f4ff
 EBUILD crossdev-20181020.ebuild 889 BLAKE2B 14713d3a01726985d6e80b76c42d19d47975301f5a7dc1fd27da79bc0844ac1e5c626db5a7f4da0c8b6b17fd905ac3175d867a8f7a889a84b02dffd0de0d5c33 SHA512 9eb441553bfadded4f77fa7665523e590584daab7bbffa6048d88abe119729a2d74c6c65ade85ecbb7301bf78c235a5c92aeb6a91c95bcbbf4a86d3096f148c5
-EBUILD crossdev-20181202.ebuild 902 BLAKE2B 9d1a363a8ea0349487950cde4c9e0d8db8c468555a437f13f17418e8a47e2aa615413a537a8c5a85080e77f7a4f404b9a3ffd2f770eb88c12e412fbd474d7fc6 SHA512 e600934dfc93eeb43981d792f9801d4c53408bff783a84aa4155ca1de79e38f2c611158ec00021f0f10cf9d82e05120051ff69f6e17e8827c35b00a7543ca9bb
-EBUILD crossdev-99999999.ebuild 911 BLAKE2B 4ae5b9af089c6ff5911dd16b91144b403ab40676dbbfeb93739835084bd2f8dc8b01c157d7042bef68c6620c2ff387dd76073dc26ebf3267a6b618bdbc806485 SHA512 0c495670181efe2b105768c7715e55d65a487ccaa3c2fd4ebbe5272e04425c40aec365ce3a248743b97dec49446ba07cda0d7d7f17dec94297c36182a9c456a6
+EBUILD crossdev-20181202.ebuild 889 BLAKE2B 14713d3a01726985d6e80b76c42d19d47975301f5a7dc1fd27da79bc0844ac1e5c626db5a7f4da0c8b6b17fd905ac3175d867a8f7a889a84b02dffd0de0d5c33 SHA512 9eb441553bfadded4f77fa7665523e590584daab7bbffa6048d88abe119729a2d74c6c65ade85ecbb7301bf78c235a5c92aeb6a91c95bcbbf4a86d3096f148c5
+EBUILD crossdev-20190311.ebuild 902 BLAKE2B 3a5520352e8327c1d37c16c6184ff72ef96d60be07a5104cfff5701da751963519264279435870c5e17e6f8ed53677569360ae1af3991f6a92f0ec53c6f05b30 SHA512 dffd2b1092b54487e00e5a22d78afc589a238d768edb9a6115714459c069b2030138b3b3a42904905c05ee31fae88c638327a8976cadd76d9ee0cf3ffa95c70b
+EBUILD crossdev-99999999.ebuild 908 BLAKE2B 81ab786cd6b427e4085caa37e3fd62634dba8fcd891e91dbec99b4cacadcf78674fa618f4bde507064166d8adb92b1a97fd252c2e05cd0c61ba24fccf32edcf9 SHA512 942c0ff5282a4d996f9440578b82fa88358a181562280a65dbb5eb9bdc1f082fc72fd7be94ec40354440a7d3ae8ea42c33561a81b3860b9d35f618740650c507
 MISC metadata.xml 356 BLAKE2B 2220babfa5cc38c63a0e8361b84d1f3b288e5d050fd587562cac160621a60efb109df5af98b6108c1cd442947911d76db38cc9b82ef83c7a52553d5dab231116 SHA512 9b90e3370e18885739fad8a1ff7fd420eae5cf188fde84e8aec8002bbbc390291bd37481e308ad584d33e643e9d17a47000c8ce0852780ff18c0bfddb7327cae
diff --git a/sys-devel/crossdev/crossdev-20181202.ebuild b/sys-devel/crossdev/crossdev-20181202.ebuild
index aba306ab0492..684e23fcf07a 100644
--- a/sys-devel/crossdev/crossdev-20181202.ebuild
+++ b/sys-devel/crossdev/crossdev-20181202.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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20171230.ebuild b/sys-devel/crossdev/crossdev-20190311.ebuild
index 23a0747eb414..c63e923b635a 100644
--- a/sys-devel/crossdev/crossdev-20171230.ebuild
+++ b/sys-devel/crossdev/crossdev-20190311.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
@@ -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 s390 sh sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
@@ -19,7 +19,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND=">=sys-apps/portage-2.1
+RDEPEND="
+	|| (
+		>=sys-apps/portage-2.1
+		sys-apps/portage-mgorny
+	)
 	>=app-portage/portage-utils-0.55
 	app-shells/bash
 	sys-apps/gentoo-functions
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index 9024b91e057b..64d97b11b23b 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index bec5d43b4f2a..e8cc6d8be7b9 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -14,12 +14,14 @@ AUX distcc-hardened.patch 1084 BLAKE2B 4b78fce2ab19b3832006a8b0092d3d38df07ce822
 AUX distccd.confd 1189 BLAKE2B 62791080d43004faf5fc4fb61e506bf3f0f8c2a677d4c24e7d44af692ca7b825e173624343f7e89ae7bff206fdf9543e0308ea4b2db90326c0de04eaaeb62f0b SHA512 1769bd32b1e03e7f8a8e6dea82c1709754d4d0fb12e59e9bdf885ac98f13e26d6c3fdf6575512a8b65299043beeb4b86f6c0b1c884daaee73a5c77d09e474545
 AUX distccd.initd 341 BLAKE2B 0781b860647e68511d19d592cb65cf4c03ea15a8499783755772f5a448393befc2b450de703168a2b062e9fe0d8690a7ea3cda271a5bad2560099c0b5dc6c12f SHA512 bd5aecda5153589a78cd5ff82c34b10176efbd994ab82caf8f63951c04983f6e65459784c1e7644a323ad1696aa0a62b38e863ee1c42a15241a60b22942f8dce
 AUX distccd.service 244 BLAKE2B db5796f93fe36b2ed09cf84e54bacdb3483917438feb823bdc786983beebac13408bbfc7dd40b6bfd49341b4a2135a21ae49769c14a904ef37eecfa98c03306f SHA512 0626a2da412df4a124ec8f3486b48af92895e97ad626bb848f14e60c9b016de313ca7c17a09565de95fa48233c9f7e37bf79038d1115b339a2033f0eacf0a22f
+AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
 DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476 SHA512 98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee
 DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138 SHA512 fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10
 DIST distcc-3.3.tar.gz 1171281 BLAKE2B f637cacbfdaaca6efb56e912de55fcfa49e3fffcb8f34649e339f16376250e18a20d30281a46f207992c0b300c726427a3ad5a77bd8976d2993f8f49b9b6b970 SHA512 459c175c8ac905bc70299e77ac11b6d24782bd69c9152126249c9af8fbb4c269e6f7317b02abf50cf6cc0405dd0f887e803320e19dc528a19c4c488640c615dc
 EBUILD distcc-3.2_rc1-r4.ebuild 5603 BLAKE2B 92accfb9fbdec29da8376407a7ee9e67f387bbdf1c5f3da22707917c1f600b64613225536064518aeef0c65d82f7a29f1f8b26c7c47b1306aa80c395bbde5313 SHA512 1f2766a19aaf84f4c7d37fca9f85b2badda7fa0fac6e8f7d2c819b303f4edf6b399e89a93abeca868ea28511b2985791ec91c32db89cb05d04b1a2ce984e669b
 EBUILD distcc-3.2_rc1-r5.ebuild 5365 BLAKE2B 7024c98de89530de80be0fc6538a7b59c127d337c26895576bce24e42ba349b8440de11f9fcc5ff357b955ca29856fb94b13db8440a5c15fe0aa248bd359b6f0 SHA512 489927c0eb49862dba56fad165a7940485184664a492a26ae34c830a561ee582778a6be0c5d5e41d98985f67b2330c182c3103fc2d75998261b5c8f8cc4bb867
-EBUILD distcc-3.3.2-r4.ebuild 5690 BLAKE2B e2d9e482b79384a47238cb75de668fea62e2f2ca75fbca48077b623705b4fc42922886c2ca8ca758e6a6f659d0c957c5169e9f3168ddf43214f4e9baa09a4c9f SHA512 bbc23185979e9f9747363458972f7c9f70d7f5ac02f22f5a5f2930b2853b6ee4175777b72807a85661b83f22389d6e05b1eb5956527fd44f5a96652f6e6694bd
+EBUILD distcc-3.3.2-r4.ebuild 5683 BLAKE2B e6b0b4b4944d0a968d39a80aef5bc57e747f0c773cc3439ed1a2ac719277e707f034abeb4310f826bfbe1d030b3e0204f18541f746aaf6765b4bfa88d4143614 SHA512 e7002f599531422a9e772f400841f45611b8d52813fa3a29fce7aafae5194649887a293843bfeb24e228c5eb9cfaaf233247476268276a727b0249c6b6888e30
+EBUILD distcc-3.3.2-r5.ebuild 5702 BLAKE2B e13d2a5b6e0cc7bc9290ec5b5ab6d88fe4de68b32b3ab158adde31e8c026eb9dca1e7a916ac83b2694401224d756192712602581fff2949ac9d43fe84cea99a7 SHA512 5aad930203788bb3ec77babb089c483007b48449320ff16380d47ddaac4de216dfbef45cd98ab730d6c40fb2ef4690ccdb0a67d04ebd59e01e9f2945e75e4e52
 EBUILD distcc-3.3.ebuild 5528 BLAKE2B 26d30e922367811a40608dd5899db748c82dc812e573bf56c309ae2853829dccee30f5b7028ad4190a8c32c03c65345b7f29349a614dd258848d4cf5235d686d SHA512 34ad7a871d175fb10aea3fa2b5da9d6ed32a2e6d4d015e3ad9228308c5b51453648748cfe1e865d7a0d07820204a823c3c3fa7953adc8ea3d8e62881eb580c51
 MISC metadata.xml 686 BLAKE2B 149386337b838821ca538556fa2548b759ed09a5a99ff2de536390ba0a39f30c72722e88e0e413122df2d893a317a25eed5e43046a0721b960e0c0b5bfbd8c8e SHA512 22eacde5aeb935c963a80bf5d3a39e4db08ad2613232aabba2a109748b29169ffca04cf53f946a6110d3cf66358ec53e4a025cbbe12a84597ea3130475e9343d
diff --git a/sys-devel/distcc/distcc-3.3.2-r4.ebuild b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
index b0c5ae3d8da8..9c94466284f4 100644
--- a/sys-devel/distcc/distcc-3.3.2-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.3.2-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"
diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
new file mode 100644
index 000000000000..24098b549c2c
--- /dev/null
+++ b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit autotools flag-o-matic python-single-r1 systemd \
+	toolchain-funcs user xdg-utils prefix
+
+DESCRIPTION="Distribute compilation of C code across several machines on a network"
+HOMEPAGE="http://distcc.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86"
+IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
+
+RESTRICT="test"
+
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/popt
+	gnome? (
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	gssapi? ( net-libs/libgssglue )
+	gtk? ( x11-libs/gtk+:2 )
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+"
+DEPEND="${CDEPEND}
+	sys-devel/autoconf-archive
+	sys-libs/binutils-libs
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	!net-misc/pump
+	dev-util/shadowman
+	>=sys-devel/gcc-config-1.4.1
+	selinux? ( sec-policy/selinux-distcc )
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/distcc"
+
+pkg_setup() {
+	enewuser distcc 240 -1 -1 daemon
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
+	# bug #255188
+	eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
+	# SOCKSv5 support needed for Portage, bug #537616
+	eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
+	# crash on missing directory
+	eapply "${FILESDIR}"/distcc-3.3.2-noexist-crash.patch
+	eapply_user
+
+	# Bugs #120001, #167844 and probably more. See patch for description.
+	use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
+
+	sed -i \
+		-e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \
+		-e "s:@PYTHON@:${EPYTHON}:" \
+		pump.in || die "sed failed"
+
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
+		-e "s:@libdir@:/usr/lib:" \
+		"${FILESDIR}/distcc-config" > "${T}/distcc-config" || die
+
+	hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
+	python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--libdir=/usr/lib
+		$(use_enable ipv6 rfc2553)
+		$(use_with gtk)
+		$(use_with gnome)
+		$(use_with gssapi auth)
+		$(use_with zeroconf avahi)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	# override GZIP_BIN to stop it from compressing manpages
+	emake DESTDIR="${D}" GZIP_BIN=false install
+	python_optimize
+
+	newinitd "${FILESDIR}/distccd.initd" distccd
+	systemd_newunit "${FILESDIR}/distccd.service-1" distccd.service
+	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
+
+	cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die
+	if use zeroconf; then
+		cat >> "${T}/distccd" <<-EOF || die
+
+		# Enable zeroconf support in distccd
+		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
+		EOF
+
+		sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
+	fi
+	doconfd "${T}/distccd"
+
+	newenvd - 02distcc <<-EOF || die
+	# This file is managed by distcc-config; use it to change these settings.
+	# DISTCC_LOG and DISTCC_DIR should not be set.
+	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
+	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
+	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
+	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
+	DISTCC_SSH="${DISTCC_SSH}"
+	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
+	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
+	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
+	EOF
+
+	keepdir /usr/lib/distcc
+
+	dobin "${T}/distcc-config"
+
+	if use gnome || use gtk; then
+		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
+		einfo "This is to have a little sensability in naming schemes between distccmon programs"
+		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
+		dosym distccmon-gui /usr/bin/distccmon-gnome
+	fi
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins "doc/example/xinetd" distcc
+	fi
+
+	insinto /usr/share/shadowman/tools
+	newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
+	newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
+
+	rm -r "${ED}/etc/default" || die
+	rm "${ED}/etc/distcc/clients.allow" || die
+	rm "${ED}/etc/distcc/commands.allow.sh" || die
+}
+
+pkg_postinst() {
+	# remove the old paths when switching from libXX to lib
+	if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \
+			-d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then
+		rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die
+	fi
+
+	if [[ ${ROOT} == / ]]; then
+		eselect compiler-shadow update distcc
+		eselect compiler-shadow update distccd
+	fi
+
+	use gnome && xdg_desktop_database_update
+
+	elog
+	elog "Tips on using distcc with Gentoo can be found at"
+	elog "https://wiki.gentoo.org/wiki/Distcc"
+	elog
+	elog "distcc-pump is known to cause breakage with multiple packages."
+	elog "Do NOT enable it globally."
+	elog
+	elog "To use the distccmon programs with Gentoo you should use this command:"
+	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
+
+	if use gnome || use gtk; then
+		elog "Or:"
+		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
+	fi
+
+	elog
+	elog "***SECURITY NOTICE***"
+	elog "Since distcc-3.3, whitelist is used for what distccd could execute. The whilelist"
+	elog "has been generated by compiler-shadow distccd.  To revert to the old behavior, "
+	elog "you need to pass --make-me-a-botnet to distccd in /etc/conf.d/distccd."
+	elog "Cf. https://github.com/distcc/distcc/pull/243."
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
+		eselect compiler-shadow remove distcc
+	fi
+}
+
+pkg_postrm() {
+	use gnome && xdg_desktop_database_update
+}
diff --git a/sys-devel/distcc/files/distccd.service-1 b/sys-devel/distcc/files/distccd.service-1
new file mode 100644
index 000000000000..9bd470297df8
--- /dev/null
+++ b/sys-devel/distcc/files/distccd.service-1
@@ -0,0 +1,10 @@
+[Unit]
+Description=Distccd: A Distributed Compilation Server
+After=network.target
+
+[Service]
+User=distcc
+ExecStart=/usr/bin/distccd --no-detach --daemon --port 3632 -N 15 --allow $ALLOWED_SERVERS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index da8e1bb36c53..434de59848dc 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -128,6 +128,6 @@ EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91ded
 EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c
 EBUILD gcc-7.4.0.ebuild 526 BLAKE2B 77e8278a26c53204e43178fb3f6b7eb58eebe9967dafe593b8c83cc200dfb742cd01ab0e79664c2b50a68dd1ad8a39c773e098cfc08d643d809aa5d4d519c7b0 SHA512 54b3f0635948779bd04e1ec1fbcbf794fc27255cdf77cfbf9876c104af06a5a8a6610f681e0966dcab73f13c107f74550495320b3911cb83c2b8eb13834fecbf
 EBUILD gcc-8.2.0-r5.ebuild 491 BLAKE2B 302b288193a8cf89d93a53e9012e7686111e5195d2015b219adab5b302245d773519ca0c3193235d0b85974e7237b22beba4d43431e46c9b6e554dcadf816198 SHA512 8270e48c6287c4674318ff5aace71bfcf79dd1e96e7be381d6e87f2c97d42440610d9351403fc7ba30733581919cd992a42fba208991970ad1fcec305f7873a3
-EBUILD gcc-8.2.0-r6.ebuild 485 BLAKE2B da3575e3b9aba3579fbc6e035eabb169a360e0927a01335d490ba6a43ce407e3046a5573a79f75d08d3fd2dd3f8b7e0d8d555d32d792a7ae7521c9cdd641dd7b SHA512 1a0bcc6ee5c2f4c652d854b04257441c8edac08a69e35166e3bd016131fe56bcc791e3a08740f46e8e9edc8b18dcaadc3b87503edf92327ea152ed69d26b6525
+EBUILD gcc-8.2.0-r6.ebuild 479 BLAKE2B e3c96bd8335c1693707d987c125162abfe0fc526d0113726a3f008ff6a2c2acf568dcd1992fda52569d222da31ace217a80e6f360d3a9716faa4c9ca273805ac SHA512 a6186400180af29a8eb02b308262afad98c7bd52740db6d6d377c53765cf8654c638107ca79a137ee7d46037605f183538f9c895fc755f686ea82585278b827b
 EBUILD gcc-8.3.0.ebuild 473 BLAKE2B 0a75d6ecd08d361384ad5d351efef2f848ee0449826b6bb71405f65254beba62d86c3523ffc9fc7bfab7070781bc0fe106014c6fdc29eb15c7a7f78ac68e233a SHA512 98f7c39cb541ce430859e22298225ef9a2fd221c067ce93b736db56e144e699a3b2e85d99187ef9ffeb5fca9fc1ba33737c875adac2dfd098e20f1577d55ccbe
 MISC metadata.xml 2732 BLAKE2B 92cb98274d6628d7a851d9cdfdd82a23d760f331058e826d90fca0e89623cfa7629de44deae9895a84d92f9fbdcb93596fafa0217fe958e719deafe7d6af5d4c SHA512 3b4b28141eea0e3b9c660a9d45742ed652bdfe3e9a2d94727af3c564e60cf53059aad4eef335e1d5839a8a54869cb2ce959353999fc0c8e21a506faab6d93623
diff --git a/sys-devel/gcc/gcc-8.2.0-r6.ebuild b/sys-devel/gcc/gcc-8.2.0-r6.ebuild
index c1fc361e6916..c051decca68d 100644
--- a/sys-devel/gcc/gcc-8.2.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0-r6.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.7"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index fe8d1b91e576..1a6065ae4a95 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -2,6 +2,8 @@ AUX gdb-7.12.1-ia64-include.patch 891 BLAKE2B ab8fd5cf7c394a302d3c6de36f1157623d
 AUX gdb-8.2-sparc-fix-syntax.patch 399 BLAKE2B db7c9fad33cb9b43e986c7a5fb0adfb7fea9aac3f59990f9e8b41ca550c7e0da2363a24f06bddd321d1629857c5cc9bafba1c62920527ccfc4f375e8fd6667e2 SHA512 631dc6d92852e7852dfaa1d99fe32b98bf646f886f9906f1e170aac2d17f2809374336b93d1fd56f09419e8317b6f7634d809fe59022b803f32e18ba7d89ab39
 AUX gdb-8.2-tinfow.patch 1629 BLAKE2B eb771e3ce9add5eeb6c9d87cec229fda6557eb907877ecb4461060b8869c8598891368bb83c9ae71f5840edc0d95c9fa6d7c386e78afb724fdeadf5d1619269f SHA512 a406922c3fa9c0264cb4250895783d433f59f88eda8df63e509bc8c43d6b55b540262f34dd6f57894958574d9f3412d9d6f46397c229515204d62b0e642570d2
 AUX gdb-8.2.1-aarch64-musl.patch 1785 BLAKE2B a119c650c709827a35badc36a4ac0b7df30709ecb129cc3f55091c508059eb325691a2ca81d8ca8ed50f8bfbd194af2199bd03ff0c6820fc63ac170499443020 SHA512 93745b0539492a3790baf728b703d8ae09ed7e378a522471cef8db934dbd5fcf474bfdcd9ec83c7ba42bb3610e74a7f5d901fbb4b8ce6c5bbc2ac9a9ad133151
+AUX gdb-8.3.50.20190312-c++17.patch 461 BLAKE2B a5be60c24882e4b61a46d16a34382b5b0da5af15d4fbddd0b5322cf2d0915f090ae04b7c8c53f2f5793908e7c25bda6cb4750f61394bc06b99d162dc6f2cf0ff SHA512 b2d8029b58e77958fc86779ef6d6ee90d278a29d2f10c71d4f01a492e607a308adac61190e91ad142c07c2a2e55a37b9e71689b2d0d184269b1ac4f7eac877ef
+AUX gdb-8.3.50.20190312-source-highlight.patch 4986 BLAKE2B 38c6b4b51740ef9ccf9fdf3a9217f4ff9151f29f9fbab0b77449759a0d32e98e692a9b74f5e7d19ae9afada9a536faa598ae6747576e4f6c2ddf8b298e59bbcc SHA512 b65155894b8efe6bd0b257d6281a6548ba4df6d0910dccce643cff4f9b79cfd60689ca82b3e71f60b236e0aae1f886e546cd8db95b0e430fae007bf3f2c8fa1f
 DIST gdb-7.10.1.tar.xz 18531436 BLAKE2B b50a1b6b5b867e4a52943fdc4992c654ceec180099771381df78de5ba79086e822264356a762c61b89e986407d6f0cce336be216276545591e637131dc02f4a8 SHA512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010
 DIST gdb-7.12.1.tar.xz 19225392 BLAKE2B 2e4b7fe69c3cb11c04b505d1e110bf0a9ca65b6178f3e6a6ccc11fde1e8750b595016baf64adb2c22903d346cec1dab15574681de812ac8d260aebf4152a3027 SHA512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8
 DIST gdb-7.9.1.tar.xz 17867692 BLAKE2B f5de07a4ebf1a5112a1b40341b217d08f1eb6820eb2237a4be2cd289f832600b81b3c14f4632a762fdc13945a2fb65ffb58f13eb330f3d48892799e27bb62c87 SHA512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414
@@ -10,6 +12,7 @@ DIST gdb-8.1.1.tar.xz 20064728 BLAKE2B bd17a27a3974a34b94aa5898a97cf26dba9e91b81
 DIST gdb-8.1.tar.xz 20095080 BLAKE2B 9332058b8b723261ba215124f42a2d6ba916219efdfb3c23ae1f48fecf131c801bbd31b345f2c8339b23d74da690be0260ac31f8f2e79549b62f0880199bfdec SHA512 ffd82f415d7652d62dad1716c307836f594217a363429609beb7d70239e8bf06b73b393345b0e000796228e56681ed7656ac3c8be05e91d6d652ab0d5b1dc357
 DIST gdb-8.2.1.tar.xz 20170388 BLAKE2B 4008232de312ee71d379ac32a0ee6d63a828c0b58e84799ab9148760ce184400920f7b22c204b9878b09c452412b1b4db507a9185456dc973538de8b88483259 SHA512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11
 DIST gdb-8.2.tar.xz 20173112 BLAKE2B 921fdc02f7192f0bd76eb176f857c9c041b7316dc10c5e800eb81deef82a3186d511ec431145f952e5fbd20a4b2c89c14652c42dc52e0d8152acd811f3ae44a7 SHA512 11cc481bebc51eb6db73249ecb62b8c07455cf3db169f4860b3a83114849fbd2b5860a2db64488ba6c5909cf07b255c04770f1e36059eae6bee16d2a3581be90
+DIST gdb-weekly-8.3.50.20190312.tar.xz 22101500 BLAKE2B 49666c20faf3deca48a7663e2ee671de9820cc0c0e2111e6633e1b9861bc26d4a608ea4f9e853959d85ac619a8ca63b5ada52d93c2036788ff17ba564494e7d5 SHA512 224c7b3675da46b9d26da65ee1b7e099cdd5782f212b6d865c9b713b673cc8ce9fdf33618713ee38281cf28624014b7541d00e766d3978d530ac3c8a85baf22c
 EBUILD gdb-7.10.1.ebuild 6596 BLAKE2B 45ba5e83e3d3f95326e109a29a7cf9a5978a9f40baaca28217b734b7f12b6891e29779fa0818b8fd007b39b5f31ee37ab40f6020a5af3cfcdbe8f0d5898a469b SHA512 882ea757b29e57d6d6fc5b156fec40f8bdcaf014136918c4bd53fc453b48ab2b0c994eeac6723ec0252da933e4912d4fc77bfeb9392ae52b1bda2a4478d5b616
 EBUILD gdb-7.12.1.ebuild 6662 BLAKE2B cf3e1559840ae4a37d10da41e4bd479c35ee75888f2a26d200b858a652f220a04724068f863428acf1152fe7d66352a53c60e22197b69dc885eb3e15f30049b6 SHA512 2a5e4addd33295c9b85b7b76cbef205b031222d875ea0173a5009f82e6e83e23aef381595f0a97b82a3b97cc6dd31edda99c7a2a5bc2f5b8cfca391f7e6cbf01
 EBUILD gdb-7.9.1.ebuild 5945 BLAKE2B 2f767de7261f2924808b0eeeed463fb46b6cf490ed54e51d6f49838b61d053f45410ac2dd50f71696afc71d98b89afa34158d25577ad63f07006aea0393e2edc SHA512 7154ae49de7d61bb75752ad1d8e71d0414fa8baef5fb876eead8e5df4b01b2c23555d990ef2915186ca2b098c1ebdacfd121a54aabbcf103a5478affb0b64b8c
@@ -19,5 +22,6 @@ EBUILD gdb-8.1.1.ebuild 7115 BLAKE2B 07455f6ec0eb8d32bd57f404b2e831accb70995e61b
 EBUILD gdb-8.2-r1.ebuild 7322 BLAKE2B dcfda93fad78dbabf0153edbf1d0be0eea4cfdae1e3304bb1a5f2576d5a053d2e259063bb58e1b6cb1bddab7119120bcdcb7bf833c10f0a0596ff59a59d474c3 SHA512 2d07f8cc3e663c72676f726fe60943166bff599372d8f09e4e20c923647f0ad43148efae563f84ae5a783c44c7616560a7419890d6a0a9b84e05158aea604a82
 EBUILD gdb-8.2.1.ebuild 7174 BLAKE2B cf52d8377fc93a96bb4f8351af8bc9b6a4f16557441e1ef6d7f0ce58d55fdf143a10fbbdff272e91e9575a2c064af85fd5f103c947e5b633fbf9d6a90eaa7415 SHA512 1ba8c3fc08f63c4c9b6689d65da0d939d99a89d4944c6e6294ca3ab87bba697197f356d444198befdac3eca18ba062fe935b695c73bdb5efa2646bf5278ad7ac
 EBUILD gdb-8.2.ebuild 7232 BLAKE2B 50ae71f70afbbbd0198394b6a638a68b29c3be243add4178b5fb2c4d5d2d6e940875c0e677d24cb1af16ee79d3c15cf99ed1160c36830e9c71fd6f92ea86f71d SHA512 ce0d2accd9d22baf1842737129925554291b1c4c9fa7f45cb853712a9ce5984d3305ab77721095d2483db1eddb025aa36b766195c98d404bcd9aec1bfff52a90
-EBUILD gdb-9999.ebuild 7012 BLAKE2B 1e7cdd2faa2988fe419089d1fdc9e993e777ba27cb52945904823bb8adb7d3ec2ad22b450c1205b0416a860c27e3ea39df428c72528a8f82538c6e8b8e57f1be SHA512 02cfc66c1342b4fbd6ed735e1e93b0c6e5579ac349eacd1e52f17828fea0087fa9b93be41fd4faaa5b7c60aac776ae5ebd41646e75712d8fcb3c34a897184073
-MISC metadata.xml 914 BLAKE2B 1260cb2638b32429345bd92c06c58074b3486ba3c516e25dab674b4589bf774f2f7192f7ed3ab9da4ed31e313038a389904bee6f9b77707d794530e3a244dfb4 SHA512 515a5bcd6c70fc87309cd4e3822d83e1b8fdf52e58cbf331df0c38b9096ad2410dfdad14aed100ea0a53457f57ecdf2b61b910b6a52765219815e1872872ee0c
+EBUILD gdb-8.3.50.20190312-r1.ebuild 7221 BLAKE2B deb555df63a610739b6bbf89661b2fca72120555973021dc7ca001221a4021503cf93c4f26820771fbdec02a897715badd022061da6beb5ec3e9044e9b064d33 SHA512 ec116fa159cbea4f4de6623b52e9ef6c19ea25cbcc15de4b44ea55e354d73376d8b9fd3e5cd16a400a285d851c2a658b2cf95887b74589309df4268d2abf6c53
+EBUILD gdb-9999.ebuild 7116 BLAKE2B c178abdb6a6c3c9f17d192c4a9139f01a6f085ccab5d990280ccda8af19c0d30a302e5c4a75583ca0dfbecf0560a3754d6f2cfe6bba30de4bdbfd7a491ca5af7 SHA512 29355a681f8c7ed168db4e54ccf9c02a42116406ef01514d967016e3e6326d22cbf44ea2ea08d8493b22a5e2c5ba46abdcd8c66be09b68170c26662d03e72ef5
+MISC metadata.xml 1021 BLAKE2B 81d865fbf0282b889509edfd6901654f25e60474be0eeca406803dbee20260da840f323f036818edbe27635e5a8c944b53bfba9fd7b715301d1a3eaa50898dfc SHA512 2255a18e7275069a9d8011f8360399444924ca6a3baef788c2e44e790896ba388c974fceb36ae2d394afc943b481a785ec3c11657e5018b7cd5db0eaa869c530
diff --git a/sys-devel/gdb/files/gdb-8.3.50.20190312-c++17.patch b/sys-devel/gdb/files/gdb-8.3.50.20190312-c++17.patch
new file mode 100644
index 000000000000..c134cbcae8df
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-8.3.50.20190312-c++17.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/680232
+
+--- a/gdb/unittests/string_view-selftests.c
++++ b/gdb/unittests/string_view-selftests.c
+@@ -170,10 +170,12 @@ run_tests ()
+ } /* namespace string_view */
+ } /* namespace selftests */
+ 
++#endif /* __cplusplus < 201703L */
++
+ void
+ _initialize_string_view_selftests ()
+ {
++#if defined(GDB_STRING_VIEW)
+   selftests::register_test ("string_view", selftests::string_view::run_tests);
++#endif
+ }
+-
+-#endif /* __cplusplus < 201703L */
diff --git a/sys-devel/gdb/files/gdb-8.3.50.20190312-source-highlight.patch b/sys-devel/gdb/files/gdb-8.3.50.20190312-source-highlight.patch
new file mode 100644
index 000000000000..6479efe572f4
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-8.3.50.20190312-source-highlight.patch
@@ -0,0 +1,136 @@
+From d46304c605ff119bc6bae38b7841d64e7568b691 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 13 Mar 2019 21:15:13 +0000
+Subject: [PATCH] gdb/configure.ac: add --enable-source-highlight
+
+Allow disabling source-highlight dependency autodetection even
+it exists in the system. More details on problem of automatic
+dependencies:
+https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies
+
+Noticed by Jeroen Roovers in https://bugs.gentoo.org/680238
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -879,6 +879,7 @@ with_mpfr
+ with_libmpfr_prefix
+ with_python
+ with_guile
++enable_source_highlight
+ enable_libmcheck
+ with_intel_pt
+ with_libipt_prefix
+@@ -1554,6 +1555,8 @@ Optional Features:
+   --enable-profiling      enable profiling of GDB
+   --enable-codesign=CERT  sign gdb with 'codesign -s CERT'
+   --disable-rpath         do not hardcode runtime library paths
++  --enable-source-highlight
++                          enable source-highlight for source listings
+   --enable-libmcheck      Try linking with -lmcheck if available
+   --enable-werror         treat compile warnings as errors
+   --enable-build-warnings enable build-time compiler warnings if gcc is used
+@@ -11393,13 +11396,30 @@ fi
+ 
+ SRCHIGH_LIBS=
+ SRCHIGH_CFLAGS=
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the source-highlight library" >&5
++
++# Check whether --enable-source-highlight was given.
++if test "${enable_source_highlight+set}" = set; then :
++  enableval=$enable_source_highlight; case "${enableval}" in
++  yes)  enable_source_highlight=yes ;;
++  no)   enable_source_highlight=no  ;;
++  *)    as_fn_error $? "bad value ${enableval} for source-highlight option" "$LINENO" 5 ;;
++esac
++else
++  enable_source_highlight=auto
++fi
++
++
++if test "${enable_source_highlight}" != "no"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the source-highlight library" >&5
+ $as_echo_n "checking for the source-highlight library... " >&6; }
+-if test "${pkg_config_prog_path}" = "missing"; then
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - pkg-config not found" >&5
++  if test "${pkg_config_prog_path}" = "missing"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - pkg-config not found" >&5
+ $as_echo "no - pkg-config not found" >&6; }
+-else
+-   if ${pkg_config_prog_path} --exists source-highlight; then
++    if test "${enable_source_highlight}" = "yes"; then
++      as_fn_error $? "pkg-config was not found in your system" "$LINENO" 5
++    fi
++  else
++    if ${pkg_config_prog_path} --exists source-highlight; then
+       SRCHIGH_CFLAGS=`${pkg_config_prog_path} --cflags source-highlight`
+       SRCHIGH_LIBS=`${pkg_config_prog_path} --libs source-highlight`
+ 
+@@ -11407,10 +11427,14 @@ $as_echo "#define HAVE_SOURCE_HIGHLIGHT 1" >>confdefs.h
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-   else
++    else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-   fi
++      if test "${enable_source_highlight}" = "yes"; then
++        as_fn_error $? "source-highlight was not found in your system" "$LINENO" 5
++      fi
++    fi
++  fi
+ fi
+ 
+ 
+diff --git a/gdb/configure.ac b/gdb/configure.ac
+index 8ddd0fda61..1318c8d008 100644
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -1220,19 +1220,38 @@ AM_CONDITIONAL(HAVE_GUILE, test "${have_libguile}" != no)
+ 
+ SRCHIGH_LIBS=
+ SRCHIGH_CFLAGS=
+-AC_MSG_CHECKING([for the source-highlight library])
+-if test "${pkg_config_prog_path}" = "missing"; then
+-   AC_MSG_RESULT([no - pkg-config not found])
+-else
+-   if ${pkg_config_prog_path} --exists source-highlight; then
++
++AC_ARG_ENABLE(source-highlight,
++  AS_HELP_STRING([--enable-source-highlight],
++    [enable source-highlight for source listings]),
++  [case "${enableval}" in
++  yes)  enable_source_highlight=yes ;;
++  no)   enable_source_highlight=no  ;;
++  *)    AC_MSG_ERROR(bad value ${enableval} for source-highlight option) ;;
++esac],
++[enable_source_highlight=auto])
++
++if test "${enable_source_highlight}" != "no"; then
++  AC_MSG_CHECKING([for the source-highlight library])
++  if test "${pkg_config_prog_path}" = "missing"; then
++    AC_MSG_RESULT([no - pkg-config not found])
++    if test "${enable_source_highlight}" = "yes"; then
++      AC_MSG_ERROR([pkg-config was not found in your system])
++    fi
++  else
++    if ${pkg_config_prog_path} --exists source-highlight; then
+       SRCHIGH_CFLAGS=`${pkg_config_prog_path} --cflags source-highlight`
+       SRCHIGH_LIBS=`${pkg_config_prog_path} --libs source-highlight`
+       AC_DEFINE([HAVE_SOURCE_HIGHLIGHT], 1,
+                 [Define to 1 if the source-highlight library is available])
+       AC_MSG_RESULT([yes])
+-   else
++    else
+       AC_MSG_RESULT([no])
+-   fi
++      if test "${enable_source_highlight}" = "yes"; then
++        AC_MSG_ERROR([source-highlight was not found in your system])
++      fi
++    fi
++  fi
+ fi
+ AC_SUBST(SRCHIGH_LIBS)
+ AC_SUBST(SRCHIGH_CFLAGS)
+-- 
+2.21.0
+
diff --git a/sys-devel/gdb/gdb-8.3.50.20190312-r1.ebuild b/sys-devel/gdb/gdb-8.3.50.20190312-r1.ebuild
new file mode 100644
index 000000000000..3b02bda0bd96
--- /dev/null
+++ b/sys-devel/gdb/gdb-8.3.50.20190312-r1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit eutils flag-o-matic python-single-r1
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+RPM=
+MY_PV=${PV}
+case ${PV} in
+9999*)
+	# live git tree
+	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
+	inherit git-r3
+	SRC_URI=""
+	;;
+*.*.50.2???????)
+	# weekly snapshots
+	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+	;;
+*.*.*.*.*.*)
+	# fedora versions; note we swap the rpm & fedora core versions.
+	# gdb-6.8.50.20090302-8.fc11.src.rpm -> gdb-6.8.50.20090302.11.8.ebuild
+	# gdb-7.9-11.fc23.src.rpm -> gdb-7.9.23.11.ebuild
+	inherit versionator rpm
+	gvcr() { get_version_component_range "$@"; }
+	parse_fedora_ver() {
+		set -- $(get_version_components)
+		MY_PV=$(gvcr 1-$(( $# - 2 )))
+		RPM="${PN}-${MY_PV}-$(gvcr $#).fc$(gvcr $(( $# - 1 ))).src.rpm"
+	}
+	parse_fedora_ver
+	SRC_URI="mirror://fedora-dev/development/rawhide/source/SRPMS/g/${RPM}"
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+	;;
+esac
+
+PATCH_VER="1"
+PATCH_DEV="slyfox"
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.1-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${PN}-8.1-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	|| ( client server )
+"
+
+RDEPEND="
+	server? ( !dev-util/gdbserver )
+	client? (
+		dev-libs/mpfr:0=
+		>=sys-libs/ncurses-5.2-r2:0=
+		sys-libs/readline:0=
+		lzma? ( app-arch/xz-utils )
+		python? ( ${PYTHON_DEPS} )
+		xml? ( dev-libs/expat )
+		sys-libs/zlib
+	)
+	source-highlight? (
+		dev-util/source-highlight
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	client? (
+		virtual/yacc
+		test? ( dev-util/dejagnu )
+		nls? ( sys-devel/gettext )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-source-highlight.patch
+	"${FILESDIR}"/${P}-c++17.patch
+)
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
+
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	local myconf=(
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	if use server && ! use client ; then
+		# just configure+build in the gdbserver subdir to speed things up
+		cd gdb/gdbserver
+		myconf+=( --program-transform-name='' )
+	else
+		# gdbserver only works for native targets (CHOST==CTARGET).
+		# it also doesn't support all targets, so rather than duplicate
+		# the target list (which changes between versions), use the
+		# "auto" value when things are turned on.
+		is_cross \
+			&& myconf+=( --disable-gdbserver ) \
+			|| myconf+=( $(use_enable server gdbserver auto) )
+	fi
+
+	if ! ( use server && ! use client ) ; then
+		# if we are configuring in the top level, then use all
+		# the additional global options
+		myconf+=(
+			--enable-64-bit-bfd
+			--disable-install-libbfd
+			--disable-install-libiberty
+			# Disable guile for now as it requires guile-2.x #562902
+			--without-guile
+			# This only disables building in the readline subdir.
+			# For gdb itself, it'll use the system version.
+			--disable-readline
+			--with-system-readline
+			# This only disables building in the zlib subdir.
+			# For gdb itself, it'll use the system version.
+			--without-zlib
+			--with-system-zlib
+			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+			$(use_with xml expat)
+			$(use_with lzma)
+			$(use_enable nls)
+			$(use_enable source-highlight)
+			$(use multitarget && echo --enable-targets=all)
+			$(use_with python python "${EPYTHON}")
+		)
+	fi
+	if use sparc-solaris || use x86-solaris ; then
+		# disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	nonfatal emake check || ewarn "tests failed"
+}
+
+src_install() {
+	if use server && ! use client; then
+		cd gdb/gdbserver || die
+	fi
+	default
+	if use client; then
+		find "${ED}"/usr -name libiberty.a -delete || die
+	fi
+	cd "${S}" || die
+
+	# Delete translations that conflict with binutils-libs. #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
+
+	if use client ; then
+		docinto gdb
+		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	fi
+	docinto sim
+	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+	if use server ; then
+		docinto gdbserver
+		dodoc gdb/gdbserver/{ChangeLog,README}
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+
+	# gcore is part of ubin on freebsd
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		rm "${ED}"/usr/bin/gcore || die
+	fi
+}
+
+pkg_postinst() {
+	# portage sucks and doesnt unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 5141bb241473..f9e1edcd7cc8 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -62,7 +62,7 @@ SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="+client lzma multitarget nls +python +server test vanilla xml"
+IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	|| ( client server )
@@ -78,7 +78,11 @@ RDEPEND="
 		python? ( ${PYTHON_DEPS} )
 		xml? ( dev-libs/expat )
 		sys-libs/zlib
-	)"
+	)
+	source-highlight? (
+		dev-util/source-highlight
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/xz-utils
@@ -165,6 +169,7 @@ src_configure() {
 			$(use_with xml expat)
 			$(use_with lzma)
 			$(use_enable nls)
+			$(use_enable source-highlight)
 			$(use multitarget && echo --enable-targets=all)
 			$(use_with python python "${EPYTHON}")
 		)
diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml
index d11b1ea4a91e..4940999342f2 100644
--- a/sys-devel/gdb/metadata.xml
+++ b/sys-devel/gdb/metadata.xml
@@ -11,6 +11,7 @@
  <flag name="multitarget">Support all known targets in one gdb binary</flag>
  <flag name="python">Enable support for the new internal scripting language, as well as extended pretty printers</flag>
  <flag name="server">Install the "gdbserver" program (useful for embedded/remote targets)</flag>
+ <flag name="source-highlight">Enable listing highlighting via <pkg>dev-util/source-highlight</pkg></flag>
  <flag name="xml">Support parsing XML data files needed (at least) for cpu features, memory maps, and syscall tracing</flag>
 </use>
 <upstream>
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 0529baf44e1e..def13756093b 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,24 +1,13 @@
-AUX 4.0.1/0002-test-Use-LLD-specific-binary-library-dirs-when-build.patch 4381 BLAKE2B 131ed63d4e9a68cabf23866412b2194656cece59eaddc0329beddffde86c76008afa1810721f36492189c244ce07673b8335fde66a47df89939c115b17b41824 SHA512 6d133999c5b95ede493ca98a0e8c7816dcca36e4e5f17f6d847996a2d70517cc50d0e1a6259b0d34173f76c4300f8809cea2c06d029a85d2fc62e856e69cbc72
-AUX 4.0.1/0003-test-Fix-zlib-cond-when-building-stand-alone-clean-u.patch 2924 BLAKE2B d429f8354506562ed8b11e1c34344a3d3868a74125d794e291ab89753328da2fe615300a005fd74735bf13c02ed20672377d806b9676fe49a955a38a2d8bd5e2 SHA512 1b82f754fb872318740f77f78fa08647e2523d5b6d9cdd0dd9108bdac82a213d5d5c698a8915c0f6bd60b2163cce3c8bd1c13095dad52d0beb08079f851d30d8
-DIST lld-4.0.1.src.tar.xz 593796 BLAKE2B 58eb8f013a4562ef60dd7e17ddd741f434b8f0228a3d3d746ec8c30521ce667863d0b6db6565659a1b86cb91550cdaa43a27600d3a979460523faf24eac8ea3f SHA512 63bd0813094dc7fa9a95fdee93eb7b97026882a15548f819b5c67f3f0f9fa2a582d968af27ad8f802dbff1f6cd1b8c2fb26b3c7c80379488d05c4a4984d7af68
-DIST lld-5.0.2.src.tar.xz 671776 BLAKE2B 11c470fb7eb4e8ddad043cff7daa714b55b862fe0a540e135db7252314caa101e3bb9063d5a7b32e0a86721cc01f602cafe087566d49ef5c6865f19ba3daf6b3 SHA512 6edafc277a5475a4b44fdf2d77bb8d0a80e8717f74c6db6c0208e0f1492a552f50640503ba8687bcd87a3d677b571dc4f9579b1e5c0bf53059c259ecbcc78c0e
 DIST lld-6.0.1.src.tar.xz 787804 BLAKE2B 6b1d42bf24ca4c4dbfd060f1e40efa106e4adb73ee44a219f1568168b90b2a1430c3bd9c9e7996fda1f90423f8154678d6ee795ba4e179a0a72d86e980cbba52 SHA512 856ccc125255ab6184919f1424372f0f8a5de8477777047e2ab1a131a2ecec0caa9b5163d01409c7c510df9c794f0bc8d65cc904df2baf6462ef53bc163e002a
 DIST lld-7.0.1.src.tar.xz 912812 BLAKE2B 586f869350cb49eec661b72d575686d3627f2e094b492ad1d62ebad2a7aa14cff5582b51713ab02889c1f1bab20b38cfcb038e6753936688e6530f7b044e73ba SHA512 e5d3ed280d8ac6014cd6bbe080b11e2c4ebbae81dc14b637e779ec027d818dbae91c6f0de9e94bcecd6bdaa37f12c35141b5d81f0a15251d27932aa9bebd4047
-DIST lld-8.0.0rc2.src.tar.xz 999024 BLAKE2B 866a36f95fc51408b511392cd48c923b1deb9307d72fae93726c189b78fae9ba0586a1ff188335e80f66a86c8c6de9d1c609deb72ed25438b558a7e4df7a00bd SHA512 ba59b603f83283a75b8b020a339c7381e2397e55165ffe86e194d8c1da5845a1e5187ba45d7a46bb136d69c2fac64fb4f97f0fa5eab1d17232e5f474764cc5f6
-DIST lld-8.0.0rc3.src.tar.xz 999892 BLAKE2B e62141c0d93a762aecd12d72ab8a8fbfeb91896421f356401d1018bd09f713f8ebc73fc3e1a80e4260c413d705ae7f5a51a7009f056e040ab5851909b19efabc SHA512 4858afd97ab605440590c5fdcdeb82b0496e391b2719eb805b799b645c9c3d305c71cf1cf2d9eb37a845903a149d2461a582de3ef97fa9b662c3ad31c5cb1064
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
-DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
+DIST lld-8.0.0rc5.src.tar.xz 999916 BLAKE2B 1c48d0a017e225b62333046a532bf82dec36a1bfbd51b53c30a3d4b3a23de2c5a7efcdf65025cde667e1af25d9858a09b5fa375abee212ffb7782a4e95276af3 SHA512 392d55336f4fb450dd13cc3ffca22c1ad0f856c633f4be879ee55f430a68c1037645b16e4357494d68818bc62d5490e31e3fe8f7f154e8cbac2fde5136588241
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
-DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
-DIST llvm-8.0.0rc3.src.tar.xz 30507604 BLAKE2B c9baaca537d292af9f12368df86090750508113eb7db393fe44c1ba7579df947f0a7092e6ddd4403bda9f9ed75fe8c049f3baf6d8671faa0c91e3267c584893a SHA512 82199841c2084cffe4e86b4f2d5ebe404059196f1f6d000ee69cfddba05d78c4500ad7499615fa67e9774ead6cba5a23db484dd85f752c8d08e8067f7d7b98ca
-EBUILD lld-4.0.1.ebuild 1721 BLAKE2B f3e848199052fbec33376e9630afd80c031cd729457d1e3c302d78c42a128cc7d8baa626ed294bdde19dc2ec00683a01e4e9d5d0f6d893e24a575024b9e92556 SHA512 e971195cbf8976a0bd5140c62c3c4d9a375beaf3813119342f3f8f28db9843e53dc9804cb13b6f1a49a1b7dc60cd631cd69f742faf1de56001f59230625dbef1
-EBUILD lld-5.0.2.ebuild 1589 BLAKE2B ce6f2b7d0b095223600a236432966cbc44d89d781f6fe20b699aeb77b859bbcdf65bab0b1ad37df63918ce95f75c018a5eb9d56605e5d56d057e062399427271 SHA512 16b397e9d580a52fa430b07788a1c73aabfdc3dec87ed8ee12807e231c9590f637966f412a0657a574476b3b27b0a952718c61de955246cc1f585ab4526d49cc
+DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
 EBUILD lld-6.0.1.ebuild 1731 BLAKE2B 94a45353bb5db9ff18974afbbf2f77f00814302af1f146298da97cc53941811b91367aee89c82365e1a712ad7d86b2e8ad0b6b59653e56296c7e45e8ab65a266 SHA512 3985af3b2b300c6ddfade3c848a51f8dd1254f15bc3c51cf4d6a5bf8d655de756c8e5315c5594f65f07530b8d21526367f4397fd9b39f895a5f1e525a3aef409
 EBUILD lld-7.0.1.ebuild 1733 BLAKE2B 8f5515ebfa7e00622c1502882129f0772b3e8c8f3cdb4ecd4b218125bff671992398fa9475b0ed7ceace43a424ce4ff0a534d2f3eb6ab70b5b887a27dcc9ea02 SHA512 ccf1242bb538e4fb270936f9ccf735833a41533867465735b81deb9b5dc224c8324894beb311bbda78f3c46199cc59ef7945dca456a14bcb6c9eb3a454ee20ad
 EBUILD lld-7.0.9999.ebuild 1674 BLAKE2B 14f026b7d86c935329e9909ac9ed73519350e8a845dffd669a1c0c1f1f82c8ef9ccfa06140f25efe78ff765eed2e05a667f495007a2a40259b1e75fb798a48a3 SHA512 6d1786893ec8348de2b8efb675c13672be1d366b108f633adf1772c0b96e3f2574aaf624cd37bca76af86032431589cd3788cca76e5fc64b4aa49a86904498e1
-EBUILD lld-8.0.0_rc2.ebuild 1739 BLAKE2B 1aa87bd4060f26311699cb024b9d0f2ee98e594558efd6f7e6df4dced281ca33ab30f9263e35f3dd22c072380f3da64eb34a164fe38898ec39d33646425c83ed SHA512 0e8a92824da478d1ea8a9f6b80d98521a1919f97aeb62db7c9ab4793e203c42d0cbb62590a8aa228ef2b289b0d38aea2e8a4bf3e05cb2ec959ff1d2420e39974
-EBUILD lld-8.0.0_rc3.ebuild 1739 BLAKE2B 1aa87bd4060f26311699cb024b9d0f2ee98e594558efd6f7e6df4dced281ca33ab30f9263e35f3dd22c072380f3da64eb34a164fe38898ec39d33646425c83ed SHA512 0e8a92824da478d1ea8a9f6b80d98521a1919f97aeb62db7c9ab4793e203c42d0cbb62590a8aa228ef2b289b0d38aea2e8a4bf3e05cb2ec959ff1d2420e39974
+EBUILD lld-8.0.0_rc5.ebuild 1739 BLAKE2B 1aa87bd4060f26311699cb024b9d0f2ee98e594558efd6f7e6df4dced281ca33ab30f9263e35f3dd22c072380f3da64eb34a164fe38898ec39d33646425c83ed SHA512 0e8a92824da478d1ea8a9f6b80d98521a1919f97aeb62db7c9ab4793e203c42d0cbb62590a8aa228ef2b289b0d38aea2e8a4bf3e05cb2ec959ff1d2420e39974
 EBUILD lld-8.0.9999.ebuild 1671 BLAKE2B fe3a570707d74ecca2953d44c0fa144565dc8401ebf1010e42d02fd6ce4206f5dcbd7be59f809da0c4dd155d8841612906d54d425b93480c5d5d3e6bab892a90 SHA512 465911be8df389e238d611e8341e9af6012027638aab97bc81cc5ad4cb55a79805830cf9e6eb6a2db8f708abc515e8a39225643d2f62898619ee55a921be30d9
 EBUILD lld-9999.ebuild 1625 BLAKE2B 2308235d2368d9eb25a1d8ae41eaa6b182475e5d49aeb37ff5fc025cb500d268a2f935b4dbe26ed1c2ab950d082e40030a5d5d39a5e3357ca8610f927ccc0fb6 SHA512 6abdc37eef950c50164a29752ab370e08aefe9db909a4ac2ec1f9eb1e6a8b3fdca8ed776945f0e9b745bed11633b2ff33f1f00853e7fdfd22664756eba839f14
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/files/4.0.1/0002-test-Use-LLD-specific-binary-library-dirs-when-build.patch b/sys-devel/lld/files/4.0.1/0002-test-Use-LLD-specific-binary-library-dirs-when-build.patch
deleted file mode 100644
index 2a7935f76838..000000000000
--- a/sys-devel/lld/files/4.0.1/0002-test-Use-LLD-specific-binary-library-dirs-when-build.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 72b099306f586382a32cb0b37ad6a07dc7cddcf9 Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Wed, 8 Feb 2017 20:08:25 +0000
-Subject: [PATCH 2/3] [test] Use LLD-specific binary&library dirs when building
- stand-alone
-
-Use both LLD- and LLVM-specific binary&library directories when LLD is
-being built stand-alone. This ensures that the freshly built tools and
-libraries are found and used correctly.
-
-Without this patch, the test suite uses LLVM_TOOLS_DIR and LLVM_LIBS_DIR
-to locate lld, and set PATH and LD_LIBRARY_PATH. When doing
-a stand-alone builds, these variables represent the installed LLVM.
-As a result, tests either fail due to missing lld executables/libraries
-or use an earlier installed LLD version rather than the one being built.
-
-To solve this, an additional LLD_TOOLS_DIR and LLD_LIBS_DIR variables
-are added that are populated using LLVM_*_OUTPUT_INTDIR. Those variables
-are populated with directories used to output built executables
-and libraries. In stand-alone builds, they represent the directories
-used by LLD. In integrated builds, they have the same values as
-LLVM_*_DIR and therefore using them does not harm.
-
-The new variables are prepended to PATH and LD_LIBRARY_PATH to ensure
-that freshly built binaries are preferred over potentially earlier
-installed ones. Furthermore, the resulting PATH is used to locate tools
-for substitutions since the search includes both tools built as part of
-LLD and of LLVM.
-
-Differential Revision: https://reviews.llvm.org/D29335
-
-git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@294507 91177308-0d34-0410-b5e6-96231b3b80d8
----
- test/lit.cfg         | 14 ++++++++++----
- test/lit.site.cfg.in |  2 ++
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/test/lit.cfg b/test/lit.cfg
-index 0db879312..8dff2fb4e 100644
---- a/test/lit.cfg
-+++ b/test/lit.cfg
-@@ -66,18 +66,24 @@ config.llvm_obj_root = getattr(config, 'llvm_obj_root', None)
- 
- # Tweak the PATH to include the tools dir and the scripts dir.
- if lld_obj_root is not None:
-+    lld_tools_dir = getattr(config, 'lld_tools_dir', None)
-+    if not lld_tools_dir:
-+        lit_config.fatal('No LLD tools dir set!')
-     llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-     if not llvm_tools_dir:
-         lit_config.fatal('No LLVM tools dir set!')
--    path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
-+    path = os.path.pathsep.join((lld_tools_dir, llvm_tools_dir, config.environment['PATH']))
-     path = os.path.pathsep.join((os.path.join(getattr(config, 'llvm_src_root', None),'test','Scripts'),path))
- 
-     config.environment['PATH'] = path
- 
-+    lld_libs_dir = getattr(config, 'lld_libs_dir', None)
-+    if not lld_libs_dir:
-+        lit_config.fatal('No LLD libs dir set!')
-     llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
-     if not llvm_libs_dir:
-         lit_config.fatal('No LLVM libs dir set!')
--    path = os.path.pathsep.join((llvm_libs_dir,
-+    path = os.path.pathsep.join((lld_libs_dir, llvm_libs_dir,
-                                  config.environment.get('LD_LIBRARY_PATH','')))
-     config.environment['LD_LIBRARY_PATH'] = path
- 
-@@ -174,10 +180,10 @@ for pattern in tool_patterns:
-                           pattern)
-     tool_pipe = tool_match.group(2)
-     tool_name = tool_match.group(4)
--    tool_path = lit.util.which(tool_name, llvm_tools_dir)
-+    tool_path = lit.util.which(tool_name, config.environment['PATH'])
-     if not tool_path:
-         # Warn, but still provide a substitution.
--        lit_config.note('Did not find ' + tool_name + ' in ' + llvm_tools_dir)
-+        lit_config.note('Did not find ' + tool_name + ' in ' + path)
-         tool_path = llvm_tools_dir + '/' + tool_name
-     config.substitutions.append((pattern, tool_pipe + tool_path))
- 
-diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
-index 5293f24c1..9dcb48174 100644
---- a/test/lit.site.cfg.in
-+++ b/test/lit.site.cfg.in
-@@ -6,6 +6,8 @@ config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
- config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
- config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
- config.lld_obj_root = "@LLD_BINARY_DIR@"
-+config.lld_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@"
-+config.lld_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@"
- config.target_triple = "@TARGET_TRIPLE@"
- config.python_executable = "@PYTHON_EXECUTABLE@"
- config.have_zlib = "@HAVE_LIBZ@"
--- 
-2.12.0
-
diff --git a/sys-devel/lld/files/4.0.1/0003-test-Fix-zlib-cond-when-building-stand-alone-clean-u.patch b/sys-devel/lld/files/4.0.1/0003-test-Fix-zlib-cond-when-building-stand-alone-clean-u.patch
deleted file mode 100644
index b1333ac40bc9..000000000000
--- a/sys-devel/lld/files/4.0.1/0003-test-Fix-zlib-cond-when-building-stand-alone-clean-u.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From a7fe305520085cff8e4bec0110d323c4f1ccbcab Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Wed, 8 Feb 2017 20:08:29 +0000
-Subject: [PATCH 3/3] [test] Fix zlib cond when building stand-alone, clean up
-
-Fix the test zlib conditional to use LLVM_ENABLE_ZLIB value when
-building stand-alone. The HAVE_LIBZ is not available when performing
-a stand-alone build. Since the zlib support is a feature of
-the underlying LLVM library, it exports the actual status as the final
-value of LLVM_ENABLE_ZLIB in LLVMConfig.
-
-While at it, canonicalize the boolean value into 0/1 and remove unused
-CMake definitions (most likely copied from clang).
-
-Differential Revision: https://reviews.llvm.org/D29340
-
-git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@294508 91177308-0d34-0410-b5e6-96231b3b80d8
----
- test/CMakeLists.txt  | 19 ++++++++++++-------
- test/lit.cfg         |  2 +-
- test/lit.site.cfg.in |  2 +-
- 3 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index ede92c13d..962274160 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -3,13 +3,18 @@ set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}")
- set(LLVM_BUILD_MODE "%(build_mode)s")
- set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}/%(build_config)s")
- set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/%(build_config)s")
--set(CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
--set(CLANG_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/..")
--if(BUILD_SHARED_LIBS)
--  set(ENABLE_SHARED 1)
--else()
--  set(ENABLE_SHARED 0)
--endif(BUILD_SHARED_LIBS)
-+
-+if(LLD_BUILT_STANDALONE)
-+  # Set HAVE_LIBZ according to recorded LLVM_ENABLE_ZLIB value. This
-+  # value is forced to 0 if zlib was not found, so it is fine to use it
-+  # instead of HAVE_LIBZ (not recorded).
-+  if(LLVM_ENABLE_ZLIB)
-+    set(HAVE_LIBZ 1)
-+  endif()
-+endif()
-+
-+llvm_canonicalize_cmake_booleans(
-+  HAVE_LIBZ)
- 
- configure_lit_site_cfg(
-   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-diff --git a/test/lit.cfg b/test/lit.cfg
-index 8dff2fb4e..85469ff6f 100644
---- a/test/lit.cfg
-+++ b/test/lit.cfg
-@@ -202,7 +202,7 @@ if execute_external:
-     config.available_features.add('shell')
- 
- # zlib compression library
--if config.have_zlib == "1":
-+if config.have_zlib:
-     config.available_features.add("zlib")
- 
- # Running on Darwin OS
-diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
-index 9dcb48174..1fb8d3690 100644
---- a/test/lit.site.cfg.in
-+++ b/test/lit.site.cfg.in
-@@ -10,7 +10,7 @@ config.lld_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@"
- config.lld_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@"
- config.target_triple = "@TARGET_TRIPLE@"
- config.python_executable = "@PYTHON_EXECUTABLE@"
--config.have_zlib = "@HAVE_LIBZ@"
-+config.have_zlib = @HAVE_LIBZ@
- 
- # Support substitution of the tools and libs dirs with user parameters. This is
- # used when we can't determine the tool dir at configuration time.
--- 
-2.12.0
-
diff --git a/sys-devel/lld/lld-4.0.1.ebuild b/sys-devel/lld/lld-4.0.1.ebuild
deleted file mode 100644
index ca675419d678..000000000000
--- a/sys-devel/lld/lld-4.0.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use test; then
-		mv llvm-* llvm || die
-	fi
-}
-
-src_prepare() {
-	# backport stand-alone build test fixes from master
-	eapply "${FILESDIR}/4.0.1/0002-test-Use-LLD-specific-binary-library-dirs-when-build.patch"
-	eapply "${FILESDIR}/4.0.1/0003-test-Fix-zlib-cond-when-building-stand-alone-clean-u.patch"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		# TODO: fix detecting pthread upstream in stand-alone build
-		-DPTHREAD_LIB='-lpthread'
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lld
-}
diff --git a/sys-devel/lld/lld-5.0.2.ebuild b/sys-devel/lld/lld-5.0.2.ebuild
deleted file mode 100644
index a73ea749a341..000000000000
--- a/sys-devel/lld/lld-5.0.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm python-any-r1
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/utils/{lit,unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lld
-}
diff --git a/sys-devel/lld/lld-8.0.0_rc3.ebuild b/sys-devel/lld/lld-8.0.0_rc3.ebuild
deleted file mode 100644
index 7e98b34812a1..000000000000
--- a/sys-devel/lld/lld-8.0.0_rc3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm multiprocessing python-any-r1
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/utils/{lit,unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-
-		-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="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lld
-}
diff --git a/sys-devel/lld/lld-8.0.0_rc2.ebuild b/sys-devel/lld/lld-8.0.0_rc5.ebuild
index 7e98b34812a1..7e98b34812a1 100644
--- a/sys-devel/lld/lld-8.0.0_rc2.ebuild
+++ b/sys-devel/lld/lld-8.0.0_rc5.ebuild
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 1cb206eece4d..7ef0057090b4 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -2,15 +2,13 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
-DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
-DIST llvm-8.0.0rc3.src.tar.xz 30507604 BLAKE2B c9baaca537d292af9f12368df86090750508113eb7db393fe44c1ba7579df947f0a7092e6ddd4403bda9f9ed75fe8c049f3baf6d8671faa0c91e3267c584893a SHA512 82199841c2084cffe4e86b4f2d5ebe404059196f1f6d000ee69cfddba05d78c4500ad7499615fa67e9774ead6cba5a23db484dd85f752c8d08e8067f7d7b98ca
+DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
 EBUILD llvm-common-4.0.1.ebuild 641 BLAKE2B a8543b8d909c48caecbcc423f15742aa56412971320650a87742cf907b0d0d3d143e7caa54b947b592380b40d340bd1957c8df05053f6cc6f932332ce5e71eb7 SHA512 b497a3c7edd56bb634e307a8ad9acecb6f21f2f262ab5f50ee6c9b2bd4c40f0defd8df61ad6f0b0c74222468388cb18d3634e0a0d1662ed4c74d5c2e3db30188
 EBUILD llvm-common-5.0.2.ebuild 839 BLAKE2B d7e6aaba7df7b7da6da5f7cc9cc165b8921758d8969f498f289c5797facfb383c7299617655d8228641e53d02a782a48b22b9c08ea9c3e8e6bc33a842fa24567 SHA512 6647d800604efe1eae94a55a632075d491c11c128bbb7a0903a6b3a93a49f071d74049b98fc4f765d5c7dae9e52de772f127d158e397e9160ef80b3b7dd09595
 EBUILD llvm-common-6.0.1.ebuild 838 BLAKE2B 7c30c7e7e52916af34728e11cc6e00e6add5363974affd53e7940bcbacfb3b7a73bd17d86b29b10684535ced07c0237909473c4500e2439d5824b4cbcf924d7e SHA512 d642ce674d3a0a742e5afaeb97a5e67e5a616ddd18642777dc640c44fc65c9f5d34c5e1398483c062152e87c9ab076b5518ad3ab5d39df9d1ce1331eb2784464
 EBUILD llvm-common-7.0.1.ebuild 839 BLAKE2B cf53a218b327891d8647c5c703470b85f28d60bd36057d9eff6273746af7da0ff6ec8f09589a19c6df46f89359c663cbbca8898082f33a6a58baacce883e1469 SHA512 c02493f7f293c9b500a2e5a68d065053b61ec22f9d1e082e6cf802b869f0097ba2ffb04a7db65dd8441bafc6555c16a4cf6868ab3ce3a3ddd562c92f011dae48
 EBUILD llvm-common-7.0.9999.ebuild 729 BLAKE2B da80aa6feb2e836dc2549dac86659c920be0b8430a70c322d7337a5771963d2cff95d497486904a5e96706002123c098ba446a50925269122c14abdb8cdae76e SHA512 b45c99bc3f1c5ec05df418b2206245159b5604c6780e497f16ce52f50def0d0e867151ee7f6811b5ac72150336f0821dc1c4e56ed1e9302d840dd23b6a651a26
-EBUILD llvm-common-8.0.0_rc2.ebuild 842 BLAKE2B 1c5b84218e67c2b8d7649bcecb64c2f96cb21b7d80be7e7758a1bcd54323c1b9ce700d7cc161bf2989d4e5f7e35c0fa06cdef34fe7050e6ab5e727614111ea16 SHA512 ce9446bb5ed9d9f8352fbd7bcc13e2d06416170e11fd316b0c5567e77ed85a1c7f60d46a5c3417511ddbacf5a26efa55c18e06861c958da06c37abc86c466937
-EBUILD llvm-common-8.0.0_rc3.ebuild 842 BLAKE2B 1c5b84218e67c2b8d7649bcecb64c2f96cb21b7d80be7e7758a1bcd54323c1b9ce700d7cc161bf2989d4e5f7e35c0fa06cdef34fe7050e6ab5e727614111ea16 SHA512 ce9446bb5ed9d9f8352fbd7bcc13e2d06416170e11fd316b0c5567e77ed85a1c7f60d46a5c3417511ddbacf5a26efa55c18e06861c958da06c37abc86c466937
+EBUILD llvm-common-8.0.0_rc5.ebuild 842 BLAKE2B 1c5b84218e67c2b8d7649bcecb64c2f96cb21b7d80be7e7758a1bcd54323c1b9ce700d7cc161bf2989d4e5f7e35c0fa06cdef34fe7050e6ab5e727614111ea16 SHA512 ce9446bb5ed9d9f8352fbd7bcc13e2d06416170e11fd316b0c5567e77ed85a1c7f60d46a5c3417511ddbacf5a26efa55c18e06861c958da06c37abc86c466937
 EBUILD llvm-common-8.0.9999.ebuild 726 BLAKE2B dc1acf8df7298c6a658b6b4c9d11335363c2e8be2c437e414a7379c104ee8300f52375c1c20e441edf397558b73e5e37099ad421ef43869625dc79e58c85e165 SHA512 cb7c4c44f573c2b4918fb40e2db5d92937ec6079e68ae832a4419382487996ddca833655beb3a1e0b433d69ae96649995d77890d4c2f88b010f3d613c8168dc8
 EBUILD llvm-common-9999.ebuild 704 BLAKE2B bfcd46a0c3754d0c5542eb1b03c8696ef355ebe34e94c98ab6a23442a88bc6b9a8aa8d2c89b18ed0ceea47bd2adcd7df67c8d201876a04ba7816257f83c53706 SHA512 4a7fd7260e93fa3b44a565c915a8be2e207085a506018b97263740851fd78dacf88e582b73d74a06aa36de2975b751c258ceb7997a5e6ee7db4d404fbed865bf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-8.0.0_rc3.ebuild b/sys-devel/llvm-common/llvm-common-8.0.0_rc3.ebuild
deleted file mode 100644
index 1c597f784d4c..000000000000
--- a/sys-devel/llvm-common/llvm-common-8.0.0_rc3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=llvm-${PV/_/}.src
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/vim" || die
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
-	# some users may find it useful
-	newdoc utils/vim/README README.vim
-	dodoc utils/vim/vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-8.0.0_rc2.ebuild b/sys-devel/llvm-common/llvm-common-8.0.0_rc5.ebuild
index 1c597f784d4c..1c597f784d4c 100644
--- a/sys-devel/llvm-common/llvm-common-8.0.0_rc2.ebuild
+++ b/sys-devel/llvm-common/llvm-common-8.0.0_rc5.ebuild
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 0ffc034dac5f..4501275eb205 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -6,36 +6,6 @@ AUX 6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch 4263 B
 AUX 7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 2626 BLAKE2B 6c3afe6941568119b6bbce1c66be913a29a2ac7853a881804c1c22e981075f1677ca7e4744738ad858f58a58c1a7295aeb5f1d87b3a2b2adfb971a54d76c04fb SHA512 34a84427c34fa8886f55e05cf0ffce258cdee8e98190e070eb40dc555a30784c49ebe4f946f7ea51b7d00fceb8071fc745007250dc5b5a61c4d2bb9910672ec5
 AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 1188 BLAKE2B 72311a8da991b9f3b98523baefe6f5b31aa7f9101c388f35484dd5f384a08e838ea42a17447ca17a0dfe6b7d3c20abbdf0e8afee72e8ad5d46ec38b8d55307c8 SHA512 0ada997db2a0eb875105fb212dc3fc3077b9c4f7804d78c33c4b1f512bf1267295f325153ae14c00404c86e576ae1c78a6aeb0a57d1d4525aabd1169c21806ef
 AUX 9999/musl-fixes.patch 1258 BLAKE2B fe275412bc908884239ea71de9a9ddf1d2f64debaa1a9ada18170195a7775c41571600ed3666343bf967aff5f9117900f73155f60de5077bc4584cfc2f782f53 SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f
-DIST cfe-3.4.2.src.tar.gz 10612313 BLAKE2B 6a5d9f20d181b217f3ca72b6585bd953150cc0d207a203feb24aa9cb9b2e341ac6a2e152a1c40baf2d53e5a52c4e4e86a518a329bdda39c08986b3437b04cee8 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d
-DIST cfe-3.5.2.src.tar.xz 8268008 BLAKE2B 9444f44e5d2cc8b83832bdb820c79fd9a8d5c9e5b0bc29d1213c10a60e3ef8ba9160c68cabfdbf6ae3eac804cc64b4a539274f5c83baee0059fdfc96dedeeef9 SHA512 2ad9a7daa8e62cdbf47b001aa6b937a06ae7e6396dcd1832797e2d98036522443ccfca9f1253e16d531a99d1edf237fcd2b457c55491ff68ca4534a2396ca52f
-DIST cfe-3.6.2.src.tar.xz 8617576 BLAKE2B 02a162d7afa32d25e77618ef890b81f532eba87369611dad332943be5460ff747ede3cb53d2d66398243341ecd1ecee0c5ee2e72ff8ca5ea744d2655946fc934 SHA512 ed837c48f38d8998efd675b56477c8681dcedfcf3f71bba65930f145501289bebb6fe6a6d9de336548f94c381d016b99f10c58e046b885449755d44ac782de03
-DIST cfe-3.7.1.src.tar.xz 9110616 BLAKE2B 9df6971afbfc1384c537f384b808f4af6914d3bf32f11017f08bec597e9cc535a96660aafe042a99cd8e450adb5555915392a6098d423993856ea7a1f8e4ee10 SHA512 8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5
-DIST cfe-3.9.1.src.tar.xz 10363080 BLAKE2B 6f6cfe80ea0344342f070d451dabd41b9cf58962ca354f495868821173446f8a08c5a69819f0c5d20b4f49019036fa4a238838b224a1e55d5ac805668fc837d5 SHA512 3f0eea194597e438bbe49ce9ef5fdced81459c21cbdd2653750b2fe02c55a0154d6a33a8cfd02e607b83314a8e35b2c300f944462120ab6de1d4139d85db56b8
-DIST clang-tools-extra-3.7.1.src.tar.xz 277476 BLAKE2B 19ed7feb1a558f691af0d0735a3d0f2dc2b80f06cc5ad0ae9dd8dc0545b38d35cd55231d73c0c7c8abe96d045ba4077f5c8c98a454a73a30a00c6a2415bedf46 SHA512 06e2db8af75f1e6ee82da6ee723b5256b9e3f6ba196428f18944ec02d07df26d04329ca8824a083c5f25274ce7e3469aa75e3a29ccfbdb6375524841d65e3ad7
-DIST clang-tools-extra-3.9.1.src.tar.xz 456464 BLAKE2B 32cbb7d5282e286e0bf9f8b1e9ecddc5401b78fd088b1302978e0f6cf71fe864ab47eebe81bdea59ccd49122e6d2ef2281b5bd52e97af5eefdbd5d7da9550f5f SHA512 5691fb09f80b519876cdd2e82ad23a20bba32a0bc356e15e6db631b2936763911f15ff55f8bf5f073100b9e4cf217f08fdce90ae98ef0e084274259d3cfe9634
-DIST compiler-rt-3.4.src.tar.gz 1858593 BLAKE2B 3e1107b3056b9eaf33ffa0786db144a006f24c0bef2c525e722d2946d0cc70b16aa776a68d1b668671925951efd270b733820085ca310c538892023a780361b0 SHA512 70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8
-DIST compiler-rt-3.5.2.src.tar.xz 1093000 BLAKE2B 633e18ba17f1df077a06089bef5cd495f8b639981330083c300de2e2d31f2033e882fb17286d5c7e13b31b78d24a60e354daacbffebd98d6415b811ad089e0d2 SHA512 319a8a1dbe07eb4f1fcccfe79a1fa445f348fb854a441500e89fa0a128e45716b65d06347f19a63de32e9294cd2331e914ae0d5fe8224f0b2452c39b79ac96ff
-DIST compiler-rt-3.6.2.src.tar.xz 1128080 BLAKE2B 934bc3fb139d0a3a82e7824256ebbf524a8298bf5872a89351786585854a09739071fe53f319815b45aca03f1d8ba0d3cc0c2ad8e3cc529fbaf6e180b33cd2c6 SHA512 7dafcc5bd4822475de649d8a84ae51af3c4ed4d0958f76b1b55ba79219638f3e78eb94a1986c6e9ba0e7f1ccf3ec834d546b5ca60e8b08083fea5880ecdf17a3
-DIST compiler-rt-3.7.1.src.tar.xz 1181772 BLAKE2B bcc11ee67806bc3b65690a7828f46f9fdc52992f30ce7159045ae21d916de4cb16dd8047913101a56b87c4496872c37e37ce0b54fa72b681a4a369b1f861b070 SHA512 bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325
-DIST compiler-rt-3.9.1.src.tar.xz 1376372 BLAKE2B 1c7391a429329591d96e474c9ac5b36672a8d50dc621bd21a9e97035811d85293981e98ada1c3284f9d05115a1113086ba3888073fc3b76e09f83614cd7d37ce SHA512 91a4c78a5e8c1cdd2d6bbcb27d2c34f49ea30a952733444ef4f4a7cc7503c880d4b6924595e87745ef6278851178f49f98d38d2068975d4fb6577fb9e9cdcdbe
-DIST lldb-3.7.1.src.tar.xz 10650524 BLAKE2B 432e7064f4f48b62b96c80ca184fc2a69ac7e2ee62d14020017c01659aa15299b5f5c47852855b1ff12606d264c1cccf9a31b5818909dd779c8f353df62d12dc SHA512 d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1
-DIST lldb-3.9.1.src.tar.xz 13750816 BLAKE2B 40bd2797e1e06f600cdd88ba56af8e3c315cd9f2bc2ca12c3172623ae16750f051f9e6d76df354a3fc0c6a4fb802fa842952e1ff1d47a28f5cd218546da89563 SHA512 e2957a1da60284595b21c205b07fa3db5c474bfad1935ab8e1bc832f30af497e9eb709efeb703591ef62e7dd73a28d22fc21398097a232c8a729946d72eb5df7
-DIST llvm-3.4-manpages.tar.bz2 33753 BLAKE2B b6a57cc492d133eddad08507521395f8c4cd6c7609b6134e61c330045d68a222bee88f8d0ab7883654db55157b185b59690ca3024957ddaaaa3054fcb9ccf831 SHA512 8e438a9392c9b896ccb2b1460a8f57ffa01633e3a6bba61e2bf2f718d970ff96c17d63b0bc0d4da1162e1d1dc4cb9b2a9e9a14a722e8a5b5d2f205f037ae665d
-DIST llvm-3.4-patchset-darwin-leopard.tar.gz 7704 BLAKE2B a46dacae703b19ad2876d3f1f4f59ca12be96e2368d35d2578d4d67e4ea28051e37279e79cd5169f63277ba4d591d2ac8baf3a6f6af6b45e1019c4aa83f1515d SHA512 1f34ef6a20fe09e6de473bd15f9ef30e3d7a16a5a9fdb62d88d1ac22ffc31a2a7814e0a2e677b21dbf0865241786aa2b8b4646737cede1765c8f3c6b5202fccc
-DIST llvm-3.4.2-patchset.tar.gz 4612 BLAKE2B e7be0957dac5ceae7e81beef2dbb914554809095fd4857d45809b00ae06f297649f8a5e7baaa1602b711b678120ca18aee1f60413136d0572c8226f7fabae03e SHA512 32c7cf229a6a8917f0fc67efa1fb11994945281f6906395cee7e5c51399c8fb4c06f554a03253c8f9073890a7bc7af151a8adfe887ad62f45f1523e6e358f769
-DIST llvm-3.4.2.src.tar.gz 15938155 BLAKE2B 51b2f5e04f448d71fdd757a84c71157de0f9958aace6e8837971e3c62f2b017387b1bc8b310bacfae137b48501d25be8decb4ffa3caa7fcd0083a73c4c65949e SHA512 6c1453f7d9d9110257db3574cc4f6227fed8938705cbb09851ac09a868089b48f1556a1b6e758aff6d97520b08b5605d3ed20411ad9dd22cdc573d62176905f0
-DIST llvm-3.5.0-manpages.tar.bz2 35314 BLAKE2B 5368ddc4471d4ebf7e6f2bbd6525293dc8f6300fecf9a303e344b4e5415e5e04e9a9d0fbd636b2a1b554e8a55a69e4306842491ad3cc7c4c227b6ac35f52cc8b SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3
-DIST llvm-3.5.2-patchset.tar.gz 4568 BLAKE2B ab7db30375f497a41e2cd657a628bddf621ccaf48042dbdf29b7bdec0c5b11b2c0dd2d99df72dd9b5acb01b7bb3147f2b91844984be2f842fb115149f61cf0aa SHA512 6df5a61d3e949dbe9840e713eb90e7514760c5ae68e241494d0246925015ac7e9d73671dd0646eb44d2d9232665027783d02c00639f41385615ec541d4e2fa93
-DIST llvm-3.5.2.src.tar.xz 11876128 BLAKE2B 05700e6b162beddb246077507147c30cc36f334f4c3142225b038104f674cbb40a3fe145ba82724196ec995235c137fd132e1f98689f77b102c722a84300e069 SHA512 0f6a83cc61a385387e7baf8fb8f0d9f18e3fd00d2d389a3c7e2c3792be7d82ed095506cac52c24e65ae3c1f94456a441d39440feef6125e25ef18447ec9dd406
-DIST llvm-3.6.1-manpages.tar.bz2 38338 BLAKE2B d5d385e55c3817e8b25dd33178929d9bcbf59cb8390ecfb44c83c58c3bc1e7c2aae2b0969da4f4f5dbe6b052ab802e00c48f3fb68c6548bc4c8647f5fe4687f9 SHA512 a47aeb0b4632329eaaa1d6c774446fea5822d7692d81533a9a5c5de1c6a3b37fdd6b7c1fc6433339649f4d3a53a753065e73afb30fd84f253ad31d5fb3d48662
-DIST llvm-3.6.2-patchset.tar.gz 4562 BLAKE2B 76b7c01e54d5fe154e10478aa6fc8a414458baf3939b71d8a2fe5787c52b7d28bdc07a7eb4b1c00ec4c2da4cdc6df75b49ade528f4451a1e4ee0d31940fab033 SHA512 6018e7d96317e6a46f373259430782a1377193ab64b337d5f6720a4ffe0eb0891e7e9373fb9c20da66e840f07e52f2bccb2a8c51bb55ded0f124748796cce1c8
-DIST llvm-3.6.2.src.tar.xz 12802380 BLAKE2B c9ac1c83d99efe5d673a41650b587584b6233420a9d1e02a5cfdc0b7bb99b761ddb3fe48677c8bc0714734af06660a72daf96936057bac19f3e41645404d347b SHA512 42b44ce69cfb96e2dc12dc2246f0de8ff983a99741206e2c46ccf074b3248aaab9c0f22c6baad802de851d06f202f40db9dd62fe38aab4479b3f70026c936b36
-DIST llvm-3.7.0-manpages.tar.bz2 38095 BLAKE2B 67be777ceba745fee8a2128de05d2e22b1eeec275afb24376891dcda90dbd2486e58456248934b1cfaf907a80954c7ee537fe0d69bb87db167401f41c404212a SHA512 ea70ac15dbaef3740b31f66aa798338f7f9b82484586582aa62e0364f9d74bf175be2f4f29721df253b8157c1cbc146ab9045c0656c42a6375434e994786b643
-DIST llvm-3.7.1-patchset.tar.gz 17234 BLAKE2B 93e3676c9b1a34462435a376e35f0768d57e4db1001d136864f99b569c0235be7f51c21491f9792e7169e221de1e9faeb728928b8963420bbb36234ff28b4eb7 SHA512 030dc7f72d11fcd53307f707d5dde321054feb0f0977601c3e188a37f2be6c14bfd05482d1c1e5f435aaf32ca7c7e3701cf5f1375fbd0cf83cf8afbad7f4f6be
-DIST llvm-3.7.1.src.tar.xz 14592544 BLAKE2B f3a197dec9a397be02d2c55d73624352cf1474d935ca6dac466f8f44de0990c3f37b10a598fa2e871dfa27d3506087826dfcd23cb19bbd700cec54141c7d35fb SHA512 ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90
-DIST llvm-3.9.0_rc3-manpages.tar.bz2 80007 BLAKE2B e770497834a5863f5c988d3bae8ef0f7e5551a505d2db9557567976c10fbaa68fb6013f9136db2123e626a99046b47ea5c0d62e1ea830d998015a1f67f67eeb9 SHA512 f96c340021de3f096ec3ad7d51a6af2c7a84974122d1df15729a39d4f9d65452f063a85ab38adb064288dc14220d9cc679b31ee19b48424d3d7cde621ff37597
-DIST llvm-3.9.1-patchset.tar.xz 16404 BLAKE2B 9c9d630e6c6a70ba6a026a6ecb7a7d29a567e6b85fc92ce128a8129006ccad44defc07a46351dfa188128a91d419696f6c36a0e184a04f9d1270d5431cbd59f5 SHA512 dcae89ba910b5195bb455924242912f526b6994f0f236571b6364fd594bf9ca03cc74e116a44ae4372e34ce63b21f1351125157e7af7a957aee115f400b54089
-DIST llvm-3.9.1.src.tar.xz 18130436 BLAKE2B 90afd2c06e612132bbc84c29fed59abdfdaed41f8a7590e3f60ba5072179317365f15f301f577ba050b78797f682bef8fa85ebad7391fd3e67b46eb02a5df068 SHA512 50cbe8ee911080f586e77861c442348701bd02e2de0c090c54c34f82ac275ecfcd712af0f41e387c33b4a6057778a4258a27554292fe68ab4af3fd9dd6d90683
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B e7282e84578631d88549bdf34e5a44e0294e47ef1fee29c0cb954d7afd160d4b6a0f39bb3bd53791ea53503a60eaa0ada0a512a63d696ff096dc6f21f4aecdc7 SHA512 395ea2b13008e222c034e2bdd8c2bb033b9c01e61fb89c840f009f6cddb499b317df8b061d29f40968d8f0df5540a2f4a9de31eef1de886796c8c334f37254eb
 DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492ccdc9fd2c26cc7dfbd8fb2b9e68418ca8fdf42cdc303c361e649cc6939bf5229cbad017bdccbd5d791e92752328252f SHA512 568615bce5a75d42e4b6d592557472d366d49a99f8e81be10ae679804f1fe674c7fd0bbdac09af44fc67ee5aa34c4ed2153c2767c536ac8e45dd15c811c92dcb
@@ -44,22 +14,15 @@ DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df545
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.1-manpages.tar.bz2 121157 BLAKE2B d209e292dde0b528bca6e6438eac83d3a762e83fb333fa075f973806ec802a19e24ec6f0212fffe4757257f2840a5f00960d121024db2d8ab8b99d95bb42b1da SHA512 56dce233d17c4c3c1e4860f31d30e227364c99f04527e8e8372f308e30d09a297ca21a37b4eb2eddab69bee88ef5867446affd1ccd5d7cb1c12d9c9002a1101c
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
-DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
-DIST llvm-8.0.0rc3.src.tar.xz 30507604 BLAKE2B c9baaca537d292af9f12368df86090750508113eb7db393fe44c1ba7579df947f0a7092e6ddd4403bda9f9ed75fe8c049f3baf6d8671faa0c91e3267c584893a SHA512 82199841c2084cffe4e86b4f2d5ebe404059196f1f6d000ee69cfddba05d78c4500ad7499615fa67e9774ead6cba5a23db484dd85f752c8d08e8067f7d7b98ca
+DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
-EBUILD llvm-3.4.2-r100.ebuild 7682 BLAKE2B 5915477569456fae852c4e6f29ffc405ced369e0cbaf9c2da54b3fa2b09237fdaa3afcda77df87534cf8c4343cf2f886e77a95e27e9861696395dbcad42fb815 SHA512 152d9d8167a153b3273a4e8c670eb50cd267354cc925584a416738de104f72bf66bc42d55a672c09e8d80c475ddcb254aff71878384df2266c112259d0822d69
-EBUILD llvm-3.5.2-r100.ebuild 7837 BLAKE2B 224f7bf982e0f65a512a873e6eca951d05d4e81e7ae636e95d03308c19faea77016357207c2e4d2534d9c4de561a7ff5215f37e9d02e6c6c68aa02191f63610f SHA512 3753dab4281fa0fd5061a9b4231e6fceb567bf40ac89f3bc9b2f52164e21e1b6283d3e6bb48b72dc8dfb0c21a7567ef0661d1a820943c032bb3a6ebdff59c5c9
-EBUILD llvm-3.6.2-r100.ebuild 7982 BLAKE2B fd247bb8877a421ec4f00ed499cddaa982ab7662cc31ef145bbc6e49c177df32f2d3e55090b4d63b12d8a83103b17cf9179edb0504df22e88a8861ea5124e80e SHA512 4a1673e289d67385d2971f367251e1e301e30be59d8931f2c73ed9ce6708fee0c993a11a243f134101f5e2fffb662cad09173791ad80a11e052c073ee6f48419
-EBUILD llvm-3.7.1-r3.ebuild 16385 BLAKE2B f29acd644207060f840d89ba9a85a16f337d18d0347054408fce366596357e2a65c95a1f462e122faa884c1b2b9887ba021d9149c10a6dde7aa0ef74d74a61a2 SHA512 6664a96890b4ca82471f039f451b05212b11df6061257522caf94ce59e282e500d9fb514bbc3525fc3eb40c0f1f234a96f39407494d1ca0862b5cf3dfe91d7bf
-EBUILD llvm-3.9.1-r1.ebuild 16317 BLAKE2B a4edb45656ae073f618d899787a339b0c5e7f8f0bab9a5030c33c85ba9761e9e510021b139aebc422902da55bf5b1ff2caf5c66604f338768eed359ad8bb84d5 SHA512 ee31d4f2612a413aafc906880ea4d7f06c276aa4a0dee9635ac9ec076539ee14c82ce4cc81cd689f6812ae74eaa421ca8648d3d143d5ec238aaf602692f99434
 EBUILD llvm-4.0.1-r1.ebuild 6989 BLAKE2B cc642b77898de0b10ae66679acc9c76191abb11cba1d2f3f7a9682e46696e7cee876875e53cf9b20355c81a096e0bc65528b23946e49a913bb5fbdadfe2fcaad SHA512 81a34824986c8c77863a8eeff9bc6671870c2754c5f2d8770bd05853b10ba5617a2917354c9c35a49a934f318b37b6e176fd64ebc5ae95c289920eb56a3817ce
 EBUILD llvm-5.0.2.ebuild 7799 BLAKE2B 85d9788489be3d3efc7494329560a7886e56605b58d3f46b753ad31f61a3878df6b29bf2d27bae07b20ce70dcdc3fcb772523f05ba654daedc22488c317c336b SHA512 5d1a2f25328283a314dfeefac9fedba6008b0b1c1233bd72a9d8caf7e2c9db7ec73a5b95b9dfd0546ee108974b8b11b83f4267ac739f0a2554728f13bc6b6c32
 EBUILD llvm-6.0.1-r2.ebuild 8173 BLAKE2B 9b735e8161bf235b538e6ab375ea17b428cb5c3fe8e601579d934f303d9c63820c08d571e4cdf0bfe7170114e294addef772a08658ad2994ea1e93c5d5ef7647 SHA512 666cdef4c47272819e26a0cff741d5c0a173ce4dba56dd8c4d0409c522230ce80b07d80be577972e8001d82f11ea81c150dfc240e1f01001dc0bd90593c3a63e
 EBUILD llvm-6.0.1.ebuild 7824 BLAKE2B d816d77974b826836a9aced3387b6a3583859d15b7b8c83499b5f5eb04932ea89966af4b49ea5e2b320c997051891387dace2d2d84bde8f2c0d6f3b26fea55c8 SHA512 bc460c9e7bee704c2d814c9911398d5125196337f410489396a9254d79b2d421c2ca33ec350b3342bb073c761d2e180e73eb474281af3aca2194eb291ea223ed
 EBUILD llvm-7.0.1.ebuild 7720 BLAKE2B a1a0f4e79ac4728c84f13801997dd49472d385c0df5eda400988480aacb2ed4e282db9ded6d2444135f9a2cf37dca9f05fe7974a02595c922ca42e2cecd7707b SHA512 1d1e17afe9153f96a18da9533a58b6543d8874a0bfac66ac603bcb078ee7af4f83ba5a4558e6827656e5aaf3a7f81518bfe0b6e0485dea6ef19ec0e5ca9adc61
-EBUILD llvm-7.0.9999.ebuild 7410 BLAKE2B 1e55f001db2f018dbcf0b8eb268b4174a10e10cc0def90b37f462457bfce89c8f2001932770f07ad527e2a28d13aa0941ac962bf535a54076792646ae3340ca7 SHA512 f7e5966be7d4b688e48cd67faf87ea6ec2f1096c067db6958381b5cb2ddc923bf79eac922892d271283d99df9cb6889f4d442f7ecda9155d406d5003abaccaea
-EBUILD llvm-8.0.0_rc2.ebuild 8546 BLAKE2B cb40aef5e64750b27fcfb7121b42a527fea2d80107eeceacb2e8decfeea40a510196f553585baf65cbbd45ff1e3fe6279cb881376f026086f3f8bdb12bf20c8d SHA512 e0730113fdabc2d1e765c80cd2381e454f97eb87dc64b30a39eba5c1dcc4d58606bf82724f608baaa61305e1d823c1608b6ffdd977d843798448569c2c71d538
-EBUILD llvm-8.0.0_rc3.ebuild 8546 BLAKE2B cb40aef5e64750b27fcfb7121b42a527fea2d80107eeceacb2e8decfeea40a510196f553585baf65cbbd45ff1e3fe6279cb881376f026086f3f8bdb12bf20c8d SHA512 e0730113fdabc2d1e765c80cd2381e454f97eb87dc64b30a39eba5c1dcc4d58606bf82724f608baaa61305e1d823c1608b6ffdd977d843798448569c2c71d538
-EBUILD llvm-8.0.9999.ebuild 8223 BLAKE2B 2e30e777d023ddd2ac4bc57029358a8fc312bbd6024fac1e26ab60970b54efaf1ef361674f257558528dd65f461f537a5c6e62c3d2f3b9ae2ed2b00ca009e7cc SHA512 c9b919165278d7a2104f0bf93e1db08cc52321a1bc30fbdb0a0dd4fa85d7f1de75ab870a4c980a0357b3dc92f5e12b62bdb0a9f140dbd19ec8f6793493daecfc
-EBUILD llvm-9999.ebuild 8530 BLAKE2B 319395250daaf2b3d087c8c5321557746917ffcdfb96e8bc0d27dba9a671935cdb2d3c65045f1a3a3f964e2de8ca41a381082bf075f822ba59010fd7e8f5d02a SHA512 662e75b9022bcec745a52a45c26d914e4b2511e330ee67402f77ad6c5d20bb4241bc16d73d09c3002291ec494df8a49bf36279b0acb5bc0a7e3ab3c51f2a1911
-MISC metadata.xml 3022 BLAKE2B bce3df757f9f5639bfb0171321774084523f1f86b22d73fdc577b73ef8765c13f0b32118905616e8ae8505dd7e8820039d9223c33e209c53c354db82c35b4ec0 SHA512 27b6955992b03981b5bb91d358686ddbeac8d97d1b55b5178209acb22d7efff04c34b463ee2fdd5882b66569c97973f2dc39a8f12d5b4342040b61d59a449226
+EBUILD llvm-7.0.9999.ebuild 7474 BLAKE2B 5e4b8cdd350d479f4a4d61a5489f52933d0066b558bbaee7fb069d7722a2552fd9dc64b3124e8d928339be6ac6d89135a75c67a95c2225dd4fe520d10477d532 SHA512 aeec7bcbad7195bf56415e3f21fd695a345b85dd3f17eab664fa13ff4d2b8cac3d53ad10d1e031bd2aad30edd35a5cdd71920a3e7a05ba40bc73684532904e61
+EBUILD llvm-8.0.0_rc5.ebuild 8610 BLAKE2B 9619b03f6ba9fe3e6a03b50ee96832b2738a2c7f165ca8f05d7765fa57fc45a4c51e5950a7e7cd33b74860518b0e2e8610b2c8285e7660d76e7873867293b494 SHA512 ab43af7510a851c05a2479ac284d2611a8305f5b3e89442b182005a60014096497854735323ca3de8ac04b3681e930e36ff276bd6287df0f5411e4353a7c431d
+EBUILD llvm-8.0.9999.ebuild 8287 BLAKE2B f16ea055de8b30b3b48abea1bf09518f7b0e251ec619b6bbd138ecefc1ab1ebbac266b711cc29eff898af5ece4a3d92a7770da9d808a7ab57d1dc004815c353b SHA512 3e7ea0388dde9873d52d09106fab447b8f08a87a0e2c0eca2361267171b8910c5d0b5c26e74114c2b1a3858d12ff065661ec69db9f85580d97ae8f890723627b
+EBUILD llvm-9999.ebuild 8594 BLAKE2B 4e93b03797de0e2ac808a63e3d9ce4e12eb36b452b2db09d45b9abab225acf1b7086ecf1d1c24a1e48ec072ce54a849b057ef767dc38046d9877a3e8d7a332e4 SHA512 174c1bf850a174e140669869620b528bc8aed8198277e168aa36f9d34566524b38ef1308016ec091e9b3f0c5d7760988010dd41c45500ab2e57511e097b05b20
+MISC metadata.xml 2471 BLAKE2B 681c200c5f77cdb7a21c2b9c3c2872b020794b18348cca171830c52960519ed4b84c943d6f7eda9971897a04e633808a987604037f09b7350a8c8e6c3a0e0ce9 SHA512 87bfcc7022a9e6ba3265a18c13b6372b95137c74f82831c659452ce4a7a2126ac176d85f9e424f45bdf19044e83fb9f0221eb1db701736803236216d526261dc
diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
deleted file mode 100644
index 5b59202f3591..000000000000
--- a/sys-devel/llvm/llvm-3.4.2-r100.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils check-reqs flag-o-matic multilib pax-utils prefix \
-	python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.gz
-	clang? ( https://llvm.org/releases/3.4/compiler-rt-3.4.src.tar.gz
-		https://llvm.org/releases/${PV}/cfe-${PV}.src.tar.gz )
-	https://dev.gentoo.org/~mgorny/dist/llvm/${PN}-3.4-manpages.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${PN}-3.4-patchset-darwin-leopard.tar.gz"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend (disabled): ARM.
-# 3. MD5 code: public-domain.
-# 4. autoconf (not installed): some undefined M.I.T. license.
-# 5. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0/3.4"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang +libffi"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	libffi? ( >=virtual/libffi-3.0.13-r1:0= )"
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-apple-4.2.1 >=sys-devel/llvm-3.3 )
-	>=sys-devel/binutils-apple-5.1
-	libffi? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99
-		!>=sys-devel/clang-9999 )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-S=${WORKDIR}/${P}.src
-
-check_space() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_unpack() {
-	default
-
-	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
-		|| die "symlinks removal failed"
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-3.4 "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-	fi
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}-patchset"/nodoctargz.patch
-	epatch "${WORKDIR}/${P}-patchset"/gentoo-install.patch
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-runtime-gcc-detection-v3.patch
-
-		epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-install.patch
-
-		if [[ ${CHOST} != *-darwin8 ]] ; then
-			# Darwin8/Tiger-only patch
-			rm "${WORKDIR}"/${PN}-3.4-patchset-darwin-leopard/0006-* || die
-		fi
-
-		if [[ ${CHOST} == *-darwin8 ]] || [[ ${CHOST} == *-darwin9 ]] ; then
-			EPATCH_SOURCE="${WORKDIR}"/${PN}-3.4-patchset-darwin-leopard \
-				EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-		fi
-		epatch "${WORKDIR}/${P}-patchset"/clang/darwin_build_fix.patch
-		epatch "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch
-		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
-
-		if use prefix ; then
-			sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-				projects/compiler-rt/make/platform/clang_*.mk || die
-		fi
-		if [[ ${CHOST} == powerpc*-apple-darwin* ]] ; then
-			# set ppc as arch for compiler_rt
-			local arch=${CHOST%%-*}
-			sed -i -e '/^UniversalArchs/s/:=.*$/:= '${arch/ower/}'/' \
-				projects/compiler-rt/make/platform/clang_darwin*.mk || die
-		fi
-	fi
-
-	local sub_files=(
-		Makefile.config.in
-		Makefile.rules
-		tools/llvm-config/llvm-config.cpp
-	)
-	use clang && sub_files+=(
-		tools/clang/lib/Driver/Tools.cpp
-		tools/clang/tools/scan-build/scan-build
-	)
-
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	# note: we're setting the main libdir intentionally.
-	# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
-	einfo "Fixing install dirs"
-	sed -e "s,@libdir@,$(get_libdir),g" \
-		-e "s,@PF@,${PF},g" \
-		-e "s,@EPREFIX@,${EPREFIX},g" \
-		-i "${sub_files[@]}" \
-		|| die "install paths sed failed"
-
-	if use clang; then
-		# constantly fails for a long time, likely due to our patches
-		rm tools/clang/test/Driver/cross-linux.c || die
-	fi
-
-	# User patches
-	epatch_user
-
-	python_setup
-}
-
-src_configure() {
-	# disable timestamps since they confuse ccache
-	local conf_flags=(
-		--disable-timestamps
-		--enable-keep-symbols
-		--enable-shared
-		--with-optimize-option=
-		--enable-optimized
-		--disable-assertions
-		--disable-expensive-checks
-		--disable-terminfo
-		$(use_enable libffi)
-
-		--enable-bindings=none
-		--enable-targets=host
-
-		ac_cv_prog_XML2CONFIG=""
-	)
-
-	if use libffi; then
-		local CPPFLAGS=${CPPFLAGS}
-		append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)"
-	fi
-
-	# llvm prefers clang over gcc, so we may need to force that
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${conf_flags[@]}"
-}
-
-src_compile() {
-	LLVM_MAKEARGS=(
-		VERBOSE=1
-		REQUIRES_RTTI=1
-		GENTOO_LIBDIR=$(get_libdir)
-	)
-
-	emake "${LLVM_MAKEARGS[@]}"
-
-	pax-mark m Release/bin/llvm-rtdyld
-	pax-mark m Release/bin/lli
-	pax-mark m Release/bin/lli-child-target
-}
-
-src_install() {
-	emake "${LLVM_MAKEARGS[@]}" DESTDIR="${D}" install
-
-	if ! use clang; then
-		rm "${WORKDIR}"/${PN}-3.4-manpages/clang.1 || die
-	else
-		for tool in clang{,++} ; do
-			dosym ${tool} /usr/bin/${CHOST}-${tool}
-		done
-	fi
-	doman "${WORKDIR}"/${PN}-3.4-manpages/*.1
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	local lib= f= odylib= ndylib= libpv=${PV}
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eval $(grep PACKAGE_VERSION= configure)
-		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		libpvminor=${libpv%.[0-9]*}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib BugpointPasses.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
-			# libEnhancedDisassembly is Darwin10 only, so non-fatal
-			# + omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
-
-			ebegin "fixing install_name of $lib"
-			install_name_tool \
-				-id "${EPREFIX}"/usr/lib/${lib} \
-				"${ED}"/usr/lib/${lib}
-			eend $?
-		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
-			# omit clang libs if not enabled
-			[[ -f "${f}" ]] || continue
-
-			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
-			while read odylib ; do
-				ndylib=
-				case ${odylib} in
-					*/libclang.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libclang.dylib
-						;;
-					*/libLLVM-${libpv}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
-						;;
-					*/libLLVM-${libpvminor}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
-						;;
-					*/libLTO.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
-						;;
-				esac
-				if [[ -n ${ndylib} ]] ; then
-					ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-					install_name_tool \
-						-change "${odylib}" "${ndylib}" \
-						"${f}"
-					eend $?
-				fi
-			done
-		done
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.5.2-r100.ebuild b/sys-devel/llvm/llvm-3.5.2-r100.ebuild
deleted file mode 100644
index fc7b03e22ba8..000000000000
--- a/sys-devel/llvm/llvm-3.5.2-r100.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils check-reqs flag-o-matic multilib pax-utils prefix \
-	python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( https://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		https://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz )
-	https://dev.gentoo.org/~voyageur/distfiles/${PN}-3.5.0-manpages.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend: LLVM Software Grant by ARM.
-# 3. MD5 code: public-domain.
-# 4. autoconf (not installed): some undefined M.I.T. license.
-# 5. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0/3.5"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang +libffi"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	libffi? ( >=virtual/libffi-3.0.13-r1:0= )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-apple-4.2.1 >=sys-devel/llvm-3.3 )
-	>=sys-devel/binutils-apple-5.1
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99
-		!>=sys-devel/clang-9999 )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-S=${WORKDIR}/${P}.src
-
-check_space() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		echo 'int main() {return 0;}' > "${T}"/test.cxx || die
-		ebegin "Trying to build a C++11 test program"
-		if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
-			eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
-			eerror "to gcc-4.7 or an equivalent version supporting C++11."
-			die "Currently active compiler does not support -std=c++11"
-		fi
-		eend ${?}
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_unpack() {
-	default
-
-	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
-		|| die "symlinks removal failed"
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-${PV}.src "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-	fi
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}-patchset"/nodoctargz.patch
-	epatch "${WORKDIR}/${P}-patchset"/gcc-4.9.patch
-	epatch "${WORKDIR}/${P}-patchset"/gentoo-install.patch
-	epatch "${WORKDIR}/${P}-patchset"/gcc-5.1.patch
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-runtime-gcc-detection-v3.patch
-
-		epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-install.patch
-		epatch "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch
-		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
-	fi
-
-	if use prefix && use clang; then
-		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-			projects/compiler-rt/make/platform/clang_*.mk || die
-	fi
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	local sub_files=(
-		Makefile.config.in
-		Makefile.rules
-		tools/llvm-config/llvm-config.cpp
-	)
-	use clang && sub_files+=(
-		tools/clang/lib/Driver/Tools.cpp
-		tools/clang/tools/scan-build/scan-build
-	)
-
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	# note: we're setting the main libdir intentionally.
-	# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
-	einfo "Fixing install dirs"
-	sed -e "s,@libdir@,$(get_libdir),g" \
-		-e "s,@PF@,${PF},g" \
-		-e "s,@EPREFIX@,${EPREFIX},g" \
-		-i "${sub_files[@]}" \
-		|| die "install paths sed failed"
-
-	if use clang; then
-		# constantly fails for a long time, likely due to our patches
-		rm tools/clang/test/Driver/cross-linux.c || die
-	fi
-
-	# User patches
-	epatch_user
-
-	python_setup
-}
-
-src_configure() {
-	# disable timestamps since they confuse ccache
-	local conf_flags=(
-		--disable-timestamps
-		--enable-keep-symbols
-		--enable-shared
-		--with-optimize-option=
-		--enable-optimized
-		--disable-assertions
-		--disable-expensive-checks
-		--disable-libedit
-		--disable-terminfo
-		$(use_enable libffi)
-
-		--enable-bindings=none
-		--enable-targets=host
-
-		ac_cv_prog_XML2CONFIG=""
-	)
-
-	if use libffi; then
-		local CPPFLAGS=${CPPFLAGS}
-		append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)"
-	fi
-
-	# llvm prefers clang over gcc, so we may need to force that
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${conf_flags[@]}"
-}
-
-src_compile() {
-	LLVM_MAKEARGS=(
-		VERBOSE=1
-		REQUIRES_RTTI=1
-		GENTOO_LIBDIR=$(get_libdir)
-	)
-
-	emake "${LLVM_MAKEARGS[@]}"
-
-	pax-mark m Release/bin/llvm-rtdyld
-	pax-mark m Release/bin/lli
-	pax-mark m Release/bin/lli-child-target
-}
-
-src_install() {
-	emake "${LLVM_MAKEARGS[@]}" DESTDIR="${D}" install
-
-	if ! use clang; then
-		rm "${WORKDIR}"/${PN}-3.5.0-manpages/clang.1 || die
-	else
-		for tool in clang{,++} ; do
-			dosym ${tool} /usr/bin/${CHOST}-${tool}
-		done
-	fi
-	doman "${WORKDIR}"/${PN}-3.5.0-manpages/*.1
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	local lib= f= odylib= ndylib= libpv=${PV}
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eval $(grep PACKAGE_VERSION= configure)
-		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		libpvminor=${libpv%.[0-9]*}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
-			# libEnhancedDisassembly is Darwin10 only, so non-fatal
-			# + omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
-
-			ebegin "fixing install_name of $lib"
-			install_name_tool \
-				-id "${EPREFIX}"/usr/lib/${lib} \
-				"${ED}"/usr/lib/${lib}
-			eend $?
-		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
-			# omit clang libs if not enabled
-			[[ -f "${f}" ]] || continue
-
-			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
-			while read odylib ; do
-				ndylib=
-				case ${odylib} in
-					*/libclang.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libclang.dylib
-						;;
-					*/libLLVM-${libpv}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
-						;;
-					*/libLLVM-${libpvminor}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
-						;;
-					*/libLTO.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
-						;;
-				esac
-				if [[ -n ${ndylib} ]] ; then
-					ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-					install_name_tool \
-						-change "${odylib}" "${ndylib}" \
-						"${f}"
-					eend $?
-				fi
-			done
-		done
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.6.2-r100.ebuild b/sys-devel/llvm/llvm-3.6.2-r100.ebuild
deleted file mode 100644
index c84af618ae08..000000000000
--- a/sys-devel/llvm/llvm-3.6.2-r100.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils check-reqs flag-o-matic multilib pax-utils prefix \
-	python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( https://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		https://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz )
-	https://dev.gentoo.org/~voyageur/distfiles/${PN}-3.6.1-manpages.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend: LLVM Software Grant by ARM.
-# 3. MD5 code: public-domain.
-# 4. autoconf (not installed): some undefined M.I.T. license.
-# 5. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain"
-SLOT="0/3.6"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang +libffi"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	libffi? ( >=virtual/libffi-3.0.13-r1:0= )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-apple-4.2.1 >=sys-devel/llvm-3.3 )
-	>=sys-devel/binutils-apple-5.1
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99
-		!>=sys-devel/clang-9999 )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-S=${WORKDIR}/${P}.src
-
-check_space() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		echo 'int main() {return 0;}' > "${T}"/test.cxx || die
-		ebegin "Trying to build a C++11 test program"
-		if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
-			eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
-			eerror "to gcc-4.7 or an equivalent version supporting C++11."
-			die "Currently active compiler does not support -std=c++11"
-		fi
-		eend ${?}
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_unpack() {
-	default
-
-	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
-		|| die "symlinks removal failed"
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-	fi
-}
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}-patchset"/nodoctargz.patch
-	epatch "${WORKDIR}/${P}-patchset"/gcc-4.9.patch
-	epatch "${WORKDIR}/${P}-patchset"/gentoo-install.patch
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-runtime-gcc-detection-v3.patch
-
-		epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-install.patch
-		epatch "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch
-		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
-
-		# Fix build fails with using gcc-4.9 on Gentoo/FreeBSD, bug #548444
-		epatch "${WORKDIR}/${P}-patchset"/clang/fbsd-gcc49.patch
-	fi
-
-	if use prefix && use clang; then
-		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-			projects/compiler-rt/make/platform/clang_*.mk || die
-	fi
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	local sub_files=(
-		Makefile.config.in
-		Makefile.rules
-		tools/llvm-config/llvm-config.cpp
-	)
-	use clang && sub_files+=(
-		tools/clang/lib/Driver/Tools.cpp
-		tools/clang/tools/scan-build/scan-build
-	)
-
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	# note: we're setting the main libdir intentionally.
-	# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
-	einfo "Fixing install dirs"
-	sed -e "s,@libdir@,$(get_libdir),g" \
-		-e "s,@PF@,${PF},g" \
-		-e "s,@EPREFIX@,${EPREFIX},g" \
-		-i "${sub_files[@]}" \
-		|| die "install paths sed failed"
-
-	if use clang; then
-		# constantly fails for a long time, likely due to our patches
-		rm tools/clang/test/Driver/cross-linux.c || die
-	fi
-
-	# User patches
-	epatch_user
-
-	python_setup
-}
-
-src_configure() {
-	# disable timestamps since they confuse ccache
-	local conf_flags=(
-		--disable-timestamps
-		--enable-keep-symbols
-		--enable-shared
-		--with-optimize-option=
-		--enable-optimized
-		--disable-assertions
-		--disable-expensive-checks
-		--disable-libedit
-		--disable-terminfo
-		$(use_enable libffi)
-
-		--enable-bindings=none
-		--enable-targets=host
-
-		ac_cv_prog_XML2CONFIG=""
-	)
-
-	if use libffi; then
-		local CPPFLAGS=${CPPFLAGS}
-		append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)"
-	fi
-
-	# Enable large file support, bug #550708
-	append-lfs-flags
-	# llvm prefers clang over gcc, so we may need to force that
-	tc-export CC CXX
-
-	ECONF_SOURCE=${S} \
-	econf "${conf_flags[@]}"
-}
-
-src_compile() {
-	LLVM_MAKEARGS=(
-		VERBOSE=1
-		REQUIRES_RTTI=1
-		GENTOO_LIBDIR=$(get_libdir)
-	)
-
-	emake "${LLVM_MAKEARGS[@]}"
-
-	pax-mark m Release/bin/llvm-rtdyld
-	pax-mark m Release/bin/lli
-	pax-mark m Release/bin/lli-child-target
-}
-
-src_install() {
-	emake "${LLVM_MAKEARGS[@]}" DESTDIR="${D}" install
-
-	if ! use clang; then
-		rm "${WORKDIR}"/${PN}-3.6.1-manpages/clang.1 || die
-	else
-		for tool in clang{,++} ; do
-			dosym ${tool} /usr/bin/${CHOST}-${tool}
-		done
-	fi
-	doman "${WORKDIR}"/${PN}-3.6.1-manpages/*.1
-
-	# Fix install_names on Darwin.  The build system is too complicated
-	# to just fix this, so we correct it post-install
-	local lib= f= odylib= ndylib= libpv=${PV}
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		eval $(grep PACKAGE_VERSION= configure)
-		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-		libpvminor=${libpv%.[0-9]*}
-		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_{osx,iossim}_dynamic.dylib; do
-			# libEnhancedDisassembly is Darwin10 only, so non-fatal
-			# + omit clang libs if not enabled
-			[[ -f ${ED}/usr/lib/${lib} ]] || continue
-
-			ebegin "fixing install_name of $lib"
-			install_name_tool \
-				-id "${EPREFIX}"/usr/lib/${lib} \
-				"${ED}"/usr/lib/${lib}
-			eend $?
-		done
-		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
-			# omit clang libs if not enabled
-			[[ -f "${f}" ]] || continue
-
-			scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
-			while read odylib ; do
-				ndylib=
-				case ${odylib} in
-					*/libclang.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libclang.dylib
-						;;
-					*/libLLVM-${libpv}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
-						;;
-					*/libLLVM-${libpvminor}.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpvminor}.dylib
-						;;
-					*/libLTO.dylib)
-						ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
-						;;
-				esac
-				if [[ -n ${ndylib} ]] ; then
-					ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-					install_name_tool \
-						-change "${odylib}" "${ndylib}" \
-						"${f}"
-					eend $?
-				fi
-			done
-		done
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
deleted file mode 100644
index e431dbff768b..000000000000
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ /dev/null
@@ -1,559 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils eutils flag-o-matic multilib \
-	multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( https://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		https://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
-		https://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
-	lldb? ( https://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
-	!doc? ( https://dev.gentoo.org/~voyageur/distfiles/${PN}-3.7.0-manpages.tar.bz2 )
-	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend: LLVM Software Grant by ARM.
-# 3. MD5 code: public-domain.
-# 4. autoconf (not used): some undefined M.I.T. license.
-# 5. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain
-	arm? ( LLVM-Grant )
-	multitarget? ( LLVM-Grant )"
-SLOT="0/${PV}"
-KEYWORDS="~arm ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
-	python +static-analyzer test xml video_cards_radeon
-	kernel_Darwin"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	clang? (
-		python? ( ${PYTHON_DEPS} )
-		static-analyzer? (
-			dev-lang/perl:*
-			${PYTHON_DEPS}
-		)
-		xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	)
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	ocaml? (
-		>=dev-lang/ocaml-4.00.0:0=
-		dev-ml/findlib
-		dev-ml/ocaml-ctypes
-		!!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	clang? ( xml? ( virtual/pkgconfig ) )
-	doc? ( dev-python/sphinx )
-	gold? ( sys-libs/binutils-libs )
-	libffi? ( virtual/pkgconfig )
-	lldb? ( dev-lang/swig )
-	!!<dev-python/configparser-3.3.0.2
-	ocaml? ( test? ( dev-ml/ounit ) )
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99 )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
-	kernel_Darwin? ( =sys-libs/libcxx-${PV}* )"
-
-# pypy gives me around 1700 unresolved tests due to open file limit
-# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lldb? ( clang xml )"
-
-S=${WORKDIR}/${P/_}.src
-
-check_space() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if use debug; then
-		ewarn "USE=debug is known to increase the size of package considerably"
-		ewarn "and cause the tests to fail."
-		ewarn
-
-		(( build_size *= 14 ))
-	elif is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	# Multiply by number of ABIs :).
-	local abis=( $(multilib_get_enabled_abis) )
-	(( build_size *= ${#abis[@]} ))
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_unpack() {
-	default
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-		mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
-			|| die "clang-tools-extra source directory move failed"
-	fi
-
-	if use lldb; then
-		mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \
-			|| die "lldb source directory move failed"
-	fi
-}
-
-src_prepare() {
-	python_setup
-
-	# Make ocaml warnings non-fatal, bug #537308
-	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
-	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${WORKDIR}/${P}-patchset"/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
-	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${WORKDIR}/${P}-patchset"/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
-
-	# Make it possible to override Sphinx HTML install dirs
-	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${WORKDIR}/${P}-patchset"/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
-
-	# Prevent race conditions with parallel Sphinx runs
-	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${WORKDIR}/${P}-patchset"/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
-
-	# Prevent installing libgtest
-	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	eapply "${WORKDIR}/${P}-patchset"/0005-cmake-Do-not-install-libgtest.patch
-
-	# Fix llvm-config for shared linking, sane flags and return values
-	# in order:
-	# - backported r247159 that adds --build-system (needed for later code)
-	# - backported r252532 that adds better shared linking support
-	# - our fixes
-	# - backported r260343 that fixes cross-compilation
-	# combination of backported upstream r252532 with our patch
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${WORKDIR}/${P}-patchset"/llvm-config-0.patch
-	eapply "${WORKDIR}/${P}-patchset"/llvm-config-1.patch
-	eapply "${WORKDIR}/${P}-patchset"/llvm-config-2.patch
-	eapply "${WORKDIR}/${P}-patchset"/llvm-config-3.patch
-
-	# Fix msan with newer kernels, #569894
-	eapply "${WORKDIR}/${P}-patchset"/msan-fix.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		eapply "${WORKDIR}/${P}-patchset"/clang/gentoo-runtime-gcc-detection-v3.patch
-
-		# Support gcc4.9 search paths
-		# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
-		eapply "${WORKDIR}/${P}-patchset"/clang/gcc4.9-search-path.patch
-
-		eapply "${WORKDIR}/${P}-patchset"/clang/gentoo-install.patch
-
-		eapply "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch
-		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
-
-		# Fix -isystem support in ccc-analyzer
-		eapply "${WORKDIR}/${P}-patchset"/clang/ccc-analyzer-isystem.patch
-
-		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
-			tools/clang/tools/scan-build/scan-build || die
-
-		# Install clang runtime into /usr/lib/clang
-		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${WORKDIR}/${P}-patchset"/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
-		eapply "${WORKDIR}/${P}-patchset"/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
-
-		# Do not force -march flags on arm platforms
-		# https://bugs.gentoo.org/show_bug.cgi?id=562706
-		eapply "${WORKDIR}/${P}-patchset"/compiler-rt/arm_march_flags.patch
-
-		# Make it possible to override CLANG_LIBDIR_SUFFIX
-		# (that is used only to find LLVMgold.so)
-		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${WORKDIR}/${P}-patchset"/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
-
-		# Fix git-clang-format shebang, bug #562688
-		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
-
-		pushd projects/compiler-rt >/dev/null || die
-
-		# Fix msan with newer kernels, compiler-rt part, #569894
-		eapply "${WORKDIR}/${P}-patchset"/compiler-rt/msan-fix.patch
-
-		# Fix WX sections, bug #421527
-		find lib/builtins -type f -name '*.S' -exec sed \
-			-e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
-			-i {} + || die
-
-		popd >/dev/null || die
-	fi
-
-	if use lldb; then
-		# Do not install dummy readline.so module from
-		# https://llvm.org/bugs/show_bug.cgi?id=18841
-		sed -e 's/add_subdirectory(readline)/#&/' \
-			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
-
-		# Fix Python paths, bugs #562436 and #562438
-		eapply "${WORKDIR}/${P}-patchset"/lldb/python.patch
-		sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \
-			-i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die
-
-		# Fix build with ncurses[tinfo], #560474
-		# https://llvm.org/viewvc/llvm-project?view=revision&revision=247842
-		eapply "${WORKDIR}/${P}-patchset"/lldb/tinfo.patch
-	fi
-
-	# User patches + QA
-	cmake-utils_src_prepare
-
-	# Native libdir is used to hold LLVMgold.so
-	NATIVE_LIBDIR=$(get_libdir)
-}
-
-multilib_src_configure() {
-	local targets
-	if use multitarget; then
-		targets=all
-	else
-		targets='host;BPF;CppBackend'
-		use video_cards_radeon && targets+=';AMDGPU'
-	fi
-
-	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=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_ENABLE_TIMESTAMPS=OFF
-		-DLLVM_TARGETS_TO_BUILD="${targets}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DHAVE_HISTEDIT_H=$(usex libedit)
-	)
-
-	if use clang; then
-		mycmakeargs+=(
-			-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
-		)
-	fi
-
-	if use lldb; then
-		mycmakeargs+=(
-			-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-			-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-			-DLLDB_ENABLE_TERMINFO=$(usex ncurses)
-		)
-	fi
-
-	if ! multilib_is_native_abi || ! use ocaml; then
-		mycmakeargs+=(
-			-DOCAMLFIND=NO
-		)
-	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
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-
-		if use clang; then
-			mycmakeargs+=(
-				-DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
-			)
-		fi
-
-		if use gold; then
-			mycmakeargs+=(
-				-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-			)
-		fi
-
-		if use lldb; then
-			mycmakeargs+=(
-				-DLLDB_DISABLE_PYTHON=$(usex !python)
-			)
-		fi
-
-	else
-		if use clang; then
-			mycmakeargs+=(
-				# disable compiler-rt on non-native ABI because:
-				# 1. it fails to configure because of -m32
-				# 2. it is shared between ABIs so no point building
-				# it multiple times
-				-DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF
-				-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
-			)
-		fi
-		if use lldb; then
-			mycmakeargs+=(
-				# only run swig on native abi
-				-DLLDB_DISABLE_PYTHON=ON
-			)
-		fi
-	fi
-
-	if use clang; then
-		mycmakeargs+=(
-			-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-			-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-			-DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
-		)
-
-		# -- not needed when compiler-rt is built with host compiler --
-		# cmake passes host C*FLAGS to compiler-rt build
-		# which is performed using clang, so we need to filter out
-		# some flags clang does not support
-		# (if you know some more flags that don't work, let us know)
-		#filter-flags -msahf -frecord-gcc-switches
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	# TODO: not sure why this target is not correctly called
-	multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc
-
-	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
-	local test_targets=( check )
-	# clang tests won't work on non-native ABI because we skip compiler-rt
-	multilib_is_native_abi && use clang && test_targets+=( check-clang )
-	cmake-utils_src_make "${test_targets[@]}"
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/config.h
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	if use clang; then
-		# note: magic applied in multilib_src_install()!
-		CLANG_VERSION=${PV%.*}
-
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/clang
-			/usr/bin/clang++
-			/usr/bin/clang-cl
-			/usr/bin/clang-${CLANG_VERSION}
-			/usr/bin/clang++-${CLANG_VERSION}
-			/usr/bin/clang-cl-${CLANG_VERSION}
-		)
-
-		MULTILIB_WRAPPED_HEADERS+=(
-			/usr/include/clang/Config/config.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi; then
-		# Install man pages.
-		use doc || doman "${WORKDIR}"/${PN}-3.7.0-manpages/*.1
-
-		# Symlink the gold plugin.
-		if use gold; then
-			dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
-			dosym "../../../../$(get_libdir)/LLVMgold.so" \
-				"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
-		fi
-	fi
-
-	# apply CHOST and CLANG_VERSION to clang executables
-	# they're statically linked so we don't have to worry about the lib
-	if use clang; then
-		local clang_tools=( clang clang++ clang-cl )
-		local i
-
-		# cmake gives us:
-		# - clang-X.Y
-		# - clang -> clang-X.Y
-		# - clang++, clang-cl -> clang
-		# we want to have:
-		# - clang-X.Y
-		# - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
-		# - clang, clang++, clang-cl -> clang*-X.Y
-		# so we need to fix the two tools
-		for i in "${clang_tools[@]:1}"; do
-			rm "${ED%/}/usr/bin/${i}" || die
-			dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
-			dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
-		done
-
-		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
-		if ! multilib_is_native_abi; then
-			# non-native? let's replace it with a simple wrapper
-			for i in "${clang_tools[@]}"; do
-				rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
-				cat > "${T}"/wrapper.tmp <<-_EOF_
-					#!${EPREFIX}/bin/sh
-					exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
-				_EOF_
-				newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
-			done
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/.
-	# some users may find it useful
-	dodoc utils/vim/vimrc
-
-	if use clang; then
-		pushd tools/clang >/dev/null || die
-
-		if use static-analyzer ; then
-			pushd tools/scan-build >/dev/null || die
-
-			dobin ccc-analyzer scan-build
-			dosym ccc-analyzer /usr/bin/c++-analyzer
-			doman scan-build.1
-
-			insinto /usr/share/llvm
-			doins scanview.css sorttable.js
-
-			popd >/dev/null || die
-		fi
-
-		if use static-analyzer ; then
-			pushd tools/scan-view >/dev/null || die
-
-			python_doscript scan-view
-
-			touch __init__.py || die
-			python_moduleinto clang
-			python_domodule *.py Resources
-
-			popd >/dev/null || die
-		fi
-
-		if use python ; then
-			pushd bindings/python/clang >/dev/null || die
-
-			python_moduleinto clang
-			python_domodule *.py
-
-			popd >/dev/null || die
-		fi
-
-		# AddressSanitizer symbolizer (currently separate)
-		dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-
-		popd >/dev/null || die
-
-		python_fix_shebang "${ED}"
-		if use lldb && use python; then
-			python_optimize
-		fi
-	fi
-}
diff --git a/sys-devel/llvm/llvm-3.9.1-r1.ebuild b/sys-devel/llvm/llvm-3.9.1-r1.ebuild
deleted file mode 100644
index 39e45f7ddb79..000000000000
--- a/sys-devel/llvm/llvm-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils eutils flag-o-matic multilib \
-	multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( https://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		https://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
-		https://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
-	lldb? ( https://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${PN}-3.9.0_rc3-manpages.tar.bz2 )
-	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.xz"
-
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend: LLVM Software Grant by ARM.
-# 3. MD5 code: public-domain.
-# 4. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain
-	llvm_targets_ARM? ( LLVM-Grant )"
-SLOT="0/${PV}"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="clang debug default-compiler-rt default-libcxx doc gold libedit +libffi
-	lldb multitarget ncurses ocaml python +sanitize +static-analyzer test xml
-	elibc_musl kernel_Darwin kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-
-COMMON_DEPEND="
-	sys-libs/zlib:0=
-	clang? (
-		python? ( ${PYTHON_DEPS} )
-		static-analyzer? (
-			dev-lang/perl:*
-			${PYTHON_DEPS}
-		)
-		xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	)
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	lldb? ( dev-python/six[${PYTHON_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	ocaml? (
-		>=dev-lang/ocaml-4.00.0:0=
-		dev-ml/ocaml-ctypes:=
-		!!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=sys-devel/make-3.81
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.875d
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 )
-	clang? ( xml? ( virtual/pkgconfig ) )
-	doc? ( dev-python/sphinx )
-	gold? ( sys-libs/binutils-libs )
-	libffi? ( virtual/pkgconfig )
-	lldb? ( dev-lang/swig )
-	!!<dev-python/configparser-3.3.0.2
-	ocaml? ( dev-ml/findlib
-		test? ( dev-ml/ounit ) )
-	${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
-	clang? ( !<=sys-devel/clang-${PV}-r99 )"
-PDEPEND="
-	clang? (
-		=sys-devel/clang-${PV}-r100
-		~sys-devel/clang-runtime-${PV}
-	)
-	default-libcxx? ( sys-libs/libcxx )
-	kernel_Darwin? ( =sys-libs/libcxx-${PV%.*}* )"
-
-# pypy gives me around 1700 unresolved tests due to open file limit
-# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lldb? ( clang xml )
-	|| ( ${ALL_LLVM_TARGETS[*]} )
-	multitarget? ( ${ALL_LLVM_TARGETS[*]} )"
-
-S=${WORKDIR}/${P/_}.src
-
-check_space() {
-	# in megs
-	# !clang !debug !multitarget -O2       400
-	# !clang !debug  multitarget -O2       550
-	#  clang !debug !multitarget -O2       950
-	#  clang !debug  multitarget -O2      1200
-	# !clang  debug  multitarget -O2      5G
-	#  clang !debug  multitarget -O0 -g  12G
-	#  clang  debug  multitarget -O2     16G
-	#  clang  debug  multitarget -O0 -g  14G
-
-	local build_size=550
-	use clang && build_size=1200
-
-	if use debug; then
-		ewarn "USE=debug is known to increase the size of package considerably"
-		ewarn "and cause the tests to fail."
-		ewarn
-
-		(( build_size *= 14 ))
-	elif is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "The C++ compiler -g option is known to increase the size of the package"
-		ewarn "considerably. If you run out of space, please consider removing it."
-		ewarn
-
-		(( build_size *= 10 ))
-	fi
-
-	# Multiply by number of ABIs :).
-	local abis=( $(multilib_get_enabled_abis) )
-	(( build_size *= ${#abis[@]} ))
-
-	local CHECKREQS_DISK_BUILD=${build_size}M
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-}
-
-src_unpack() {
-	default
-
-	if use clang; then
-		mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
-			|| die "clang source directory move failed"
-		mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
-			|| die "compiler-rt source directory move failed"
-		mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
-			|| die "clang-tools-extra source directory move failed"
-	fi
-
-	if use lldb; then
-		mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \
-			|| die "lldb source directory move failed"
-	fi
-}
-
-src_prepare() {
-	python_setup
-
-	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${WORKDIR}/${P}-patchset"/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
-	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${WORKDIR}/${P}-patchset"/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
-
-	# Make it possible to override Sphinx HTML install dirs
-	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${WORKDIR}/${P}-patchset"/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
-
-	# Prevent race conditions with parallel Sphinx runs
-	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${WORKDIR}/${P}-patchset"/0004-cmake-Use-separate-doctrees-to-prevent-races-between.patch
-
-	# Allow custom cmake build types (like 'Gentoo')
-	eapply "${WORKDIR}/${P}-patchset"/0006-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch
-
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${WORKDIR}/${P}-patchset"/llvm-config-r1.patch
-
-	# Restore SOVERSIONs for shared libraries
-	# https://bugs.gentoo.org/show_bug.cgi?id=578392
-	eapply "${WORKDIR}/${P}-patchset"/0008-cmake-Reintroduce-ldconfig-compatible-SOVERSIONs-on-.patch
-
-	# Revert commit breaking AMDGPU
-	# https://bugs.gentoo.org/show_bug.cgi?id=603858
-	eapply "${WORKDIR}/${P}-patchset"/0009-Revert-AMDGPU-Fix-an-interaction-between-WQM-and-pol.patch
-
-	# support building llvm against musl-libc
-	use elibc_musl && eapply "${WORKDIR}/${P}-patchset"/musl-fixes.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Workaround, can be compiled with gcc on Gentoo/FreeBSD, bug #578064
-	use kernel_FreeBSD && tc-is-gcc && append-cppflags "-D_GLIBCXX_USE_C99"
-
-	if use clang; then
-		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		eapply "${WORKDIR}/${P}-patchset"/clang/gcc-config.patch
-
-		eapply "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch
-		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
-
-		eapply "${WORKDIR}/${P}-patchset"/compiler-rt/darwin-default-sysroot.patch
-
-		pushd "${S}"/tools/clang >/dev/null || die
-		# be able to specify default values for -stdlib and -rtlib at build time
-		eapply "${WORKDIR}/${P}-patchset"/clang/default-libs.patch
-		popd >/dev/null || die
-
-		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
-			tools/clang/tools/scan-build/bin/scan-build || die
-
-		# Install clang runtime into /usr/lib/clang
-		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${WORKDIR}/${P}-patchset"/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
-		eapply "${WORKDIR}/${P}-patchset"/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
-
-		# Make it possible to override CLANG_LIBDIR_SUFFIX
-		# (that is used only to find LLVMgold.so)
-		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${WORKDIR}/${P}-patchset"/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
-
-		# Fix git-clang-format shebang, bug #562688
-		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
-
-		pushd projects/compiler-rt >/dev/null || die
-
-		# Fix WX sections, bug #421527
-		find lib/builtins -type f -name '*.S' -exec sed \
-			-e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
-			-i {} + || die
-
-		popd >/dev/null || die
-	fi
-
-	if use lldb; then
-		# Do not install dummy readline.so module from
-		# https://llvm.org/bugs/show_bug.cgi?id=18841
-		sed -e 's/add_subdirectory(readline)/#&/' \
-			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
-		# Do not install bundled six module
-		eapply "${WORKDIR}/${P}-patchset"/lldb/six.patch
-	fi
-
-	# User patches + QA
-	cmake-utils_src_prepare
-
-	# Native libdir is used to hold LLVMgold.so
-	NATIVE_LIBDIR=$(get_libdir)
-}
-
-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=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		-DHAVE_HISTEDIT_H=$(usex libedit)
-	)
-
-	if use clang; then
-		mycmakeargs+=(
-			-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 "")
-
-			# compiler-rt's test cases depend on sanitizer
-			-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
-			-DCOMPILER_RT_INCLUDE_TESTS=$(usex sanitize)
-		)
-	fi
-
-	if use lldb; then
-		mycmakeargs+=(
-			-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-			-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-			-DLLDB_ENABLE_TERMINFO=$(usex ncurses)
-		)
-	fi
-
-	if ! multilib_is_native_abi || ! use ocaml; then
-		mycmakeargs+=(
-			-DOCAMLFIND=NO
-		)
-	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
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-
-		if use clang; then
-			mycmakeargs+=(
-				-DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
-			)
-		fi
-
-		if use gold; then
-			mycmakeargs+=(
-				-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-			)
-		fi
-
-		if use lldb; then
-			mycmakeargs+=(
-				-DLLDB_DISABLE_PYTHON=$(usex !python)
-			)
-		fi
-
-	else
-		if use clang; then
-			mycmakeargs+=(
-				# disable compiler-rt on non-native ABI because:
-				# 1. it fails to configure because of -m32
-				# 2. it is shared between ABIs so no point building
-				# it multiple times
-				-DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF
-				-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
-			)
-		fi
-		if use lldb; then
-			mycmakeargs+=(
-				# only run swig on native abi
-				-DLLDB_DISABLE_PYTHON=ON
-			)
-		fi
-	fi
-
-	if use clang; then
-		mycmakeargs+=(
-			-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-			-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-			-DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
-		)
-
-		# -- not needed when compiler-rt is built with host compiler --
-		# cmake passes host C*FLAGS to compiler-rt build
-		# which is performed using clang, so we need to filter out
-		# some flags clang does not support
-		# (if you know some more flags that don't work, let us know)
-		#filter-flags -msahf -frecord-gcc-switches
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/llvm-tblgen" ]] \
-			|| die "/usr/bin/llvm-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DLLVM_TABLEGEN=/usr/bin/llvm-tblgen
-		)
-
-		if use clang; then
-			[[ -x "/usr/bin/clang-tblgen" ]] \
-				|| die "/usr/bin/clang-tblgen not found or usable"
-			mycmakeargs+=(
-				-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-			)
-		fi
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	# TODO: not sure why this target is not correctly called
-	multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc
-
-	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
-
-	# provide a symlink for tests
-	if [[ $(get_libdir) != lib ]]; then
-		ln -s "../$(get_libdir)/clang" lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check )
-	# clang tests won't work on non-native ABI because we skip compiler-rt
-	multilib_is_native_abi && use clang && test_targets+=( check-clang )
-	cmake-utils_src_make "${test_targets[@]}"
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/config.h
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	if use clang; then
-		MULTILIB_WRAPPED_HEADERS+=(
-			/usr/include/clang/Config/config.h
-		)
-	fi
-
-	multilib-minimal_src_install
-
-	if use clang; then
-		# Apply CHOST and version suffix to clang tools
-		local clang_version=${PV%.*}
-		local clang_tools=( clang clang++ clang-cl clang-cpp )
-		local abi i
-
-		# cmake gives us:
-		# - clang-X.Y
-		# - clang -> clang-X.Y
-		# - clang++, clang-cl, clang-cpp -> clang
-		# we want to have:
-		# - clang-X.Y
-		# - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
-		# - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
-		# also in CHOST variant
-		for i in "${clang_tools[@]:1}"; do
-			rm -f "${ED%/}/usr/bin/${i}" || die
-			dosym "clang-${clang_version}" "/usr/bin/${i}-${clang_version}"
-			dosym "${i}-${clang_version}" "/usr/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/bin/${abi_chost}-${i}-${clang_version}"
-				dosym "${abi_chost}-${i}-${clang_version}" \
-					"/usr/bin/${abi_chost}-${i}"
-			done
-		done
-	fi
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD && use clang; then
-		rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi; then
-		# Symlink the gold plugin.
-		if use gold; then
-			dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
-			dosym "../../../../$(get_libdir)/LLVMgold.so" \
-				"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/.
-	# some users may find it useful
-	dodoc utils/vim/vimrc
-
-	# Install man pages from the prebuilt package
-	if ! use doc; then
-		if ! use clang; then
-			rm "${WORKDIR}"/${PN}-3.9.0_rc3-manpages/{clang,extraclangtools,scan-build}.1 || die
-		fi
-
-		doman "${WORKDIR}"/${PN}-3.9.0_rc3-manpages/*.1
-	fi
-
-	if use clang; then
-		pushd tools/clang >/dev/null || die
-
-		if use python ; then
-			pushd bindings/python/clang >/dev/null || die
-
-			python_moduleinto clang
-			python_domodule *.py
-
-			popd >/dev/null || die
-		fi
-
-		# AddressSanitizer symbolizer (currently separate)
-		dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
-
-		popd >/dev/null || die
-
-		python_fix_shebang "${ED}"
-		if use static-analyzer; then
-			python_optimize "${ED}"usr/share/scan-view
-		fi
-	fi
-}
diff --git a/sys-devel/llvm/llvm-7.0.9999.ebuild b/sys-devel/llvm/llvm-7.0.9999.ebuild
index 9e2be474c599..c361a226832d 100644
--- a/sys-devel/llvm/llvm-7.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-7.0.9999.ebuild
@@ -42,7 +42,12 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	sys-libs/zlib:0=
 	exegesis? ( dev-libs/libpfm:= )
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	gold? (
+		|| (
+			>=sys-devel/binutils-2.31.1-r4:*[plugins]
+			<sys-devel/binutils-2.31.1-r4:*[cxx]
+		)
+	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-8.0.0_rc3.ebuild b/sys-devel/llvm/llvm-8.0.0_rc3.ebuild
deleted file mode 100644
index 167c83db857a..000000000000
--- a/sys-devel/llvm/llvm-8.0.0_rc3.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
-	multiprocessing pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
-#	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
-
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend: LLVM Software Grant by ARM.
-# 3. MD5 code: public-domain.
-# 4. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain
-	llvm_targets_ARM? ( LLVM-Grant )"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=
-	exegesis? ( dev-libs/libpfm:= )
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/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}] )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	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}]
-	') )
-	!doc? ( ${PYTHON_DEPS} )
-	gold? ( sys-libs/binutils-libs )
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${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} )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	use doc || return 0
-
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-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
-
-	# User patches + QA
-	cmake-utils_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* ]]
-}
-
-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=ON
-		-DLLVM_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
-
-		-DWITH_POLLY=OFF # TODO
-
-		-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)
-
-		# 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="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use doc && 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
-		)
-		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_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	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-utils_src_make 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() {
-	cmake-utils_src_install
-
-	# 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 - "10llvm-${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_
-
-	# install pre-generated manpages
-#	if ! use doc; then
-#		# (doman does not support custom paths)
-#		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-#		doins "${WORKDIR}/${P}-manpages/llvm"/*.1
-#	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-}
-
-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 2.7 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/llvm/llvm-8.0.0_rc2.ebuild b/sys-devel/llvm/llvm-8.0.0_rc5.ebuild
index 167c83db857a..250137f620f3 100644
--- a/sys-devel/llvm/llvm-8.0.0_rc2.ebuild
+++ b/sys-devel/llvm/llvm-8.0.0_rc5.ebuild
@@ -40,7 +40,12 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	sys-libs/zlib:0=
 	exegesis? ( dev-libs/libpfm:= )
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	gold? (
+		|| (
+			>=sys-devel/binutils-2.31.1-r4:*[plugins]
+			<sys-devel/binutils-2.31.1-r4:*[cxx]
+		)
+	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-8.0.9999.ebuild b/sys-devel/llvm/llvm-8.0.9999.ebuild
index b31f34a91058..4d4395f2fdbb 100644
--- a/sys-devel/llvm/llvm-8.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-8.0.9999.ebuild
@@ -42,7 +42,12 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	sys-libs/zlib:0=
 	exegesis? ( dev-libs/libpfm:= )
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	gold? (
+		|| (
+			>=sys-devel/binutils-2.31.1-r4:*[plugins]
+			<sys-devel/binutils-2.31.1-r4:*[cxx]
+		)
+	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index abc5f6f5ebda..0da81c25c4c6 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -44,7 +44,12 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	sys-libs/zlib:0=
 	exegesis? ( dev-libs/libpfm:= )
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	gold? (
+		|| (
+			>=sys-devel/binutils-2.31.1-r4:*[plugins]
+			<sys-devel/binutils-2.31.1-r4:*[cxx]
+		)
+	)
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
index 4538466dde0e..d07370205495 100644
--- a/sys-devel/llvm/metadata.xml
+++ b/sys-devel/llvm/metadata.xml
@@ -10,18 +10,11 @@
 	3. A compiler infrastructure - LLVM is also a collection of source code that implements the language and compilation strategy. The primary components of the LLVM infrastructure are a GCC-based C and C++ front-end, a link-time optimization framework with a growing set of global and interprocedural analyses and transformations, static back-ends for many popular (and some obscure) architectures, a back-end which emits portable C code, and a Just-In-Time compilers for several architectures.
 	4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription>
 	<use>
-		<flag name="clang">Build the clang C/C++ compiler</flag>
-		<flag name="default-compiler-rt">Use compiler-rt instead of libgcc as the default rtlib for clang</flag>
-		<flag name="default-libcxx">Use libc++ instead of libstdc++ as the default stdlib for clang</flag>
 		<flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag>
 		<flag name="exegesis">Enable performance counter support for llvm-exegesis tool
 			that can be used to measure host machine instruction characteristics</flag>
 		<flag name="gold">Build the gold linker plugin</flag>
-		<flag name="lldb">Build the lldb debugger</flag>
-		<flag name="multitarget">Build all host targets (default: host only)</flag>
 		<flag name="ncurses">Support querying terminal properties using ncurses' terminfo</flag>
-		<flag name="sanitize">Build compiler-rt's sanitizers</flag>
-		<flag name="static-analyzer">Install the Clang static analyzer (requires USE=clang)</flag>
 		<flag name="xar">Support dumping LLVM bitcode sections in Mach-O files
 			(uses <pkg>app-arch/xar</pkg>)</flag>
 	</use>
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index f007c515463b..527d63add88c 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -4,5 +4,5 @@ AUX m4-1.4.18-glibc228.patch 13863 BLAKE2B f8b54c3b7feae5d458ba893e08313f5e9772e
 DIST m4-1.4.17.tar.xz 1149088 BLAKE2B ccba6a1cd80de241bc2e755addbf4876b00ab776e0a3c85691998e3e84e8a091d57d8c3e9b43a115e52e416450de791662a54ca8e64e1603a166029164f140ce SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389
 DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
 EBUILD m4-1.4.17.ebuild 1620 BLAKE2B 789c68b68c8265b799623fede4da9ab2aa344b67972d8abe220aa03c80732425ac474cbd01f0ac3538f8b110ce6dffd5d8844b9cad079cdde5fa283c9216e5e5 SHA512 e5642fde4f5f83daaeac3ab340abd845285d90320ac9c72b4465de4c06c05206c5bc9a3208f1fbf94609552b264de47ee1359e07b0d2c791cb160a4be605ff72
-EBUILD m4-1.4.18-r1.ebuild 1423 BLAKE2B fd1d8f1218d1332e44edda041163298c8a684792c3cd67ec1d0ca014e60392f9fcd7dcf9ee9bfde995f2c11815dd7617c9e039c41468551ab4f732472486bad4 SHA512 261e6a07e3173dde209cbd8608421d28543ebf04752a7aaa69c227e213194455faa139ff450163f84d7068d51ef8c29cb64c11ca20eb22e94e9d770d23814374
+EBUILD m4-1.4.18-r1.ebuild 1422 BLAKE2B 2093af7021dbcab8a33e657c8cf9dc62ef581ce6c79c6f311f6d56e88be66a7e69e542d290b788254b02b0713d059be517da0f54ef3c722fc28826e0a887ab85 SHA512 2b6817ae16014c7fde287722b7ee2af71a267ada5e3652caf1afddccfbb7a0cf69e5b2304cfa441ab6866e35564ccd52503403756de996097a02439d39b9ccd2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/m4/m4-1.4.18-r1.ebuild b/sys-devel/m4/m4-1.4.18-r1.ebuild
index 6b37588847ea..94ab3df20eb9 100644
--- a/sys-devel/m4/m4-1.4.18-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.18-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /sys-devel
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)