gentoo resync : 18.11.2019

42 files changed, 46 insertions, 643 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 020b4dbea35a..816c38621583 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 7cc8bc287a8e..59d53bca3b8f 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -54,12 +54,12 @@ EBUILD automake-1.13.4-r2.ebuild 2684 BLAKE2B 74f549fc4fb0e067d7bc1df646682717ee
 EBUILD automake-1.14.1-r2.ebuild 3103 BLAKE2B ca2d0d49d7711bb4756e16a6cafb846fd8e8d1d2b86867b23082ccf94bb0be349c79c693d7f4c776d87bb6d7b939bf3e7137617f6156468131d36cd18197008f SHA512 b0cf20f4d2903c746927157547706c572f959d873c23a1d51714abaab22296ea5d9ac2e7542003c52045779e1d2bbe230db64585b12faa594bae5f1d5733e640
 EBUILD automake-1.15.1-r2.ebuild 3208 BLAKE2B 72b916c78b223383f839fd4b11ed3af06102aaa9a0d1faee48d7cc2a7c710a6f256e06fa44e31e73e74e60d183a8c1304f1e6aab3392a5b8e737ed90b34a1379 SHA512 e422e9c7ffd50b0c441b5d6166b222a7d675bb1280f3ab0964584276c2d96d98159c6809b6d96e2c4ca955def55b5da4b84706f5a3f124d65b2c19dca7d9620e
 EBUILD automake-1.16.1-r1.ebuild 3133 BLAKE2B 3a722c5a3a8cf286bf1e20eef5625cec14ce4f1b68618fe9915ce898ecf240d7cc305907982a210c0a9768f79d9a6fa892918cd2cb2bfbf6394bf3cbc08d5dfa SHA512 b26f988fac779d2877ad05d4659c4302bff8f7683954fe86c6a1df08b12f411fe4722e3833dd3111c39aa298bae0fecd46960d64f743f532562171f152dbeccd
-EBUILD automake-1.16.1-r2.ebuild 3372 BLAKE2B 06993c3331b79bdd9ae1bc26fd461021a14acebcea82481e7324a81b8188475cffd508e0372794b71eaa8e42ce8048692a2382e0329eef591259f535b0cafcc1 SHA512 72f09ea55a3422c736d380ae4f27e318b911a60bfc5dc3c01350fcd2f92991ab6ddf92464daffb6bb8f06ac4673c82639518fef637b9dbc61be7c9f14633da65
+EBUILD automake-1.16.1-r2.ebuild 3368 BLAKE2B 1217ef5b501bcac54173d30c39edfaafd995e94f4d473112ac7b2e042a2842b1dd98d8023f15f79346a4fe9cf2d1211f449b2ba2d82d41e69e7057b0a8157246 SHA512 0aa68a54785f627d26323a2d1e0885e5178203c86c6d114b4d6f0ea2292b20af46681dc4187a6229d628cf664239835e7a68a4ff942d7c2bc6042bb2c7c9a5aa
 EBUILD automake-1.4_p6-r2.ebuild 2471 BLAKE2B b950f7e76b9a2243f70da8089466fd181c8307f693568103b6a79452c70ebbc6b50110157f2915c29f3e6b9ef7b7ab2a016181784ebcaffb70602ba5cedf73ac SHA512 2a7b657da16fe2e04bf50e8114049b7df2ef4936e36cf79a5155a4e93d7a8d2225b0afdec1b5595ce9df1c1c6a15635d07e314911228a115bb8b0f60b6be775f
 EBUILD automake-1.5-r2.ebuild 2289 BLAKE2B 8c79660b2fb3d9d7fb3bd8cfe6c6adf8111af88f67e024e8d335d0fc13b091749ebca114ef56121a2dd7f2c71608dd8bad4cf56b1ddfb42380c3abb034557def SHA512 c443ac4458dc16c07208f3a93806b90da67338e7229016ae35a5696a7d6f56102c874ddfb990550b5cfbed78b1b567c164851b22c5c9718853c23d97d6a7e591
 EBUILD automake-1.6.3-r2.ebuild 2037 BLAKE2B ce129f375c762152271961ed31a7ce65256c897c90d5c7eee3d7ed2e91cc66f6bcd65e455dbe7b4c597683450f5e62df18ed791a593df6087c27e6e3a0ba140d SHA512 65f8216b4f73f4ef8a21b0908f68cc8ddc41164f9e53a1816f608d2af3d58edc0816bb8e81d46f7d248d911f911cbbba9db66a11b8f7256d54766d88fe08a472
 EBUILD automake-1.7.9-r3.ebuild 2192 BLAKE2B 0bb0d987c675660bd1d5eb69dd6c81cc8d82532380f330df4e7a1c49780a5ebf6cb7cb299cb30dc0b8f368e25d6f5902b32d3099fa115d46668e7fc939139c7a SHA512 bd650f892c870f7be1e406fe37b6e3b2fd503fe18380457529f27cca63bc7b7cd1b8ccdd2745b1ab42039a73166079ce0a2927517649da8d77dc925299478495
 EBUILD automake-1.8.5-r5.ebuild 2219 BLAKE2B f0dfc9668219d32a28b49bc755eadc2c19ab203477ae97bf768d74c406672356e8668806550e0deb62c4585b3f14ca8115678e25f31b49c76bc47ba75b1ba038 SHA512 1f4b3276146848ebebdda9e62bf4d7b365e29832da30736a92cce156b5831e594689d5a5396bf89aacfbf7fb13a0975dd568f654932720f18d3054bc4d1d26a7
 EBUILD automake-1.9.6-r5.ebuild 2567 BLAKE2B cd6c2db1c38a16206399d687bce1ed407496d1374431508a8c99c7be38d590c4e844e168660b01faf951c6bfd4acb8cb3b0418def0797f381969c1fb9cba4cc4 SHA512 42ab8ca19a382aae897c2cb09aad647aa4976b02d31a2a87db67cd575ca1429aa148103769b7371cba2312da3883e69859e530814ed4c9fdcfabba7fec39cff6
-EBUILD automake-9999.ebuild 3310 BLAKE2B 8a3eb55af28d35cf3121460f701b02248be05cfbf8ee7849fa14996f86084210582507412b27cadff105577c275f6487672d604716507de6af2fde8b66933994 SHA512 b497e612373a09b7c478174ce5a95504f5c76b3b609e58971ada998aa7d86a9d66c17aff638a167cee884239a10aba874b8c9a9e017300dd04fdca21eec15f9d
+EBUILD automake-9999.ebuild 3306 BLAKE2B a5d54d4acfc4d4b7138803066b9d62e2766f7af971cd786798cfe2da547e9f20461bbe3d9ab84bbb4a2486eb00c1547a265776c165fcfb38db408243a827f61c SHA512 f0d2bfd1b6ca2557b6e81e6125e47ed28ad4817a0a59228ed08c969706bad053f65faae7ec3150fe15fd26102f9632cc508b8cbcca85ab8abb56f02d9bf29e3e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
index 70e1fed3e379..75cccbd31b41 100644
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -72,7 +72,7 @@ src_prepare() {
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
 	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm dir || die
+	rm -f dir
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 9490f85d527a..aaaefaabe03c 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -68,7 +68,7 @@ src_prepare() {
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
 	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm dir || die
+	rm -f dir
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index d971f83eb1fc..97e9b7e4725d 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -2,6 +2,6 @@ AUX binutils-config-5 12580 BLAKE2B d802830a52b76433152a073d5acb29afa606dcac6f41
 AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d58df5bf45eaa78a01e73c45e17cfa845aadcf65828f2ff7b149a01e9188ae85e3f56c8c83170078211cd69 SHA512 79cd64c734650d76e47e4e6a84aab408ca39d04b57fbd6ecbe953089f246e52c05a6d3d1dd69ff8864e71246c8b6f53f4b89902963ae4f6b7194b949cb0f724c
 AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
-EBUILD binutils-config-5-r4.ebuild 1094 BLAKE2B d724d2412aca189ae48693ba529d5a7cda7c9c5ac89329b5e8198bc05c12ebcb4cee2c1a9ad4e74114bcb59f56b8e8ad8a0e0184f33d55ba71248bc342edebb5 SHA512 8ccf7c4319d889134fc3240348275727b198fc5df1aa24f1a8d4765e93bf8f612a3380932d97aaaa9b7bfcf2413d2d2881219473a7fbabacf2c29cae47b9fe1d
-EBUILD binutils-config-5.1-r1.ebuild 1096 BLAKE2B 177717730ad05153233a85bf06ba83776b04ebf1bd4ef43bdcc315c6c497b0a98559d8dafcc212d018e5e304d708cc4e83e83253517b07cc53c0573d93887913 SHA512 e6769b45b487c4c7214ba378c7e401476710b3ddcbcd4fb8f2d1a02f0ec17271c048d3767b8baaea49ffc671e36268ce5aa6e231a9ab2ad6b85ce4342c3c9c7e
+EBUILD binutils-config-5-r4.ebuild 1064 BLAKE2B f65f64eacc916a4b693b826fa4af60b0833efc67e5285b8148972c4d8d44553f5c496987c8b8a0243ceb1e884a24a49923bbb75ddefd0f35363a69d2f8f5ae2d SHA512 48eb5cae87fe27a91dd3648955863bb4e98d92dfec01e5f0599603448ad8f523654ef428503c2c156130481d33981791bb3e5ee6ba3972b22e3cc85f786cc1f0
+EBUILD binutils-config-5.1-r1.ebuild 1069 BLAKE2B d0262ca0214c7924985882e6fd64615d4f8a21a4fe8640683e4801d2687d9a084c9806299f8505a9b45db3396bc59d615cd5b2e3987ee5e1d85a1d0051039aa0 SHA512 de03c7835c7c671397c72189680d07615b46573dbeac1cd66da44923fbf0bb6860a4d92f57ae21d476365d5e3ccb97d32124d16af27a1c5b6895bfe0c165c4ae
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/binutils-config/binutils-config-5-r4.ebuild b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
index db54488baf11..c6b253148a5b 100644
--- a/sys-devel/binutils-config/binutils-config-5-r4.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5-r4.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"
@@ -15,8 +15,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system
-RDEPEND="sys-apps/gentoo-functions
-	!<app-admin/eselect-1.4.5"
+RDEPEND="sys-apps/gentoo-functions"
 
 S=${WORKDIR}
 
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
index 8c430975bc54..04b99251ed87 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
@@ -15,8 +15,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sp
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system
-RDEPEND="sys-apps/gentoo-functions
-	!<app-admin/eselect-1.4.5"
+RDEPEND="sys-apps/gentoo-functions"
 
 S=${WORKDIR}
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 886d2797fffb..62324dde256b 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -20,10 +20,10 @@ DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD clang-10.0.0.9999.ebuild 11008 BLAKE2B 66643542afe563a00694536970f02ce372292cdf571aeb3eba8183602ecb3912f930d8530ce87a8c8077f8bfa4a11da2de9b5da8456479d050af18f51d6930a6 SHA512 44146c6ef198bc0bae642c32d6dd581e7f5722b9da5a4c766eb278431b1623c010cf7165933b759a66e3f5e852cd8dcbece63b277f8841042881a310eafd0491
+EBUILD clang-10.0.0.9999.ebuild 10951 BLAKE2B c74953e6dc41513d2934e6cb9838b233bb936ee08df1f8e7d1b968862ba27bc67bde3a1329f586861bce8a2e6def9fa003437ce22759d160055b85921c9b5171 SHA512 2eaecd9b9b39beb0cf0c1232fdbd348581c0de488cec20c35404449c859428c3ec9f8546ccf890a2fdc1ed0a0b2794584eb0490588b5d217c0be2f26d7559485
 EBUILD clang-6.0.1.ebuild 10260 BLAKE2B caa01b8f386069bccd3bc003172b158cb4c82ceb0014cb22c4065f0b8fb257c0a1d418f94b680b86e6386493d68f0192d6a357e98120daa4014283b627394aee SHA512 0efc198053d9f828ef0cc506f3ea731f0e440f2433dcbe3da59673fb7cdb33e746620515585c6d866304087038ce1b70b4b9f35be3cb1cddaf5f413d58e74891
 EBUILD clang-7.1.0.ebuild 10342 BLAKE2B bee118a01e7f6a123406d809e3e87f8f14bdac8060ee9cf0bbd21c0ab99493d215f057d42ce1a50aabab4faab15f5d79313e2123c2815c9346263231ddb18430 SHA512 924d9a98c439918cb1f03da5cda2b87dd412032209752aeaf1e1a69d5bbf8c01f403505681f43c8a08b731aa8a644e35a754bb18624da4d8e4ca5dfebeb17a18
 EBUILD clang-8.0.1.ebuild 10240 BLAKE2B 564acf26ff06469442f634c60cf2ee887f13f8d720f6ee9f104f84057c588e56b5b1e3bd0e3104eff4f25b52d6a69467b95e8f409e67be83887ef41426e8c33d SHA512 fd367c55c9a9f33d765e7d520806802b7e0de6e61eda33b46d1a5a24906e4c6a6295b2467c82d6001db6519be2609097f09ddb11e4b14165a890d85cfbb1ddb0
-EBUILD clang-9.0.0.ebuild 9576 BLAKE2B 17ef1b35de29f82c0ab9132fa1fd1a21ada47f4cabe0d6b7c406d0237eadb7cef05dc73e1cae8fabddb455082d588672a4792699d79be20041ef0e5bf19a0c6b SHA512 5ee6973d2ed6592389a7e83410715e60623426f61b01b76dfb464fa6010e374ca2660b872f8af2516d0c5a3f50219871c62b69c39bf262cd2011970e0e5f5032
-EBUILD clang-9.0.1.9999.ebuild 8960 BLAKE2B b22eb0c4b03309707087ae5790d6f8e8ae2ed402d731057fbeb368a4e837178c21565704ced0ff867edb2decdddc9d1765ab2b292ea573c47745e975033537e4 SHA512 0cd4cb20bd1414744e5a5f259e132e34172d27b66e44506115833946b465eeea710f1dd76ae0f8769aa22b41b06ccb48b3412418f9164231cc4eff78c3928cc4
+EBUILD clang-9.0.0.ebuild 9519 BLAKE2B 92803cfce6b62f453d5738bc2731427cb0cc3b7517bcf2b9cad508129781e5c97bb09b133feeac4ee1023ed8ced5c33f855374729f27d4d7418b1cb519ad97ce SHA512 80609d15c68f86c8d34648d3bb7cd38a295e44011411cf258f1f601e35ccd748e6d2e62eeab852eca6d65a447d11bde4e821758ad1a64b7060f27141d32d33a0
+EBUILD clang-9.0.1.9999.ebuild 8903 BLAKE2B 2a0ef5a379e6d041191ea7882f9b0b9626e87574f2b12c1141f8bae50589a40d8f4243959db4065be2e31678176ba934249e6804c7cdb0bea3c3b2e2db607fe4 SHA512 b6f6a4d73012638037163d95475fe1d45c720d6755c5cd2059b47be513999f4073a377ece395f42fac624a05c74240b3c947a3e2e711f274c25d672d463f0f03
 MISC metadata.xml 1377 BLAKE2B 8b580be2bcaddb98c2d2b8defd1730c69a7478248f7d241dd00f533d36d750a3f45c1e55161a4fd2731b6211a22c658046cf8ad5a87028c32928dfe0cd4a862f SHA512 b08ea2bd3454abb09abfa92b62e6dae4f4e10db0266c1e4895bef0f6a2d2fadea0b36b9b861831389413e1cca0e3c412b4cf474fc8c4170902b40deeab06686a
diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild
index 6910230d08e5..170076f5f1f0 100644
--- a/sys-devel/clang/clang-10.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.0.9999.ebuild
@@ -385,9 +385,8 @@ pkg_postinst() {
 
 	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 "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
 	elog "  dev-python/pyyaml"
 }
 
diff --git a/sys-devel/clang/clang-9.0.0.ebuild b/sys-devel/clang/clang-9.0.0.ebuild
index d6ca87c13d50..e3629a74a991 100644
--- a/sys-devel/clang/clang-9.0.0.ebuild
+++ b/sys-devel/clang/clang-9.0.0.ebuild
@@ -284,9 +284,8 @@ pkg_postinst() {
 
 	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 "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
 	elog "  dev-python/pyyaml"
 }
 
diff --git a/sys-devel/clang/clang-9.0.1.9999.ebuild b/sys-devel/clang/clang-9.0.1.9999.ebuild
index 1042dac71eef..30248e0edee5 100644
--- a/sys-devel/clang/clang-9.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-9.0.1.9999.ebuild
@@ -267,9 +267,8 @@ pkg_postinst() {
 
 	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 "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
 	elog "  dev-python/pyyaml"
 }
 
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 25ff52809519..69431efc9120 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,16 +1,4 @@
-DIST crossdev-20181020.tar.xz 27172 BLAKE2B 8a388d5201ab419b865b96a4314190a693a7e00f3b5ecc2db2efdf36efca102206b5c4c5633e5e4ee508f5433ff4e086460501462bacc86c2adb10cab33a0244 SHA512 dd7fa9522ce6f58684b54ddc57e088f19a8ad5392ff45ed5b2b1f95f4be7dbc753442adc1c2591a785d94070979200936ca713913e547e84ae02b05c83bf8cde
-DIST crossdev-20181202.tar.xz 27184 BLAKE2B d1770f5148d666b22a20576b638e71bf6325e8a61776b8b47ecaf2e5437150554f6973c5306d233a836e4ffe3ff0480167c9b877c5f9e733681fd502016a19d4 SHA512 896bf050c81f3f34b2be187a851832494c039aa93177c806b689a75d16567f178e4ca33c21282fc320506b76e09b0cde8a45976b6309bf9bc5be8290db3dd8af
-DIST crossdev-20190311.tar.xz 27176 BLAKE2B 444828314b4e5363e9603a1fea8034e0b2b604a164d8efd6c31bf15591080daebd936eb2881c83e165f945742d11f54b04bf5f59b4ff39c048e55fef9989d268 SHA512 1f572df09204e297efd6e97001aad929226f26e9ddc706568680d75b1746a624e86c1578c5d3ee1e52ece0bbafdd17ae59565f3098864f018768c2901821f4ff
-DIST crossdev-20190712.tar.xz 27240 BLAKE2B a2d09a21df1eeeb16ad03c7415a58e3d3424221b08d1a672167945df8ebe9b6c1898ee3f684d8653ed088cc1ef0155de0156b14e2a77bb47389c6f3e277039d7 SHA512 987c29b7e36f94e1bd14c4072514a04d6655a41a922cc179e6cd12bc78a71dd60202d202c40a107365297fe11c6e2bdcbd2a3cea21b5b7260c0b8608d9d3ade5
-DIST crossdev-20190901.tar.xz 27180 BLAKE2B 879616453e883c54c9646e9111aba0fca86bda36c3f1fb327a4036a140c58b6b09498fb8e2b6d8e19dcd5efe15245d70585c6b4b463ec9f58ed5c2b84395fa49 SHA512 42d31626f798136df1d9000d0de325d53d51746a8f187001279090b112fe05862930110d2ef877d14dfc9a6d111649f3e335e1bb8e023696a69129592b6a8976
-DIST crossdev-20190908.tar.xz 27216 BLAKE2B f756735108c257b5070031f60f39cd93ce4d146e1f7d0e33df40384033c92d545f11b3aaf7b6313fa3fc402af6d0daa8ec0dd1e0aadb42a9a2f23b05768fbcda SHA512 70fb3a5995c284745fa4aae5844c368e7b8f5190a9ec15384b1db455ff6202bf88e33e16ededb6d127f82bab0aa1d0fd859652c8d4907e9cf7f4e7c95bdfa540
 DIST crossdev-20191014.tar.xz 27240 BLAKE2B 06a76250490c333d03d0227e0505c4cf1125426bc51fddfe1c87700b289a150596318d60e1ba92d9a104a55e23edd9a603edd7887cdcecfe23f9e5c3a759b02a SHA512 82317f0db3f8e3ebe69e5d132d2f248795416f481161a67bf09cccbf82a95b79656a64c476c97c1e31e4dfac1bac6c89b159afae5f0516d08f320cab6cfdbbab
-EBUILD crossdev-20181020.ebuild 843 BLAKE2B 113a2df0272e1325b016953ebb8d6cdf979fb905e4916f5464fa2513494398b284b2f4dddace5da23739a5d9b0f8d3f36b522ce2409bbabc167a85c4919a7f10 SHA512 65ea457893a8f2d320ef5efe0458ae788c625e327a90c2eddacaba32f39942965b721f3d2984847a58cec3e46a863c05432d5462fdd7f017cc4367e4f9a11708
-EBUILD crossdev-20181202.ebuild 843 BLAKE2B 113a2df0272e1325b016953ebb8d6cdf979fb905e4916f5464fa2513494398b284b2f4dddace5da23739a5d9b0f8d3f36b522ce2409bbabc167a85c4919a7f10 SHA512 65ea457893a8f2d320ef5efe0458ae788c625e327a90c2eddacaba32f39942965b721f3d2984847a58cec3e46a863c05432d5462fdd7f017cc4367e4f9a11708
-EBUILD crossdev-20190311.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
-EBUILD crossdev-20190712.ebuild 850 BLAKE2B 15de7dd52f3a59ee044065377bb0cb5645f8ff8d91cfe0e8602b609092e0c35e633b8569449a9ac991d704116cdea7dcd5a636e35ccde9b71b55c8da8c255892 SHA512 7331ed3ce7351a98d7a3b57a30038034156bcd1be4ce099c88e046f0cbd31030fb1f654edd47b674f412f0eef60aeb15e3689fdaccb47eaa54505c013995efc6
-EBUILD crossdev-20190901.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
-EBUILD crossdev-20190908.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
-EBUILD crossdev-20191014.ebuild 863 BLAKE2B f76fd92ba5e91f94a033d7c47f8a1f4d2a93e07a5692c8aefefe5fa02d35229c42a15ae2d1dd4631442e769bfa58b8b7238758997d8e4925251c55a1b443da0b SHA512 66dcb0fb3130545e02b5fc56341ac36c74e98227264a0bfbfedb95f771627c46b722d323a478d4a6e17f3720963ae6f9a6d42e596a657e93baee528170e56d58
-EBUILD crossdev-99999999.ebuild 869 BLAKE2B 54e873c24ced58363ee60e17f9c8fbd9321302842928795a3e80a42665e73191e209b6f05574aa1b33134e02893d91dced4e9d0f7588d0a1f21d438549cf070d SHA512 63a9f99fb197ff45c5c059a6edb39e07a6eacddeab8f0a2264e6a46ae4b685d6821586d50d1962509ffc394db24a956948f53109b49ce0821db0ac3764d38d72
+EBUILD crossdev-20191014.ebuild 819 BLAKE2B 64591e74a4bdd47ad079dd6d743347b855ac80dc9e710e7bbaf2d4c8905e071073eb935e256822d56a63308c595f92b03ebcd76606ccbc511d78113d2ac37252 SHA512 1a429e0d583be04c2ceb922f34241b19e489c5b55263c4e5c7e95827120c54ba160ee3271ac1254f90029a303544b690dec107d776fec5226cb1241e9cd630f0
+EBUILD crossdev-99999999.ebuild 838 BLAKE2B 0929d14ddd6d81ae41c49bdc429340eba5290b72a8386b06e37b10606ea1d91378d305f34f91cb03ae9264187674c0a9c6182f91f6346b8eb4b74e94bafad2d3 SHA512 4b94f7887ce3d0320614df2a8c7019584ebc618633b265e190cbb9cc05d5aacfd988725e4d2d94417516f239f2c5612750a581f100900aa82108981f12c3a8e0
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20181020.ebuild b/sys-devel/crossdev/crossdev-20181020.ebuild
deleted file mode 100644
index e97cebce0df2..000000000000
--- a/sys-devel/crossdev/crossdev-20181020.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20181202.ebuild b/sys-devel/crossdev/crossdev-20181202.ebuild
deleted file mode 100644
index e97cebce0df2..000000000000
--- a/sys-devel/crossdev/crossdev-20181202.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20190311.ebuild b/sys-devel/crossdev/crossdev-20190311.ebuild
deleted file mode 100644
index ad51f67caf6b..000000000000
--- a/sys-devel/crossdev/crossdev-20190311.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20190712.ebuild b/sys-devel/crossdev/crossdev-20190712.ebuild
deleted file mode 100644
index 5925a2498470..000000000000
--- a/sys-devel/crossdev/crossdev-20190712.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20190901.ebuild b/sys-devel/crossdev/crossdev-20190901.ebuild
deleted file mode 100644
index ad51f67caf6b..000000000000
--- a/sys-devel/crossdev/crossdev-20190901.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20190908.ebuild b/sys-devel/crossdev/crossdev-20190908.ebuild
deleted file mode 100644
index ad51f67caf6b..000000000000
--- a/sys-devel/crossdev/crossdev-20190908.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20191014.ebuild b/sys-devel/crossdev/crossdev-20191014.ebuild
index ad51f67caf6b..3928150c1624 100644
--- a/sys-devel/crossdev/crossdev-20191014.ebuild
+++ b/sys-devel/crossdev/crossdev-20191014.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
@@ -24,13 +24,13 @@ RDEPEND="
 	>=app-portage/portage-utils-0.55
 	app-shells/bash
 	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
+"
 DEPEND="app-arch/xz-utils"
 
 src_install() {
 	default
 
 	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
 	fi
 }
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index b36661fb51ad..e79d217e31f9 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -24,13 +24,13 @@ RDEPEND="
 	>=app-portage/portage-utils-0.55
 	app-shells/bash
 	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
+"
 DEPEND="app-arch/xz-utils"
 
 src_install() {
 	default
 
 	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
 	fi
 }
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index a5c824aa3c47..02758f785396 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,6 +1,6 @@
 DIST gcc-config-2.0.tar.xz 15344 BLAKE2B 323b1e791b831ee610a375fc03532ab89e31b1f74586742c1d37dcea9c7853cf4ebfef875fc2bfa273cfc1555a33b9f04a1e58c850133cddee765dd769bdb189 SHA512 67c8cfc7e031d4a88191c04495c97f46e90e2d3fce4cd1afc29f142fad9414218768d3c6de4bd8bb7d9baa39a20b17bb28a503b0d05d6db2003b767546317a30
 DIST gcc-config-2.1.tar.xz 15520 BLAKE2B 0e37762877116d90265a31cf6d9bc99da9b358afc26c0f7cb6fdbbb44dce23ebf59a1d5c2e481d456c03fbcc383efb7a56559af0bbd1f2bd78f407a853c88369 SHA512 0b19cb758a1e8c5e2e1f7901799fa1eb598d9d5c8d89ceace2e294ec569bfa90978bef72f52b9c2a3455f2ffd21be0899fb3e23b5fbdf62b70e978c153961272
 EBUILD gcc-config-2.0.ebuild 1186 BLAKE2B fe7ea688690f81325439d65df9e80767771ee688189fdc368097fbb62f2535aa11ca52e25d8e5caf493083d14f149d5db10402b46f5bcbd624ee5999720437eb SHA512 f5ade89b8396f00d37d3608a9b94dd5db41e31b39250581a78ba95cf9654c146b5b4a947ff9df313a0e9786801c1d0d43763a51a677f779457c838b691c42c8b
-EBUILD gcc-config-2.1.ebuild 1199 BLAKE2B a2cbb82d96c223a1bc0a28139dcb80a05a077bfb21c5de1ebfcdfaaca224bd8578118feecaf34a02fec5479ddde1c1dcf8459fb5b24cface5d99ec8b350f3d76 SHA512 7f3f56ad34e675cce6941283abf8e9010a2aeef54731d071fe62521a839b3a2e9d7e97f2c6e8749d5c1a77d7998b1967afc4f078e9055e8c6486283d5484b873
+EBUILD gcc-config-2.1.ebuild 1191 BLAKE2B 5e2bf91e8c5f33faba5c73a75370b6b66c127689f10db167b01a2bea84c325f117a87993334bd5f430655571717a10e6c7f7c44f3934eef85d1056cb64cdf924 SHA512 795222850145930bc00e31b88e07db298504071044350a7e20c708753136424e9aeb9fd147dbc7d3ed9d860c7107cb6fa27831e2f60508665d37ae37f7026541
 EBUILD gcc-config-9999.ebuild 1195 BLAKE2B b5ec2af87244bfe98a13861e0114c12c72bf0adfc656e53fc425d88adce6c32700079ef5e03d469a0eb87bd77add159b5d453eaa2a6866deea8152e1fc38f842 SHA512 26bae4dfa89fcaeca9d9600eda7350b7cfec9239b9529b5e1cbfeadb2aef9ca2049a1253c306dfa09c7509c6dac806459250bbe3dbfd0c53ab684a6f4448c95c
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/gcc-config/gcc-config-2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.1.ebuild
index d63b5087484e..8c60e8b8db1d 100644
--- a/sys-devel/gcc-config/gcc-config-2.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 3b20f7fdab30..7c9638b96468 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -70,9 +70,6 @@ DIST gcc-5.5.0-patches-1.0.tar.bz2 29527 BLAKE2B 3ee9565591e6c07d658ebecc36972a0
 DIST gcc-5.5.0-piepatches-v0.6.5.tar.bz2 14327 BLAKE2B db24b2d321328307147b0dccabf9b66424302c4b8994c2981f09efe65af58692dc8fe69a65d262f60015ac15a2d1850c2b86964592b72c994737e61c1d8827ef SHA512 2e3ee95c8f2c36968fd6dfaf7bfcfd03d9d98e9a5ee827fbff06d8b28cf0375072165f7299baa9eceb8aee3af21dbd0099f9ba5162ccd52751af8f1c750de9e1
 DIST gcc-5.5.0-uclibc-patches-1.0.tar.bz2 3518 BLAKE2B b528d79d41de1099f3540c168339350b403568f38a338a5eeaf0a080ebc850cfa390ec72f03a6c61433f2617eaa452ed0c7397a530662188e9a73e5144bd6a1d SHA512 97b97d99fd121642ba7c170c62de245e9f2719dbfae148e0d69f7ee172f84669277f4ef26554fb4cecfab5956587ce50131d92e4244f28f914d1eecd2c361ba5
 DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1
-DIST gcc-6.4.0-patches-1.3.tar.bz2 13617 BLAKE2B 6bfb1d70397e6ca4359e5d190e36003c18c7a03a9be4f923461dcff11307601e6b3502a2e289585b53baeb919008d83c29ad24078f814aed9b331140e4687419 SHA512 91be7c8db0004cdd150fec0f8daa709374753d2f524c58087dcf45b6696dbd609972297e866f971fba1aa679464cf96a384dd111e104183c0939ab69add017b2
-DIST gcc-6.4.0-patches-1.8.tar.bz2 16904 BLAKE2B cc5b47919e6586b8860b7ffd62a90251061d0d07f5fab3085b56fd5fe6419e6f84f98ee5fdaaddeb8ff3e8745178a0e38c8eff55aac7f6d8a97d269afe465618 SHA512 c55ac6b73b4f2ee1fbc2bbfd8d5176e7721ad45899cc4aa8dc858b366504f837d951d614c6af6ce698c320639c49855fd786b7d97e8475091601a4b7c0c2c652
-DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
 DIST gcc-6.5.0-patches-2.tar.bz2 9870 BLAKE2B c6f6b3c04605da77679474d7784d674b4f6df5d39e7c26fb79b513852acc317776cb9d299ed78bec47544e7c5f932ef8d423483bf55fc830f6c244e71a4740ff SHA512 2e6998204e21fd098cb7823ec2dfa6c448ce0e96d2d4f7a18fcb833d7ac70cb97d7ccf5600dd2b695f7488d65bd4a13633ad78542cde72eca29d23323dfa2301
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 DIST gcc-7.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 72a5dcb046558c8f5c3a75040fe24ce1106c43af7510d6febf667b4377cb9caea5ebe9e1287af90e4ebfffa3f3f22ca85f533acf57c2e2d896f92adc1659b9f5 SHA512 24ed0d82240426efb111bbf48913b96fdc824ae3aa5a653298a726ebe64a40791f484229bbab9cc58f73d658e0b4b83ccd13081cfbea6e1673ef1d076cca3b33
@@ -80,15 +77,13 @@ DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
 DIST gcc-7.4.0-patches-1.2.tar.bz2 9380 BLAKE2B a9608c7993b875f1c8d81e2aa15c46e10f91e6f37a723d7c09dd29dff7bb169a58597afc483dd46ffb3ce24944f824d746aa49d1a59924036e04aa855ca875aa SHA512 7959126eee11c10d9c3bbc867f6a74273dbd6e8f2d896d65b3fe1de73f0d8e09fbb62c7ff02ba8d1798206251ad1059c4490cdefa8adff09212eb23403923642
 DIST gcc-7.4.0.tar.xz 62601888 BLAKE2B df91ec680d5389736d3a37a2d85cf2e12fbe87b642fdf4b332e67a043e00944aca00243cc6709f86abd92115cb5a78502146636395571d1ea4899531e15d5d0e SHA512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
+DIST gcc-7.5.0-patches-1.tar.bz2 9631 BLAKE2B f5f776cadb8c6ddd4f15d95f91765e0f05fc3b23894869a9a0fab30a5421869e0e3ca507ecbf96c11f6decc74222103ffec0eef93cc5089b0e8aaed07a045fe2 SHA512 9b3902ce686c586c1bcafde97675a88c50a6c6ea8ad800cb794390e72603d73023ef7b04a643fb852e745716d3d9c5f4932d407196f55b0bfbbee1d6fe75ea3d
+DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acdf27419f1067f5c3d087333d9eea0c8db427b8bd895af646990bb00ee173069980ca49cec848434a4127256f SHA512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
 DIST gcc-8.2.0-patches-1.7.tar.bz2 18166 BLAKE2B 2aff918d253d76c9b7d76b2d82e85c42f2ab8717e73831965b3a0fcc92b1ceacd7aa0b433dd0c180ad16906cfe059c020b256d01271ef95a6e56b08d41f4acfe SHA512 5110b610a4c9116ecd91490f66e570c09217c6b4d18bf46af5e1a51ed043df188ce313bdae6ba670b8800842387c98c1b83b7e1e0c396cbce71e6726d81f589c
 DIST gcc-8.2.0.tar.xz 63460876 BLAKE2B c5372b0bdfcd2729577dca287b294623b78c583491998404eb307768c573618bdaaedb7d9ae0e39ba41a62a14b9525dff0e3083285754b7f5bb9987ecf635185 SHA512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed
 DIST gcc-8.3.0-patches-1.1.tar.bz2 14430 BLAKE2B c702fbdb18c3c952cdb9adead3a193c948d78a4cb4b041beaa51a06b907fd357bb10a2f8d47d55978ebb08590fd7c9a6ec3df8e7a007173e20a55d251d947c72 SHA512 9e2284f597bab6f78ca24ead358b1f50495aefc9e0a416ace24c94723db7b2fb82d48426876138d00c82bcaf9c2f8b4674885988448dcf16dee1b764face9af4
-DIST gcc-8.3.0-patches-2.tar.bz2 16741 BLAKE2B b3db1b94749cb8a04cce8637429e15eda369ec741f236d8322716dcfae6db1dc9479dd4d7715aeb357a0b3106c7f23fd33eba466a041b8e2e0e57b6cb858786f SHA512 13a85ddf76563241973e061ba157942c81391d0b867c66f88da1ad66a79d99ccdd6bc324caca31eb31057c2d27ece89f6546d723a420b3af319c6865337321f1
 DIST gcc-8.3.0-patches-3.tar.bz2 15944 BLAKE2B f1ae61be794123f34ca88c279bfe33abadd37eea0ca0267ac9c0c77707dc8305063a7ecc2e23511c281f7e903dff349fef016d3fbbf3237acf383fe1639d4b7b SHA512 f43d86a55c932df4a494c6b687101a2992b91b1a4e01677165ed0f04de6108150ef713762f71d0ef764dbd4bad97a99d15fcb42c23e4bb42d83a866ff2d0c614
 DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
-DIST gcc-9.1.0-patches-1.1.tar.bz2 13931 BLAKE2B 55e863514f41f1af11b1f6f618604edf7f173b4c4ef8df1301ccaf4577355ed03a34b04ab50a6cf4e50317b7f047f279e4212215b183d0642f138ee5163f655d SHA512 ab850bd38902c52586fc84dd1b2da31bab857412db08dce96642f17f213c95bae029bb1be5e0ac4bb12e55f863ecfc2ccda67635e8bc7b54383b2813642d991d
-DIST gcc-9.1.0.tar.xz 70546856 BLAKE2B 0f7e5575aebc24113d12a56eb3dbf4bcdba3c656a76513c44dbbcded9ee71629727f24949bf2e1424682a9e5eda7c51eed93317e6f80013f5a837aaf25b82805 SHA512 b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28
-DIST gcc-9.2.0-patches-2.tar.bz2 15479 BLAKE2B 14d0b0c903b3fe3d788fb4e41f5dc01949ca30fae03894699b859f02e383ba624dfce38784f3bec4f398395226abe0d4e6e39a265b29708bd86815d87c43da66 SHA512 ec39741a5ceb80d073a749be86985f7a0d5dc45246cf7e43721bc17691aac621cd9f1ad20cd9cbdeeed05d73adfa4fe9b6732b932350ea39e64a53dc2d18bad3
 DIST gcc-9.2.0-patches-3.tar.bz2 15452 BLAKE2B 8ebd8beef1a7d3b0e0e544a0967599e9a06662092e9f4626e071051c3dbbbfd9b74fcc1bcec6405960a50133d741906f77cbf2058fba140b5cd35f632e999a92 SHA512 ea1a400d6285c545d28b00258d8ed67f7deb3211c28db32e2c9a427c166481d80a36d0b2b89c532e84aea76ed705cdfddc51ccb2817cef7928398c092937a9ad
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
@@ -107,17 +102,13 @@ EBUILD gcc-4.9.4-r1.ebuild 1448 BLAKE2B dc46a837d0c7cbf779acb42d2f594c24e31784ee
 EBUILD gcc-5.4.0-r4.ebuild 1253 BLAKE2B cf875a9c59182778fcceae3cdcaf1328ad1b5862749357d2547d59ef0b148035437f9316fe9670af6ca1453f9c547f5f16a32e2ef6257dd07ffb3a7a3c1bb20d SHA512 57ed71a09f0450566eac1d4184336f4e1b139eb564aa5cb5252e405ca79140f40a98f0f78502db7e7ebe05873b0ddb9df97f56326b19262acafb9f7d4e1c6482
 EBUILD gcc-5.4.0-r6.ebuild 1264 BLAKE2B e8cb5d56de1caa4bce8ee9abd13b8162dcd07fd59e572d5c9612468c2826316f34e0c4691f5b9083fe56be1ee26814ff4c6c3a3d5e70d33fe6414d16496e31b5 SHA512 ee312bf2ab36a547b7b50f34362350e6da4a31c747974a5f323808fa9aa336c135a449fce0ddd3882771fc3eaf0e6f8a451b46745d35fa5ede810cc939df36c1
 EBUILD gcc-5.5.0.ebuild 1263 BLAKE2B b3b1d3b078f1ea9d1ddd25ff5af34b2de4ddbb9bedb15ee986ec09b5ae8182cf3ce4b4ef98e735d4585716a48e3dcb0341703a082fea3d17affa444f01363eca SHA512 74e4006d54a9a17f5d734b597169d2c5e9b84a1b07fb964507662e9432e2660f829abeb2b43f639d993f42333e88184aab41683f11952fcb000bc0e95d934a97
-EBUILD gcc-6.4.0-r1.ebuild 483 BLAKE2B 9ddd24be4f511d175abf27e61cc6339f47ea3e0b2eff72f5f48a102ee87adcfcd2c7e9bce78404ac980cbbc938ec13fe31c386cb3cf73de08e07d847f1168ca7 SHA512 1a9f86590a6eba7c55bbff68241b4fd144cddb7b2b85d16f8ea7a3e4c222273a4d7e4db2beb0f0841feca836637e9edf7491efb6c342805b8f63b07462f5a76e
-EBUILD gcc-6.4.0-r5.ebuild 493 BLAKE2B 0b5297ae31b5bbdd1ce8a89c5245a924091c623804b9eb85459e30b181c0a49b207ee0b94bbe2db3d6f6998dc138b3ef47ba1306ded0dc0433cbbaaed32ac932 SHA512 779ebf69bd79b5a19adc09abf14041efb6d0106acf61208ac043b088739c13d6f9a15b3251e1e6b467c89972ecc5fada392559a35f13b15f4b108c780331a097
 EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B 628463c07685e8552a8c1648e482b5cacb6e06bb0e2270d3dac66f7dbedb05354ba5c7fb3d3300ca72db0f4979da75bf22e897299a6904707695d0563a1b5c4b SHA512 5605e214d01b3d267e70ed84e4fdb0766185fc8f08cce72f499b39d0ae04e1b4c0ecee5f58e03df9d3d46f25ec1bb558394df1db7290ac9b97a09d712ff80cd8
 EBUILD gcc-7.3.0-r3.ebuild 512 BLAKE2B 5dcfac456882dc9fd89dc8f24b12971fc1f2b127923df8ff79a395d387cbb1394ae50b59268d0c850ee80d4867f8b2fd84b1ec8a42bbd647b8d5834150ba93ae SHA512 392d93ff982cf0d3d76b377e39120ec55e6a902b76d2de7e3c33893577040a49c93c1d82f03f058939fe5a757441becc6e1b7e941b81d97f05274f0583c5554e
 EBUILD gcc-7.3.0-r6.ebuild 522 BLAKE2B 755ad4c05d992ac021ee698b06a19d56c582ab920b609a97e97bedb3b7f89a920e579b00ab54cf8eb8cbe45c5a327389c3e069b647237b36e646bcf23e0ab159 SHA512 57d1e0ac05d6567e1676814d3e3a5e9880d74d9f468df2b015d28b296ccfa7740a8062ae152d6d398309f2ceb167f09db7da920c551b1d1a34228a016e1ef33a
 EBUILD gcc-7.4.0-r2.ebuild 449 BLAKE2B 09efac22d94ab1860165ae73f94d84bc7b046146e192d3976ba140f40681b15fb612645864d9c390b7847635e5538369a08d2df8ed07a6d716c707aa11baa324 SHA512 22b344b8940d6cd0d605c24e7b16b85f6825a1f2e80e5864b2bf5aa3e9ae92f200ac7912ba20cb8be30174ccd46bb890c722d37d2d64ad730509ea68438b07a0
+EBUILD gcc-7.5.0.ebuild 460 BLAKE2B d1ee2bc661a09fe23dfdb82efcd4344fbf195e3752b54a594205e2f13bbedcce77d1196dbe2771265f5d5754b86fd53c7c253be0f92dc2816721fffed7b607f1 SHA512 1c0bd8cbfcafe1b4b02237932d86eb82ef6c3b3fb75212b5c67b207480a73c719f1371e5975a468440d7e3aa2307f043afe6c3651348f3d5ed01ddb29595c730
 EBUILD gcc-8.2.0-r6.ebuild 551 BLAKE2B ce07e5a5450b5c503b96e6000cf11cc8be10c80a7fdfb7928430cb9326470fc3ce6f86e85fe65931af282159c1d7eb075553e87d7d356c332bfcec0f6d154334 SHA512 8a773b462295156e8eda8eec0e173f667ca0bc528ed143f6da87c16628fcde56e96858cc8abe6cf72fb7226c088b95f998c8777d25f8a2f517240a3fed4a97f3
 EBUILD gcc-8.3.0-r1.ebuild 587 BLAKE2B 715429395b96a959d8ebd2a6ca0ca830bc8178b7865996951d081cfa7ff3deb309d40e8930221f726d1114557e8053874a849e23f39896c3bd448271a8b4b633 SHA512 3a7e946786d04176c6bb90ba5232e53a725502fbb1ac1a91465a10c3b52e17c0b72ef8bc35bdbc6162c4724e45758c4768092b5632f69d7ef773b05a30508e34
-EBUILD gcc-8.3.0-r2.ebuild 545 BLAKE2B 714a2df9755a80b710f86dbac1a4952a4c9d5cc8f4f02f8a72bbd51075f7ea4a3fc86f319a870262aabc968c4c8942f7f6ac1a3a42327c25e1fc8fae60839d97 SHA512 691189b20477748877e73e6e7084156fc64baa41057325cc1b2556745bf6509bda065e0867416b60e224e74be838615d1adea40fd0fd3ca067aa2d570eef92cf
 EBUILD gcc-8.3.0-r3.ebuild 545 BLAKE2B cca196e019ec3ee7ba29e90e0fd9f446c6b8b53fbfa287515645a53ada5a17d7a59cf7ef742a5c3593f6300afb8f1d3743e6d6f56ceee5c30194faba2c90088f SHA512 bb5448afa3dfc6eeec9329081ce83f82a1e919bc2a964134dadd285021d4f6dd100261bfcfa1875179bc66a42bb2ddd14141bf06911747256b11fb4989da050f
-EBUILD gcc-9.1.0-r1.ebuild 458 BLAKE2B 0e85fb6cd36c50c7158df2c1116f2a022dea82b6a03a0f8680de6fc6b9350e3b1dbdcc81dd001b1a9d2897cd474d7b81234c8397a4a77f8a04dc335ed4ad94de SHA512 1aba6bc02aacd1eea97515269fac9ead83631882a69a4c01026d111a7c87860292929d914cdfd5e5749319a0be775fea852e6631f320744e0c169a21e74a4495
-EBUILD gcc-9.2.0-r1.ebuild 456 BLAKE2B 1168d4b532a519290ef57b889bf26ed1ddb68f2c866a0255054fefb6032f033dbbc367169e5c1930901e6e340289428a8ae275db5aad05ee30c23e54f73189a3 SHA512 1855114a1e1a815d3e4ef2316d4ae00d60900b08d160a74fce7d375371e613e07e80ed644bd8aef2376472b62634b05ba8f3233b5b055b02fbc3ca52026d3f54
-EBUILD gcc-9.2.0-r2.ebuild 452 BLAKE2B 403bda7ad63d4dde18b39c0bf178748f46ee25c59d005059cc812ac5597cb216b3adcb4d8ee2165250e710cf8d5db59049e154a4c5bdcbf3f5da23d9e4228f80 SHA512 1cbd806184701794478d7258d93960db183706b47fd630764e2c17824e254c41fffd967b0813421ea60af13d684514930364106b2c7710d4689e03a599032dd4
+EBUILD gcc-9.2.0-r2.ebuild 447 BLAKE2B 5809e9ac3b0fa5f5dc91f583dcde8331514c846a9512bdd989bbc6d33fc699c141178ebb152029eff300a53df10f081e3891cddde93f2b6ed082be51d13122b6 SHA512 48ab7bd20591cde672288b308878c3004167e8a71a9824d6d9057dd71c208626d1d8522fa89be7d66c816199a03f7996799a8d6e31cc421d8c5b155f488bbf03
 MISC metadata.xml 2903 BLAKE2B 1dab10dda72341050bf32178c4d55b8199a0ddabfb6001b8da5c3286e9389eef6bf3d88309bf9273221fdfd65b102d824aa2ce702437c523a10a32ff8bfb7deb SHA512 c4e79dbbc7c76df4875ef287ee7aa916f65868743a7803e00836cb61bec0c1df2bb18974dec591075c3f78cd872b828218df7c7ded8455290df03a253df0320b
diff --git a/sys-devel/gcc/gcc-6.4.0-r1.ebuild b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
deleted file mode 100644
index 09a35310afac..000000000000
--- a/sys-devel/gcc/gcc-6.4.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.3"
-
-inherit toolchain
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-6.4.0-r5.ebuild b/sys-devel/gcc/gcc-6.4.0-r5.ebuild
deleted file mode 100644
index d675c0e81a63..000000000000
--- a/sys-devel/gcc/gcc-6.4.0-r5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.8"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-9.1.0-r1.ebuild b/sys-devel/gcc/gcc-7.5.0.ebuild
index ac9e761fd5a8..61c06c69fc4e 100644
--- a/sys-devel/gcc/gcc-9.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.5.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PATCH_VER="1.1"
+PATCH_VER="1"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.3.0-r2.ebuild b/sys-devel/gcc/gcc-8.3.0-r2.ebuild
deleted file mode 100644
index c30baaab62aa..000000000000
--- a/sys-devel/gcc/gcc-8.3.0-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="2"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-	eapply "${FILESDIR}"/gcc-8.3.0-norisc32.patch
-}
diff --git a/sys-devel/gcc/gcc-9.2.0-r1.ebuild b/sys-devel/gcc/gcc-9.2.0-r1.ebuild
deleted file mode 100644
index 112f62afbb3d..000000000000
--- a/sys-devel/gcc/gcc-9.2.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="2"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-9.2.0-r2.ebuild b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
index 59bb7f5d87ec..cf33c1332c7c 100644
--- a/sys-devel/gcc/gcc-9.2.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index c2e0aede6cfb..dad5174829a4 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,7 +1,7 @@
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 DIST gdb-8.3.1.tar.xz 20489528 BLAKE2B 5a671f620a2ed3337486a8ff53b93d65b3b6079e59ea07bc0f31e3ea6d459ced1d8549a76cfcf124762e0890e243eaabcf8b204bfc631002e759339a89b9bf9a SHA512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a
 DIST gdb-8.3.tar.xz 20490300 BLAKE2B 24b2a2a9bda7ae8093f757e42d6d0ab5642ff1d7e5a832896c28c5b17961166072c0dae158c04d7f7660cb059194c259bcff71ad5763960027b0ac3d7045eb1a SHA512 47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1
-EBUILD gdb-8.3.1.ebuild 6900 BLAKE2B 7c3b0c0eea4502aa0ff524ffb0eeafdc3b3d5adc2e9b391ecc0f829352e7cf19a3223fafd5236ecfd23d418d90063696d4dde556d7e4a79747b6572f1711935e SHA512 8518fa8680277c7b7afd0d07b9eb1d0917a4ea85ede1d9db0118bb98db0c723701a52aedc2a2b09f88a31a697e5eabcfaa07164d7131468a602e6f0c5b7e9045
-EBUILD gdb-8.3.ebuild 6646 BLAKE2B addead64692b11e0f5d183559bee6eb16b90f365ddad09d43b83eebfa2a752ae9979ffb2252ec452942925aa2686d74e2f62a90762693cc4b3cc19e8ad7e768d SHA512 31ffba3a8c285a940a4a0ec60eb7ad10f0ef3a3efbf720fff4199d660f93a834b8b4dc3123eeffb511dbc8b4eeb84a2c6feb8582b6dd883c2a8caca2b301832d
-EBUILD gdb-9999.ebuild 6900 BLAKE2B 7c3b0c0eea4502aa0ff524ffb0eeafdc3b3d5adc2e9b391ecc0f829352e7cf19a3223fafd5236ecfd23d418d90063696d4dde556d7e4a79747b6572f1711935e SHA512 8518fa8680277c7b7afd0d07b9eb1d0917a4ea85ede1d9db0118bb98db0c723701a52aedc2a2b09f88a31a697e5eabcfaa07164d7131468a602e6f0c5b7e9045
+EBUILD gdb-8.3.1.ebuild 6885 BLAKE2B 760158a1cfaa6535c447002ef1f6f4f42eb9596e9879b21e89794c0cd8a3dc2e212582bf244abd2ee97dc07926985ad05735a375ad354120d7f2bf39073b84e6 SHA512 578b63fdc04611abc3687c6dcb1babf59c9fe5e52374bf5f48fb57c711564dec9b6827d57dace88b610dd032b4713589804daa0b1bf559b7cba2f6c9d0e86894
+EBUILD gdb-8.3.ebuild 6631 BLAKE2B f7962f1cd162c549a76afb1b9fe4a27473b968dd24d9d110a003f664a17e516b22eb45ea6471185da55792637135d949cc44f3cf0013d41596cea919a7ecbfda SHA512 8024da206c4aa1babfc89e1d7a1ab2091ab09a7c10734937eec6a23a9157f6275bad9899ae926b5c22fc1c210513fd637afe08c8438d4d91325eacf3784dc80f
+EBUILD gdb-9999.ebuild 6885 BLAKE2B 760158a1cfaa6535c447002ef1f6f4f42eb9596e9879b21e89794c0cd8a3dc2e212582bf244abd2ee97dc07926985ad05735a375ad354120d7f2bf39073b84e6 SHA512 578b63fdc04611abc3687c6dcb1babf59c9fe5e52374bf5f48fb57c711564dec9b6827d57dace88b610dd032b4713589804daa0b1bf559b7cba2f6c9d0e86894
 MISC metadata.xml 1021 BLAKE2B 81d865fbf0282b889509edfd6901654f25e60474be0eeca406803dbee20260da840f323f036818edbe27635e5a8c944b53bfba9fd7b715301d1a3eaa50898dfc SHA512 2255a18e7275069a9d8011f8360399444924ca6a3baef788c2e44e790896ba388c974fceb36ae2d394afc943b481a785ec3c11657e5018b7cd5db0eaa869c530
diff --git a/sys-devel/gdb/gdb-8.3.1.ebuild b/sys-devel/gdb/gdb-8.3.1.ebuild
index feca5f541915..635cd50b6fb2 100644
--- a/sys-devel/gdb/gdb-8.3.1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1.ebuild
@@ -59,10 +59,11 @@ REQUIRED_USE="
 RESTRICT="
 	hppa? ( test )
 	ia64? ( test )
+
+	!test? ( test )
 "
 
 RDEPEND="
-	server? ( !dev-util/gdbserver )
 	client? (
 		dev-libs/mpfr:0=
 		>=sys-libs/ncurses-5.2-r2:0=
diff --git a/sys-devel/gdb/gdb-8.3.ebuild b/sys-devel/gdb/gdb-8.3.ebuild
index f0c620ed6cb9..1d67160a80fa 100644
--- a/sys-devel/gdb/gdb-8.3.ebuild
+++ b/sys-devel/gdb/gdb-8.3.ebuild
@@ -59,10 +59,11 @@ REQUIRED_USE="
 RESTRICT="
 	hppa? ( test )
 	ia64? ( test )
+
+	!test? ( test )
 "
 
 RDEPEND="
-	server? ( !dev-util/gdbserver )
 	client? (
 		dev-libs/mpfr:0=
 		>=sys-libs/ncurses-5.2-r2:0=
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index feca5f541915..635cd50b6fb2 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -59,10 +59,11 @@ REQUIRED_USE="
 RESTRICT="
 	hppa? ( test )
 	ia64? ( test )
+
+	!test? ( test )
 "
 
 RDEPEND="
-	server? ( !dev-util/gdbserver )
 	client? (
 		dev-libs/mpfr:0=
 		>=sys-libs/ncurses-5.2-r2:0=
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index e0e7fa9fee7c..5775a5cc3c6f 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -66,5 +66,5 @@ EBUILD kgcc64-7.3.0.ebuild 1256 BLAKE2B b87b6ed043bd9fb82e3082d4ebf52faa1ad0d27d
 EBUILD kgcc64-8.2.0.ebuild 1417 BLAKE2B 5719bf546721d85a78dcf81a0264cb51bbbfef5f6963dbf0219018c34a65da0ba4d36d0e8f9be4228b7da3d291f29b3f822ae0dd4511fed864275ef6726caf95 SHA512 b347147977439b6257675f4fb1fca9f0bd5828571c7ad6bd0623d7350bb85ef472906728ac7b4f17e8cd6a16b9a0ed56396c68c371eb984191c4225e3cd74c5c
 EBUILD kgcc64-8.3.0.ebuild 1253 BLAKE2B 380cc764ddf5e4619e33f62795922ba3cf64c196c8937b74e491dfce25427c60fda3105a38a484c465123852f6ec89343a301a74043541db786e2d828c499cea SHA512 08d00606e0b5f603d66e3d7398c56831c4a9f8c612a42955eff195c60c3e6a2cdaa9bb203fd076a70795eb4ef9eb41e445f0f41dc204e250fcd770bd9c1c53ce
 EBUILD kgcc64-9.1.0.ebuild 1084 BLAKE2B 4fd8dafcfd8dacbe4daea58457434a0f66da7b09589b4ac4281d9b13cfad92f9bc82e6f19f7f3742267b2b3d20a0d86d135daf82ba1e729535054850dfe3ede3 SHA512 4892d29f5a0ef47402b37966e218ecc722a0352ffcb4fc8b77681b58b2c77788a523be434df77f6b252cc3542fcc0d8950a6553d05077bafe44dc6ba3065edc8
-EBUILD kgcc64-9.2.0.ebuild 1082 BLAKE2B baff05bc1722cdf84f36cdf9500cbe04e861a47a20626e0f2bf49754355b21684ff83d8135367fbd9a43e9e6cc0496733036bf4f75290536fb507dd5b655ce15 SHA512 8982f56eaf2a0d7957464ef18b5ab560eaf1bf3578876a58c0290d4895a7e0450058dbd2cbd642ff2077d4faa2be83cb54206ec64425c453bb27a2e0bba85862
+EBUILD kgcc64-9.2.0.ebuild 1081 BLAKE2B 3788816258768aa3c3ce69aaafe0fa371cc5c728f3cfb12f4444ae3abde90a457144d7a9ca34008ff75a017dc61dcc988942e0370ba5073f9270fd5de230a558 SHA512 8f2db222fdc4e4987bf2274365f8d419875c2b3fb66b4108bb755580e6602f84627cc70a29bd84765b3ee29299a25cab7451b3b9e23382d5db4947b27849030c
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/sys-devel/kgcc64/kgcc64-9.2.0.ebuild b/sys-devel/kgcc64/kgcc64-9.2.0.ebuild
index 73a7576ad10e..27e450f26c2e 100644
--- a/sys-devel/kgcc64/kgcc64-9.2.0.ebuild
+++ b/sys-devel/kgcc64/kgcc64-9.2.0.ebuild
@@ -21,7 +21,7 @@ inherit toolchain
 DESCRIPTION="64bit kernel compiler"
 
 # Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa ~mips"
+KEYWORDS="hppa ~mips"
 
 # unlike every other target, hppa has not unified the 32/64 bit
 # ports in binutils yet
diff --git a/sys-devel/pmake/Manifest b/sys-devel/pmake/Manifest
index 76f90d601ba1..1891746168ff 100644
--- a/sys-devel/pmake/Manifest
+++ b/sys-devel/pmake/Manifest
@@ -1,8 +1,6 @@
 AUX pmake-1.111.1-ldflags.patch 484 BLAKE2B d94f955c6ec149b7617c26010e7364fe2ad5e88ae39251e2e751eb69a3d60e855783fe621b69c9bc418e0c09b17d95a3247517b3a477ca52b45a2068e18f339a SHA512 10276e6caa4e339a2e7c787ee04dc97187d48cf433cd6148ec5451ae055d638f79c8d8950c94fe84cdffa02b20519423272f09a6ee669ab026db861442051849
 AUX pmake-1.98-skipdots.patch 513 BLAKE2B 03f63f698b3d147dc0d1df0140f40657cecd445d7c7659f18369e5fa541b0370ced4cddafd27639149aa93053440f7d43b715baf1893cf4613ba15fe6820bdc9 SHA512 ccd751cca406abdb763f251c147f7b7efd7b001e415bc8c98a4fa8069420b64c3a5819b4abd5f174606390f903f8cba5e560e02a14519619713da26ab52c54ad
-DIST pmake_1.111-3.1.debian.tar.gz 32176 BLAKE2B b1e9508a4f14ca856dedca8bf52af119f988b4f1ee50af1170f0afb6c5f1f6a5524cb1debf21e620be59cd8084ae6b1e3becd664ca522b8e04928933a085d0dc SHA512 a5743c0b0478119cf8ac01b0182f14cf213b275078b1cd2badee9ac26a3b40660bf4fd430af079fdaa7bc8117ed8a1cdf855166e34e151204e34e7d2b67beee3
 DIST pmake_1.111-3.3.debian.tar.gz 31648 BLAKE2B 31aca433bbeac4275d4c2af0cfd33ef81b0086b0dec107edfc1fba55b15480367ebf62abccd6e2e48f0c7ccc25c59f0b07eed7ac950a5037b73c267b066a9638 SHA512 b22a1d9e371712732f196d91ac3eb9239fa98ee8ee05754576e7a5878cab88976cb10bb6be90706df5ac738373f519468403c23f6a3ff3860a2968b3222a66ed
 DIST pmake_1.111.orig.tar.gz 264383 BLAKE2B 54dd510251441b54c9f5d7f6061109b0222191b3acdded1394b51b72b87bbd4255edd80fab46976d92c58929693b6809a9f2c4f001cab8c9cdaabfac9f3adac9 SHA512 ad48708ea014d6a38ad36303504c52992b51a1e815564f1710849d859b1fc3cd58c4a1a71f54ec902c9b69112e9cd1e1a64282ff738439cdb209a4f75c364c22
-EBUILD pmake-1.111.3.1.ebuild 2361 BLAKE2B 13c302eadc35b53b945c8a5d04cad8f2d69e42ba5e111b0f2e5eeb4e84a65c39b43d4821e92d622513207a851bbfc4e3d9acbcde948610d11511b4da11fc2ad0 SHA512 8c94e3b2c70193e10663caaf3a456b88c9e3343c6d1bf2dcc1640bfdda96b1ad703b655b7db06ba7b29b9f74ea0cf7f25744b8afa52ed0b4befe36f8950b5278
 EBUILD pmake-1.111.3.3.ebuild 2379 BLAKE2B c735f404dc8f61a7e80b27d66c8da02108b5f8bcee622166a2de835090bd4ef9c334430977dc28bb21553ba62e726758e13b0047475083a46a50fee4c9864aac SHA512 372899a6500e07f6b7af455a0b74a0e9e778be0346f8dfc0817caad25cc6aea7d98e369f820b84cc2d75cc2098b78621e6be002e032aa34c3ba1ac6ca77edef8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-devel/pmake/pmake-1.111.3.1.ebuild b/sys-devel/pmake/pmake-1.111.3.1.ebuild
deleted file mode 100644
index cbd8c14db38e..000000000000
--- a/sys-devel/pmake/pmake-1.111.3.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator
-
-MY_P="${PN}-$(get_version_component_range 1-2)"
-DEBIAN_SOURCE="${PN}_$(get_version_component_range 1-2).orig.tar.gz"
-DEBIAN_PATCH="${PN}_$(replace_version_separator 2 '-').debian.tar.gz"
-
-DESCRIPTION="BSD build tool to create programs in parallel. Debian's version of NetBSD's make"
-HOMEPAGE="http://www.netbsd.org/"
-SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
-	mirror://debian/pool/main/p/pmake/${DEBIAN_PATCH}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-g0 -E --no-backup-if-mismatch -p1" \
-		EPATCH_SUFFIX="diff" \
-		epatch "${WORKDIR}/debian/patches"
-
-	# pmake makes the assumption that . and .. are the first two
-	# entries in a directory, which doesn't always appear to be the
-	# case on ext3...  (05 Apr 2004 agriffis)
-	epatch "${FILESDIR}/${PN}-1.98-skipdots.patch"
-
-	# Don't ignore ldflags
-	epatch "${FILESDIR}/${PN}-1.111.1-ldflags.patch"
-}
-
-src_compile() {
-	# The following CFLAGS are almost directly from Red Hat 8.0 and
-	# debian/rules, so assume it's okay to void out the __COPYRIGHT
-	# and __RCSID.  I've checked the source and don't see the point,
-	# but whatever...  (07 Feb 2004 agriffis)
-	CFLAGS="${CFLAGS} -Wall -Wno-unused -D_GNU_SOURCE \
-		-DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_SETENV \
-		-D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -I. \
-		-DMACHINE=\\\"gentoo\\\" -DMACHINE_ARCH=\\\"$(tc-arch-kernel)\\\" \
-		-D_PATH_DEFSHELLDIR=\\\"${EPREFIX}/bin\\\" \
-		-D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk\\\" \
-		-DHAVE_VSNPRINTF"
-	if [[ "${USERLAND}" == "GNU" ]]; then
-		CFLAGS="${CFLAGS} -D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk/${PN}\\\""
-	fi
-
-	emake -f Makefile.boot \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	# Don't install these on BSD, else they conflict
-	if [[ "${USERLAND}" == "GNU" ]]; then
-		insinto /usr/share/mk/${PN}
-		doins mk/*
-	fi
-
-	newbin bmake pmake
-	dobin mkdep
-	mv make.1 pmake.1
-	doman mkdep.1 pmake.1
-	dodoc PSD.doc/tutorial.ms
-
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		dosym pmake /usr/bin/make
-		dosym pmake.1.gz /usr/share/man/man1/make.1.gz
-	fi
-}
diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index 6c63db65f1bf..f26d65e2a4aa 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,10 +1,4 @@
-AUX smatch-1.57-restrict.patch 406 BLAKE2B c22cd24b1666c73daef2b90bd9e8235c418630f153430206f5d32b224782e7d500a6524eadec6ad6c0ff4d379725b84ecc7d8dcd185e7451593e50cfd7929e04 SHA512 fa4816a24a2f0ff4aaf057ac83fc0ba4d9787f0e2daa7e6999700448068460adddce6fcac3efdb7aa69e4d60b9eb34f4ff17056e8037419ac4f5d21b5be5514d
-DIST smatch-1.57.tar.gz 491677 BLAKE2B 150ba84dc797497b2522d28b443a89fbec221a00fcade85014d434f675ec60908a473770c695dbf65a5ed273c3e665aa9dc4ec9a91bc071651388a9ec90f1bfa SHA512 031f417c97d58b617b2e375a28f509f71eb2735212a98aee0e21880a28842078ad3c24b5375a03f73d75fec582a9d187ed6a00a0512c4792e5ffce82dfd79b99
-DIST smatch-1.59.tar.gz 495530 BLAKE2B 668a050e229cd9b4e5881fe059f5a8654164f5a155c471559ce7a82e66bcb2170f89a25680be7ff867f2765b574f363ef95a15a65ca98d47dbd8aed20f588f9a SHA512 5e18f48dbbe11255a06b427205aefd1f8f5a11bb0b238f9134b89e6f5cb838fcae649a4e87a4a04473a33077c94e88aab46b06e33cc87cfe451fa83b5846ccc7
 DIST smatch-1.60.tar.gz 558479 BLAKE2B d5e564c32e33dc38847f9a258b4b47285f190652181db9b8850c832c0cf4d8a3302d989a7b42592e73a713927a29565565e83a9be1b0a5c9d10869fce278a0be SHA512 2920c9d4c500db36cfa60db5be70d157ed16abd729279462faef6f79e0756bd017ec91b8f857d19fdebd8a9d709b0555635700a2864cf0a84daa61cf2ca3eecd
-EBUILD smatch-1.57-r1.ebuild 1259 BLAKE2B f7087313102dcddbf48144d7e4466d5b84d736ba6332dcc3c613dca105933cac4b88ee128d62b61e002a2fa9558d190535d83909de3b7da79a63cbf5abb32386 SHA512 d79a795083b48938abd2dcf68cd119b0db642c563e57ba8e38a3ec1031e3bb3ee29c40abc3db6f98b1c0300836871586ace56447376b203dc0ef5395342bd268
-EBUILD smatch-1.57.ebuild 1210 BLAKE2B d9a0ad71528dd7676e0dc3891413cc6bbe17ce875905b7c184a47148331d5222dfcd4e4614c3f9b510f8b49fe2e1f0372e6ae3a740a66bda4e1fe2a5b86eabb1 SHA512 310410b07f94e7ce5fb353696139e28b88af5b0bf112fd078a2c79dcbb6816d6db9dac9c5c2049a3a7215a4b311915b5b33dbecc0d34aecbd2e5cd3bd05b8c5c
-EBUILD smatch-1.59.ebuild 1218 BLAKE2B 3afa9b44109f0be9329a8a756cd30e574d26d39356f3c578f008f333c1a1ead766ba14e7e6f899d24433942e651e8061d70dec9a6336198f17994ff582978dab SHA512 9b88a6e66559e5c68109ef663000cf6b7ce496783b2643a6bb9f7d6fd5e13bd10e7b3bec53867bf93c77d3d2dddd9dec3b92836b2245eb6dc412b3eca6073855
 EBUILD smatch-1.60.ebuild 1250 BLAKE2B 1960cd8b368c13439e4b180c5440e4f38775e4580360b01c498a4f793facc8a695871f22833d25a578dd33761f577723d75e9d4c0129c87945f176a8001dd69c SHA512 829f80b6695883eece120429735f3021f8f0e8a808ee8ae4e3018faa72b0147ae999f3892dce7252dc228d4d6eddefa7d7783d6418b5abdfa18be9e264500873
 EBUILD smatch-9999.ebuild 1195 BLAKE2B a7ccccf1b37a9cd03a0b9d5d0308d842c41b162e84eb2c70843fe74abf320ebdca2d517153079910c9b91e87a9156b115b5daf23a74713516dc0f7040507285c SHA512 3e47cbad0a9ac2d6b9775866ff6bef56aaf94b305c9132837bbf23629b960a339946732f76fff3aa1a1c88ffff0571e7d7cce422fe797797c04e548cfca89a7c
 MISC metadata.xml 337 BLAKE2B 3215b338ec89ebd2d1d39e33c5903a6ad571ee6ad4236968a2c250f2d7882c90c2791746df43455a7fd63ebff544177f49c9e0074a31ccd81f7ef68f1eabfa82 SHA512 8d4007163912848eb4e4b525c808e7c69fe5aa93913398db793b6ed73936cc936a25e1fe7dce4a915b4caf6b2796d6dd4d1a52ed6dfbd2e0fb0faf6c0ba1c7e0
diff --git a/sys-devel/smatch/files/smatch-1.57-restrict.patch b/sys-devel/smatch/files/smatch-1.57-restrict.patch
deleted file mode 100644
index 2f0dc98d496a..000000000000
--- a/sys-devel/smatch/files/smatch-1.57-restrict.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-send upstream already
-
-diff --git a/parse.c b/parse.c
-index 5dd9a06..bf5894d 100644
---- a/parse.c
-+++ b/parse.c
-@@ -419,6 +419,7 @@ static struct init_keyword {
- 	/* Ignored for now.. */
- 	{ "restrict",	NS_TYPEDEF, .op = &restrict_op},
- 	{ "__restrict",	NS_TYPEDEF, .op = &restrict_op},
-+	{ "__restrict__",	NS_TYPEDEF, .op = &restrict_op},
- 
- 	/* Storage class */
- 	{ "auto",	NS_TYPEDEF, .op = &auto_op },
diff --git a/sys-devel/smatch/smatch-1.57-r1.ebuild b/sys-devel/smatch/smatch-1.57-r1.ebuild
deleted file mode 100644
index 6a2ec7381faa..000000000000
--- a/sys-devel/smatch/smatch-1.57-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit multilib toolchain-funcs eutils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
-		http://repo.or.cz/r/${PN}.git"
-	inherit git-r3
-fi
-
-DESCRIPTION="static analysis tool for C"
-HOMEPAGE="http://smatch.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	# The repo.or.cz site does not produce stable tarballs,
-	# so we have to cache our own copy of the snapshot.
-	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="mirror://gentoo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	S=${WORKDIR}/${PN}
-fi
-
-LICENSE="OSL-1.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-db/sqlite"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-restrict.patch
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
-		Makefile || die
-}
-
-src_compile() {
-	emake PREFIX=/usr V=1 CC="$(tc-getCC)" smatch
-}
-
-src_install() {
-	# default install target installs a lot of sparse cruft
-	dobin smatch
-	insinto /usr/share/smatch/smatch_data
-	doins smatch_data/*
-	dodoc FAQ README
-}
diff --git a/sys-devel/smatch/smatch-1.57.ebuild b/sys-devel/smatch/smatch-1.57.ebuild
deleted file mode 100644
index f232ca67e03a..000000000000
--- a/sys-devel/smatch/smatch-1.57.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit multilib toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
-		http://repo.or.cz/r/${PN}.git"
-	inherit git-r3
-fi
-
-DESCRIPTION="static analysis tool for C"
-HOMEPAGE="http://smatch.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	# The repo.or.cz site does not produce stable tarballs,
-	# so we have to cache our own copy of the snapshot.
-	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="mirror://gentoo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	S=${WORKDIR}/${PN}
-fi
-
-LICENSE="OSL-1.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-db/sqlite"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/^PREFIX=/s:=.*:=/usr:' \
-		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
-		Makefile || die
-}
-
-src_compile() {
-	emake PREFIX=/usr V=1 CC="$(tc-getCC)" smatch
-}
-
-src_install() {
-	# default install target installs a lot of sparse cruft
-	dobin smatch
-	insinto /usr/share/smatch/smatch_data
-	doins smatch_data/*
-	dodoc FAQ README
-}
diff --git a/sys-devel/smatch/smatch-1.59.ebuild b/sys-devel/smatch/smatch-1.59.ebuild
deleted file mode 100644
index b8be38b5cade..000000000000
--- a/sys-devel/smatch/smatch-1.59.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://repo.or.cz/${PN}.git
-		http://repo.or.cz/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz
-		mirror://gentoo/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	S=${WORKDIR}/${PN}
-fi
-
-DESCRIPTION="static analysis tool for C"
-HOMEPAGE="http://smatch.sourceforge.net/"
-
-LICENSE="OSL-1.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-db/sqlite"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
-		Makefile || die
-}
-
-_emake() {
-	# gtk/llvm/xml is used by sparse which we don't install
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		V=1 \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		LD='$(CC)' \
-		HAVE_GTK2=no \
-		HAVE_LLVM=no \
-		HAVE_LIBXML=no \
-		"$@"
-}
-
-src_compile() {
-	_emake smatch
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	# default install target installs a lot of sparse cruft
-	dobin smatch
-	insinto /usr/share/smatch/smatch_data
-	doins smatch_data/*
-	dodoc FAQ README
-}