gentoo resync : 10.02.2020

40 files changed, 368 insertions, 374 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index c91a78757dd8..9db480e1ccbc 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 1479e042f92f..f1cb72d34477 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX ac-wrapper-13.sh 5055 BLAKE2B 66fd728f347cdb873007e51113225608b3dae87c5979ba512a5e65a3185d8278502cdbaa60675b33643e0f9f459cf3956967f8e07b198d442139abb06a75f597 SHA512 0bbe9a992cff140bd60161404f1d1f6a9da6c79b1e9909000092f5e1159e457edee3fcefcb8fcaf47cedd9a7074505c4a61bc25107277d248150cdde5f11c5b7
-EBUILD autoconf-wrapper-13-r1.ebuild 800 BLAKE2B e648bdd4dcb0565df755f53f0ef42af7c7ab1b7181af07311508aac83e919ffd39114521baad03cac5246e574f7dd23e27f3427d67feadadcbfb18e26402b835 SHA512 5462fed84c3d0ad1052bb03fee030b05998cf5ae10076f084cdbdc38814393d84f330d2344a998d95f7288913d73b95eff393d181f24077da76feb2140d88cbb
+EBUILD autoconf-wrapper-13-r1.ebuild 817 BLAKE2B 6a7ff34557e5fa0c2f6d53f2830ff808e9eea7f6e68962ad9a6a86d9cc87fe71ec83f4d1126036ed3287628b950fff8bb776e0d36428039ff8374b45f860e9c7 SHA512 9ce5fcffc1bbd99ca2eb0ae66a9c95a6b11b187c05588845a5100781f439bda0fa1efe5f6385e81e3748b3e44086661f90b75bb6892caba02e4b5f3e83c03dba
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
index ce00bbc6649a..69583181ec25 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib
 
 DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 30734f3286c2..b6eaa09b79bd 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX am-wrapper-10.sh 4626 BLAKE2B f7261f39e06afa88eb0b52c5ccdcbb2b4fabe3bda4fdb50ef2c974d4a03101439decb76edee3d0534a621fd4ca4e5d574a3af2701e382f7c07f838a5235ae6ef SHA512 6f1611000ac2dd901a24efd133522274aa8feea02610645f3b1332a3f294de687f65e995b398a487b1d030c74dd278f65fcd224007ebe7e950af03660cc38f60
 AUX am-wrapper-11.sh 4626 BLAKE2B 2a96abc5b93db360a3ce074d84b21d7f875ff42d54f99030d8589b84efc94b411d8fb1a707716a060dc4a66c59f2a84d1e50a70f681faa62358fc7ae7a5a7d77 SHA512 452c0c52ef65b1ad5ad8d8f5c9c12cb9ff18eb03faaf7217c52a7dcf2a9832c7d4a59dbd8cc6325a0035a6650cc913f9b842615d053bd0f0c5c5177e660dbfca
-EBUILD automake-wrapper-10.ebuild 900 BLAKE2B 2e0a944db8ac736f9b1cbbd61f4ec0c300ac12cdd19a5eaf4816ab902de847e44f1f083338ebecea999689a0c232c20f47a4fcac72cfc691aeb06dd256e4fe46 SHA512 bf6ac5bafa41ef32b19a21c645a9eea750a8d24c3dc688b9688cb0aabe470d1b9eb3debefb9c97f65773816512cbbcfa53d83832e7fdcd8efad0767578f741d8
-EBUILD automake-wrapper-11.ebuild 912 BLAKE2B 7392ddca6c5e2e8e78cf05c618a8f617c1d5719593ff541d14da7100ec14507676238780d94e448fd43e3cf3eef5be3905ff26651c012f543deeaf9b3639138e SHA512 e191a895459d58d428dd4bbd3d70b36ad7947631aaaa3b4930bb6e3668211f82481b23b412ff00b1c1f91d7ae5a889c6cae2b83098b5aebd72c5e6de78bc4df5
+EBUILD automake-wrapper-10.ebuild 917 BLAKE2B e83d2b46f0d902a661f77eeada92c60d14259d35651aa07af18fa4b7f2a49c536bb6b7ef9442e9fd26a83907e165c1ec10614d7a546f189f21013aaf150fc4b7 SHA512 b48e0149c40ec365e05b73498d4ede0ec396f37fd35e4fc2d4c1fce76706ed81b32bc3712f901924976d885c97b76c7130d19e815ef6eb7c8fb1827d3c5b1617
+EBUILD automake-wrapper-11.ebuild 929 BLAKE2B dd7b335ad2300193dd2bf84efb9c9fc02b9c7cf05593872f5bd9ae7422f157c50291f267b7f52624edb3a2cd79c8fd67451b7a100922d1747866a871bb4ffc14 SHA512 acd190000e11871700142ad17d29a08200737222cf954747a32a3aae042a94e18168bbb795e8cfa6da52c80c58337abbc5589d5c4d50253bc63045c15babdaaa
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
index 647c332174f1..352898779ce1 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
@@ -4,7 +4,7 @@
 EAPI=4
 
 DESCRIPTION="wrapper for automake to manage multiple automake versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
index 30f2d8a56e42..47187bac2e03 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 
 DESCRIPTION="wrapper for automake to manage multiple automake versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index c6ce15bcdcfc..347e64bb220a 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -58,12 +58,12 @@ EBUILD automake-1.13.4-r2.ebuild 2685 BLAKE2B 34bcc55769092f11a8de24092b1114cd91
 EBUILD automake-1.14.1-r2.ebuild 3104 BLAKE2B 8e77934ddeb4ee42dfbeab5fa28faa39bc8593df9bbdbce16137aed1a521a80eab8be9bffb88b1197714184fab8ae5c4e28341a050728ef312ca514856f3c4da SHA512 fb849c5d7f2039740ac1a79ec724b53ab3b46fd9d75645e34fd3d9414b4fdef20c7b8ac367002bd11fb39987900252c5a0e633a91d08101846aec6d0a2cd7c3d
 EBUILD automake-1.15.1-r2.ebuild 3209 BLAKE2B f23c402d2c59ee7cd9f93586588a075ba0cf3e45ea201e56198f9476697c6da294b329db129b144a17dd85cc6a77196f703ea8c74719802240b3b8b0fc1af341 SHA512 9c5ec7c122be237cbadede1e235001a3c61a141e58b55dd47b5b9fc84a19508e466c42237ecf21dc51f7d5eb400e367c7586d6f6005ed93e89c1cf2edea1e526
 EBUILD automake-1.16.1-r1.ebuild 3134 BLAKE2B 37eb2da90f10ff92002ca41287b1e9e263a8c661aeb2d7c8433f9ec163e6bdef585b78c608b3d97b1197e5a9997fab78b1a05a030f6f8af9a3a44d0b6fcf284d SHA512 e30488c67fd67f6cc1c81fcef465350efe6e43e4e182d051cf114a44e91c830680aac61e4597c44b6fd6368fac0a0f94364811bcf94bdfcb54e225e9a6ac4c0b
-EBUILD automake-1.16.1-r2.ebuild 3644 BLAKE2B e3413c216f19d962ebc0912e6eb065a1e6703f7879946788a58fd36c0b16ba5cc5aafa6be8063eca7a2d75aff0a9042a4a7f7fb3c0ea7a5810b4008e3211bf4c SHA512 a440a71cebe25e5928605ab1751bc90f8e3961d0e3fcb2df7cff307eae93a488b9f6bcef7ffc7620506aa8351ee97db852e073dc112d489e954475c41271e04d
+EBUILD automake-1.16.1-r2.ebuild 3634 BLAKE2B a4f5d79711ca1893f2f4e79795b4709eb51abada943c694491231321fd9234d0981bfc895688740abcec60d6bb9fc833a2e49ec3d8449c357e94b0e36d508130 SHA512 2291107c73bf175925cc4d5b3bc1fc9a78935a6d757a8ae1d5cb8ac818650219381299e4923238da41857acf34809f2cae71ec69d1e6c056d24c5b8adaf05bb4
 EBUILD automake-1.4_p6-r2.ebuild 2472 BLAKE2B bac085be80461c6e31963e94bbee7341cf0a5428fbc3352569aedd523c6f623909e6729981b426932060e48896ad8623d64ced2932cec9219006817bfe74bb16 SHA512 3b90a68d8e09ff5043424716351e92e09cd5dc3d7fa1434d5da09813ff7d923a0bd9d7b7045ed29b97ff001123db9a943096c1ad401eee57377d2d2bba7d6fc4
 EBUILD automake-1.5-r2.ebuild 2290 BLAKE2B 99130d4c68bd645ed282a230f3a67055057e5d37b5046d37ad71cde390014dc7e3428866cc5ab0922b9c37a7ff6c867d25645ee8fbb93c128662534a0e88a040 SHA512 f0d1602548cbffd65dc1c53da135d1fa53c195a66e42df59edb8211e6a5e37a9270e2054bcd10de73330ee782f2a615bdf68c44f4ffdcc9f916c47de7cab22eb
 EBUILD automake-1.6.3-r2.ebuild 2038 BLAKE2B ea178a3348d2b7b284ae05083c8a76558413a296494705ecdd9d76613f4617d75eba911e55b7e45903fb27903d69d5a63d72dc36bc8021f2dd33f9f3b08a1c54 SHA512 6c8f3984ea50513cc75bc7f8c54535be62fc3550ec34e2d13b41eaaddc2193a4ad9a3e04d2d0683cf28b3011b8251382d82e10ba1e127c23ba7d86612bf73002
 EBUILD automake-1.7.9-r3.ebuild 2193 BLAKE2B 1c83a7dc99e37e36a02d3f261de1cb528cfeb60dac68dcd8cd25b429d9c3ca739ef79cbb7a32e50519e95a901356dbca6ae414f06f5e0d527bd99bc33f6edfdc SHA512 ec3bc0045ecf7ec72d4794e812bd4920497cc1098ccf7113fb5adc2c6cbd150064264aaf525ac4d920e18943a4c6d82089b485fa7c10fc4f70638062b06554f5
 EBUILD automake-1.8.5-r5.ebuild 2220 BLAKE2B 5cdc6269a185f80ac164ed57bd5447217c35a1f291e8ca879e9fe9a66ef0846f96e058bcd9f36fda8599d88b2b4c708c6ecec23a9c2b4ecf9b6e70a43fca07db SHA512 e4e326de0ec8ecc32899ce3bd6fdc174ebe46d5442456c722e45ec53cb704b7b3cc2b349cbccd7d94b846cd57d025a8a230f2de4e92d832dd2d8354d4ff10161
 EBUILD automake-1.9.6-r5.ebuild 2568 BLAKE2B 19ca59ff6333426b2c13f7aa5979fa792ffb59b3cbcba61db676eb0df9cc0d6f747d52d6f713013436a990df0cffd8f9176cf5be4f957be6664430e469c53561 SHA512 2dfc5963155932eff99a909a3ca15c013c3e6260d73e15dc098215d4e4a988a2115fd6c711bd4fe7c0ee243008c75849a9490c14444493c3292c384fea93cc3e
-EBUILD automake-9999.ebuild 3644 BLAKE2B e3413c216f19d962ebc0912e6eb065a1e6703f7879946788a58fd36c0b16ba5cc5aafa6be8063eca7a2d75aff0a9042a4a7f7fb3c0ea7a5810b4008e3211bf4c SHA512 a440a71cebe25e5928605ab1751bc90f8e3961d0e3fcb2df7cff307eae93a488b9f6bcef7ffc7620506aa8351ee97db852e073dc112d489e954475c41271e04d
+EBUILD automake-9999.ebuild 3634 BLAKE2B a4f5d79711ca1893f2f4e79795b4709eb51abada943c694491231321fd9234d0981bfc895688740abcec60d6bb9fc833a2e49ec3d8449c357e94b0e36d508130 SHA512 2291107c73bf175925cc4d5b3bc1fc9a78935a6d757a8ae1d5cb8ac818650219381299e4923238da41857acf34809f2cae71ec69d1e6c056d24c5b8adaf05bb4
 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 1c06ea4470f4..47c426b024ca 100644
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit python-any-r1
 
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 1c06ea4470f4..47c426b024ca 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit python-any-r1
 
diff --git a/sys-devel/ct-ng/Manifest b/sys-devel/ct-ng/Manifest
index 61603ff8ae08..e6111f39994e 100644
--- a/sys-devel/ct-ng/Manifest
+++ b/sys-devel/ct-ng/Manifest
@@ -1,5 +1,5 @@
 DIST crosstool-ng-1.23.0.tar.bz2 1782247 BLAKE2B 77835534b5b664148985b57580bf24fa6153e1fc327be0622e55d9ff5c1c5f446039b293a7d1718bfbec89789638f80033be012e0878f75a57648bd574abe10e SHA512 1842d140b1c4f76783751eab60722e8077f356dfc9e9cc941d3c991a7e9bb23cb19e6bd7cd5c630cc87967853c55e0c16e415b222e546b5baaffb264ca799b69
 DIST crosstool-ng-1.24.0.tar.bz2 2058069 BLAKE2B 4108e9546acd6c0660552595d41164ce9c4f07985851a911c260fcc9e2ec70e80136b6cb2090290ca2aa2ceeb4ebc61fca183340de88eafd800bc2bf18d0cfbb SHA512 379e668365628f0ab359ae119213bed44960870093f64f0fbb12e92bbe2a3b82bfed77f5ab33f2e2f17c1977e7a63f2151c46ad8d0e6208220fb7fa8726fae33
 EBUILD ct-ng-1.23.0.ebuild 748 BLAKE2B a4ab8307eff441718ae4ff61ebe338b875a9e55e8a46c9892314de66e8d70a80eec8b11b2022fa3a9cd901911d81ea64256480e465752a13e127e84f4cab39ce SHA512 cba95e3d2ff49ff2f025ef8acc64a47258ffdfc810602868ab151c6eb5ccbffa3e74a16c9b62b371d1da636ba07b56a54a1da8368c078745056715493fe4a648
-EBUILD ct-ng-1.24.0.ebuild 687 BLAKE2B 8054d773167047742cba39add11e39d6875d29dcc86d53b3daca41105c3dded2d0b46965dad5987d681215cb4cbcf95476ca069a859207c14b12d1cbb1a0976c SHA512 6d3f5b56cfdcdea3f45aa822c9d7e5eae5dcdfb61868c831140b97eb686fa06ce4e41d29e6779d964d2352472f68417cf4418fa9978f7189f1c2fc8a0b1ce8d4
+EBUILD ct-ng-1.24.0.ebuild 685 BLAKE2B 0aa396249458fe22f4a7d67b030a0ea12c56090a48b66d9a28878cd5c57a433fe7b2fa38f54ad6e6f73871c013d4ab6d096f4693398f57f66077ad9e02086c48 SHA512 1f841e1d0781b2cf3cf7784a486ce0cb06bf3ff0eb50ac4dadf367dff785ec65bf4236413b5c6fbbe585d2623aac6958d624b713406bdb8135d7e5d463baecc9
 MISC metadata.xml 583 BLAKE2B 89762f62a6bf27d35208b090d92f8b155ee795c13c995ae088bb06b49f89a9df440f301a5ce7ba89f9eb6237d9edb4fd721a0e36c8a3dd3b21bae7065e01f5fe SHA512 7fc4a634b054c9f793b9a4ff343f78a3bb96835662ba4c2fc5a2abe801b9c97eebc50aa6ade6ff2eb25d8cef2984023317149d74d242d4b17302f05257079434
diff --git a/sys-devel/ct-ng/ct-ng-1.24.0.ebuild b/sys-devel/ct-ng/ct-ng-1.24.0.ebuild
index ebcbb34f2c48..3bb25cdbe1c4 100644
--- a/sys-devel/ct-ng/ct-ng-1.24.0.ebuild
+++ b/sys-devel/ct-ng/ct-ng-1.24.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="net-misc/curl
 S="${WORKDIR}/crosstool-ng-${PV}"
 
 src_install() {
-	emake DESTDIR="${D%/}" install
+	emake DESTDIR="${D}" install
 	use doc && mv "${D}"/usr/share/doc/crosstool-ng/crosstool-ng-${PVR} \
 		"${D}"/usr/share/doc/
 	rm -rf "${D}"/usr/share/doc/crosstool-ng
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 5934fb458a15..c66b3a67ab59 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -3,10 +3,10 @@ AUX distcc-3.2_rc1-socks5.patch 5462 BLAKE2B 5c18de909306bf0fa24690fae618c193396
 AUX distcc-3.3.2-freedesktop.patch 4210 BLAKE2B 7c1500df8cd8568d68c51a3d14eb7240f16adabf9c664b3295171901f4781a9d7b9b9510e577ca0b85abaf21b9783dd9fa98f351089dc98f52f6182bb841c658 SHA512 7454df35d134dff9f5640f7a1a4241b99fe4c6051682af185657837f25cb870c27885ec9be74b5f01075801542decb54daf7db5d80fbdbecf5c8c721a6ee4e7c
 AUX distcc-config 5218 BLAKE2B 41d483481e483217ed6313b4f82ed66c4f006070c269bc5ee1283db9c000d12ab29a90d1813df2a590f87c02520e312c35901a7d3f1364480b68bb02d668d51d SHA512 fe3dee7a89ec16e103b52d3555d483b42e4cbe716e3e77f792c543fb2c82eca5f6b8e0d2809f16c805d55263471108ff2dea1f4a5d55826f67f8b94239aca946
 AUX distcc-hardened.patch 1084 BLAKE2B 4b78fce2ab19b3832006a8b0092d3d38df07ce8225eb367c90256a158a41121e09269cd4bf59a1fc450db58eafe09e757f6e3ca4ae074a4567676701228c8289 SHA512 d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057
-AUX distccd.confd 1189 BLAKE2B 62791080d43004faf5fc4fb61e506bf3f0f8c2a677d4c24e7d44af692ca7b825e173624343f7e89ae7bff206fdf9543e0308ea4b2db90326c0de04eaaeb62f0b SHA512 1769bd32b1e03e7f8a8e6dea82c1709754d4d0fb12e59e9bdf885ac98f13e26d6c3fdf6575512a8b65299043beeb4b86f6c0b1c884daaee73a5c77d09e474545
-AUX distccd.initd 341 BLAKE2B 0781b860647e68511d19d592cb65cf4c03ea15a8499783755772f5a448393befc2b450de703168a2b062e9fe0d8690a7ea3cda271a5bad2560099c0b5dc6c12f SHA512 bd5aecda5153589a78cd5ff82c34b10176efbd994ab82caf8f63951c04983f6e65459784c1e7644a323ad1696aa0a62b38e863ee1c42a15241a60b22942f8dce
+AUX distccd.confd 1328 BLAKE2B d6a4756afbe7813733227091028e1db570371750bd22dedbfb66e4d86e995138cdc3a63c853b5674c8678bf0475d7276c45f74b40ac916d060760f06ac3fdf73 SHA512 e6ff0547892b9e7a255afeb56eb07516e4b328d86d5d987872f1bf24a973132544e9f17195e5f8827305218429adb1c5290cde3ef1c094efd035592cbdde7eec
+AUX distccd.initd 374 BLAKE2B 48011f19225536311701250470011bc1c1be16f2400831964dd5e28920d4a0c955565a15b5014118e6fa65f4ac12c99d2f2dc6a63c1aa5863b0ef9633953ff82 SHA512 f707bdb15066e4eab4481c6be7e482e81f58586456123b42ddc3e92b0d7973b81975e3670166e20d0814b0c0d7441bec7788e9bd16af5fa9746380895b23bf65
 AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
 DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135
-EBUILD distcc-3.3.3.ebuild 5603 BLAKE2B 9fbc1d99af2dc7cc38764ea523dc6e7135ab70b7148528ff747a97f914b213f23d7997d3b2cceef651f394e0452776b5981704629d7751535fdca03fc7d33db9 SHA512 7499b9037cc7590e6742f68161b1a2bbd7e414ce0be3ccd46cd2059cdc66452878a10979b3d5381347ad1c4c77393f8025d1467567c0369b5d182938deaa3e9f
+EBUILD distcc-3.3.3-r1.ebuild 5603 BLAKE2B 9fbc1d99af2dc7cc38764ea523dc6e7135ab70b7148528ff747a97f914b213f23d7997d3b2cceef651f394e0452776b5981704629d7751535fdca03fc7d33db9 SHA512 7499b9037cc7590e6742f68161b1a2bbd7e414ce0be3ccd46cd2059cdc66452878a10979b3d5381347ad1c4c77393f8025d1467567c0369b5d182938deaa3e9f
 MISC metadata.xml 606 BLAKE2B e6d738b3d7fed20430d4ae45738c9e4b2447a61a1a57735bf0fa8e1e177e1e0d027a71ebff71de9cbcc5d1d5800a31946002b1e36d73a8c31b2c097360a1dc64 SHA512 e196028491d2e4bcbb7390e220313a1ce4f5a41706a792775d31c66b3caf92bbb23680d26d3f41d285b2ba2f8b4dceb4e09760ac7ed0724eafdbc4b2ca8ecc6f
diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index 826019c73427..826019c73427 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
diff --git a/sys-devel/distcc/files/distccd.confd b/sys-devel/distcc/files/distccd.confd
index bc08d40777d3..736527a4a899 100644
--- a/sys-devel/distcc/files/distccd.confd
+++ b/sys-devel/distcc/files/distccd.confd
@@ -35,3 +35,8 @@ DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
 # set this for niceness
 # Default is 15
 DISTCCD_OPTS="${DISTCCD_OPTS} -N 15"
+
+# By default distccd stores temporary files in /tmp
+# Make sure to give distcc user write permission to
+# the given TMPDIR
+#TMPDIR="/tmp"
diff --git a/sys-devel/distcc/files/distccd.initd b/sys-devel/distcc/files/distccd.initd
index 7673ff2cf429..963f7b74c12e 100644
--- a/sys-devel/distcc/files/distccd.initd
+++ b/sys-devel/distcc/files/distccd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -11,3 +11,5 @@ command="${DISTCCD_EXEC:-usr/bin/distccd}"
 command_args="--user distcc --daemon --no-detach ${DISTCCD_OPTS}"
 command_background="true"
 pidfile="/run/${RC_SVCNAME}.pid"
+
+export TMPDIR="${TMPDIR:-/tmp}"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index f33dda34ed56..6ff16615c48f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -13,6 +13,7 @@ AUX gcc-4.9.4-bootstrap.patch 2698 BLAKE2B 2fe9519590f0870aa201d550e027eaec31196
 AUX gcc-8.3.0-ia64-bootstrap.patch 1327 BLAKE2B b8f2e46eb619830fec5f44350bac7f4e0908bca0460df642269b1404e3a11526142f9e658a0c4598ada21e68353d137e892eb827fcec3a25516775e8d89ecb40 SHA512 8c6802ec130bb618b675f8519729f096933d19ff246d10e231ec9e94ece532a06edff905f5b83023e32416f99c06635714a3dfb767740d3786587536c7bd9554
 AUX gcc-8.3.0-norisc32.patch 1390 BLAKE2B fc9d4b5afb57631957d66086af67de5843c3a3421f855bedce747fe41b78f3423c33c0cbb00ac8f4ed27af0691d1f0a7b8342850826667f25ef8a2d63b4e6944 SHA512 8e32e1fe14bdb1b29a6ae3c64f7bfcb7db41ba3fadaa00a5f2b85e4d63991bbb624ef04789a313c277a016ad055795ddba23c69762c19e3a536d4cb101cca2fa
 AUX gcc-9.1.0-norisc32.patch 2559 BLAKE2B 3fd196fd55ea9aeba406b7dbfa60e4c888e1cce7982f6ca35432161f9d523ec05d676925a33c07b4a140d26f9920677a9f70803c1696d085f61dd58950281876 SHA512 3e9c9b172ef4b228a17b8e914816abc8360de8650625d34956a604ee233a0f4a8d05c10a23ac02b9da82ea34d97b852f164cfb5fa2d69de10a6da4c75255cb2e
+AUX gcc-9.2.0-neg-insn-cost.patch 728 BLAKE2B 31b393a42b5d54de07a43cc6e43dc9d7228905ceaf27f7541cad4baf4d1f475dfbf0b6c00e76e5cddaea382fb77909166843f16d2a76b07b9c42bb0e181b5781 SHA512 057c8fb003df37dd15bbfc7f9e87e07d8a1cdd67885f8efffb80aaa694cc9314bb7317b43e57be55d55b3dc58a29bde138b07738a2a0d6cb8454b270e1c88983
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54a00a88b5c389bbf93b8b61bc12c86a07df03d57280759e5485ac0cd89ea69826ace01b5720681ca3102640b SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16
@@ -97,6 +98,6 @@ EBUILD gcc-7.4.0-r2.ebuild 450 BLAKE2B a22393074c702ea3646c5ea7be69b84ad2055c0db
 EBUILD gcc-7.5.0.ebuild 460 BLAKE2B d1ee2bc661a09fe23dfdb82efcd4344fbf195e3752b54a594205e2f13bbedcce77d1196dbe2771265f5d5754b86fd53c7c253be0f92dc2816721fffed7b607f1 SHA512 1c0bd8cbfcafe1b4b02237932d86eb82ef6c3b3fb75212b5c67b207480a73c719f1371e5975a468440d7e3aa2307f043afe6c3651348f3d5ed01ddb29595c730
 EBUILD gcc-8.3.0-r1.ebuild 588 BLAKE2B 5698c6515258b61d3cdda3d8b0b8eb2a6134cdf26dd51e5e38c7fcc1ae48e104b7ae624b316f0583398e94d68fccad6d5c43ddcef055014f09e56dd3fb28369a SHA512 d997d0993122a0a80bebd6b49eb68113488a95e1a5c58770f72650804ddeefd0e5cb77139bb61dbbc7be379dde03e1f14235b07973a13bdfea869bcda426ea4b
 EBUILD gcc-8.3.0-r3.ebuild 545 BLAKE2B cca196e019ec3ee7ba29e90e0fd9f446c6b8b53fbfa287515645a53ada5a17d7a59cf7ef742a5c3593f6300afb8f1d3743e6d6f56ceee5c30194faba2c90088f SHA512 bb5448afa3dfc6eeec9329081ce83f82a1e919bc2a964134dadd285021d4f6dd100261bfcfa1875179bc66a42bb2ddd14141bf06911747256b11fb4989da050f
-EBUILD gcc-9.2.0-r2.ebuild 446 BLAKE2B 4e34a185dcfa48698bd64c6a0f0f47158c26b95d9956fce4d41ccaab3d104fe3f75a753b6d5f0e7306cc40acbc01e55747cba31e9a857f260aef7c85016d4d6e SHA512 7c265481f6575cea3f75ad35f4b1eab2c07b9adf2ce89751c0c0216a22dc0d8af8a2bd2fd1a03a724417b7935449d46c0e613d3dc77fe4d9189065b78da9fcd0
-EBUILD gcc-9.2.0-r3.ebuild 456 BLAKE2B 4c5bbafcba69f65751ab73ec7e6dd7bf6b3ba1a35964c5c2bf00fa92e921ae8b4c398f8da805cf558aa160f65e3828d5d9961e9537ffd70b64be36807a648708 SHA512 335f35dc3125660c52a241df199883cc635d8f9cfc3a9122c6a379ea4aedde08b6202709b4942e23b7e839053976db55751b3ac2b1909a92a3b0766f1aa9c992
+EBUILD gcc-9.2.0-r2.ebuild 542 BLAKE2B bedd2e29aa28770536db465d5041ef570bcb779a5160ba217a2932c4be05920ad750f5c1dc03cf96642213491b857663e736aba4942774bc312acf895ab15a6e SHA512 33d6a497b16c8929ab458a0f306a20b97b616cdd6b33c60f7d16a68611b576ce34ef0dbecbba1d05938427866dbd55c9df4a21bffd6da91d942d4949e1697dd6
+EBUILD gcc-9.2.0-r3.ebuild 609 BLAKE2B 6baf7985dd4e1d8e93cedd1f2d196639d38c21902d4435c132eebe63260e8770f2f4796c6e11aeeab0ae1d1b738e4f030eeed0ec0452f5b50c21894731c38b90 SHA512 f7c5c1c94fb736440a2a6066e40141230ed615aadf2fffb9c1307c0df8a6a5e8f6c7a4c50937973e720a9110b3b59a288ba8df940bb1c31ad780cccdc28f89e9
 MISC metadata.xml 2903 BLAKE2B 1dab10dda72341050bf32178c4d55b8199a0ddabfb6001b8da5c3286e9389eef6bf3d88309bf9273221fdfd65b102d824aa2ce702437c523a10a32ff8bfb7deb SHA512 c4e79dbbc7c76df4875ef287ee7aa916f65868743a7803e00836cb61bec0c1df2bb18974dec591075c3f78cd872b828218df7c7ded8455290df03a253df0320b
diff --git a/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch b/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch
new file mode 100644
index 000000000000..7a6bebdf4905
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/707958
+https://gcc.gnu.org/PR88879
+
+Subject: [PATCH] sel-sched: allow negative insn priority (PR 88879)
+From: Alexander Monakov <amonakov@ispras.ru>
+
+	PR rtl-optimization/88879
+	* sel-sched.c (sel_target_adjust_priority): Remove assert.
+
+From-SVN: r271039
+---
+ gcc/ChangeLog   | 5 +++++
+ gcc/sel-sched.c | 2 --
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+--- a/gcc/sel-sched.c
++++ b/gcc/sel-sched.c
+@@ -3331,8 +3331,6 @@ sel_target_adjust_priority (expr_t expr)
+   else
+     new_priority = priority;
+ 
+-  gcc_assert (new_priority >= 0);
+-
+   /* If the priority has changed, adjust EXPR_PRIORITY_ADJ accordingly.  */
+   EXPR_PRIORITY_ADJ (expr) = new_priority - EXPR_PRIORITY (expr);
+ 
+-- 
+2.25.0
+
diff --git a/sys-devel/gcc/gcc-9.2.0-r2.ebuild b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
index e2638f44d602..97327a276552 100644
--- a/sys-devel/gcc/gcc-9.2.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,3 +17,8 @@ DEPEND="${RDEPEND}
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 fi
+
+src_prepare() {
+	toolchain_src_prepare
+	eapply "${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch
+}
diff --git a/sys-devel/gcc/gcc-9.2.0-r3.ebuild b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
index 107ecc45981b..398613c13bee 100644
--- a/sys-devel/gcc/gcc-9.2.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,6 +14,13 @@ DEPEND="${RDEPEND}
 	elibc_glibc? ( >=sys-libs/glibc-2.13 )
 	>=${CATEGORY}/binutils-2.20"
 
+PATCHES=("${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch)
+
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 fi
+
+src_prepare() {
+	toolchain_src_prepare
+	eapply "${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch
+}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 57d3c5faded8..3da56c6c3521 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -2,8 +2,10 @@ AUX gdb-8.3.1-gcc-10.patch 6940 BLAKE2B c3df7c53e9763984b43601361d6d157f7b8586b2
 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-r1.ebuild 6934 BLAKE2B 696e6b668b2cf1e4c527febc4c4172a0d1ffc5b97507f90c5f488468b71a81b9a252e06e036cc6c29e7be18bbd98c8a34cead02d93877b08e06f1fe282ae7e1d SHA512 4ae86e17536517ac37c53f6afd1e561d04d6efa4d0419f768b32863aaf2b389cd4961c59fc4dc591b4dcdeeab23e39ad2ba5590955c1001f34af7de586aaeb57
-EBUILD gdb-8.3.1.ebuild 6871 BLAKE2B f07683f851403890ac038d2040c3851762500e5d3e2293488871be3dd7d30a4c9ee5ae0f34b35813d491ed7bb8005f7666018c04e927782f548286480c8994e4 SHA512 ae82e3b38d2703d258b361d07881c28526551d7308fd93387fd67609844481c5ec6f8814777f708f6676b0396fa8abfd36a8a92461e1f2cbf67bda93ac9c556d
-EBUILD gdb-8.3.ebuild 6628 BLAKE2B 83bee25c12117e7e769ba8c025555b5a1ecb96ec330531ca77822bcf518312b5e0b5d1aceef25809da4d7408b3ec928dc051b4aae9da36a71e4422513ea08df0 SHA512 84e55cd0579f654d1d9b1761d6c02e446f4c063f70db92350e74e9bacedc251156ebc4bbb9fc833f1e55b8db0aa953bf296d6075f887c3d313911d6358a5afbd
-EBUILD gdb-9999.ebuild 6894 BLAKE2B 4491f716af4b9c6c09f16f67a33b919aed663fc6579721befe3f5b3fe5daa2f3e98a73a5b07a411817d92336a1eb53c5369b1773ff01c127082672741a7d8855 SHA512 73fe529a1c2fb60e51929de44121e5605d8af4de0367cc634555d4170ef274427572a8c910e6d2c4ee65e9361438c2dceadf62c2362c830d5b7bb44910a35a87
+DIST gdb-9.1.tar.xz 20980824 BLAKE2B b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30 SHA512 84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7
+EBUILD gdb-8.3.1-r1.ebuild 6930 BLAKE2B 46e1ae2b125a405c30ffa938e98525a60df78b8f2e7138706856660bdd0f3bc36164e69b3fd72359b7bdc2ad864dbbae3108ea982b40d1897da74fbecb16fbd7 SHA512 e73f1b726dc57d6bfe8dc6c56465449ac64e5ad690f7e75bbf4086affdb16f4ead2ffbba191940fd75ad30f254bce52983c9c448c1d81b07881a36dccb8dcd1f
+EBUILD gdb-8.3.1.ebuild 6867 BLAKE2B df0082c86c451ab3ee1e01571cfef9b5bc8ea2ec0dfc1205db6da6e40b5407e8b5609096e3ad10f2ad843d21212501e668d0b99f48cb9cfb23002088f6854b2a SHA512 b92f997211bb8f50b8c97cf991b40467ad9042caca51eeb7c47767d484d0ab248b2aa4a2e9ed306adecf0c2334d0747d0b7324ff0d0cbdf6447d8ef28e8336c7
+EBUILD gdb-8.3.ebuild 6624 BLAKE2B 116845931bedb8e0e5f4ff3d4d89cb234e18bdd07cfb0c58f4d453e9129954386ddd4859b17d1e0b1bb127b50d130e0c1777fbb3764f789ecfc4681b32bc68d7 SHA512 16f59904ba8855dab383dfb50725e59650dc149c768a4b4bdc6c26860d96f37924b5a0bc6a5962a50ca95a5aae5467ab4715efc50d0e9704c73923b35c0ec1cc
+EBUILD gdb-9.1.ebuild 7192 BLAKE2B 1fa7e736be38c9d485442ea39a79034c175802ffc1f5fa35b8bb2e88520421ea3ba636ad95be488909cb7b91e1553091dd03426d5309e9554cb1dae5235353ac SHA512 a50ef31e605b35523fb77ac519218183a7c7a9079cfd7ec4948735aac36eaf0b27d46f7700d2135f1f3400ae032a7bc85e46fa52d238086bac55c5cc7d58c877
+EBUILD gdb-9999.ebuild 6849 BLAKE2B 73b89b117421e348190d9fc1716e50f2b9a61c319643da71f27aca45a28af974a1547274cd42fa7b76ff4822a71aa859237a68e41d1e831edc18b6d28d28db77 SHA512 04ff2335e3a2aac5ed5e6a866f903d890d0c1c825eb16428ef74eba841f0374d06252381910f5162c4d86e77d68efe395fc1093e0fcad831ed15ed5dfa960796
 MISC metadata.xml 1021 BLAKE2B 81d865fbf0282b889509edfd6901654f25e60474be0eeca406803dbee20260da840f323f036818edbe27635e5a8c944b53bfba9fd7b715301d1a3eaa50898dfc SHA512 2255a18e7275069a9d8011f8360399444924ca6a3baef788c2e44e790896ba388c974fceb36ae2d394afc943b481a785ec3c11657e5018b7cd5db0eaa869c530
diff --git a/sys-devel/gdb/gdb-8.3.1-r1.ebuild b/sys-devel/gdb/gdb-8.3.1-r1.ebuild
index b5cae39cf9b8..015c3bc58e76 100644
--- a/sys-devel/gdb/gdb-8.3.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
diff --git a/sys-devel/gdb/gdb-8.3.1.ebuild b/sys-devel/gdb/gdb-8.3.1.ebuild
index a818c73f4771..bdc663153f47 100644
--- a/sys-devel/gdb/gdb-8.3.1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
diff --git a/sys-devel/gdb/gdb-8.3.ebuild b/sys-devel/gdb/gdb-8.3.ebuild
index 0d48fecc2854..8e01738db46c 100644
--- a/sys-devel/gdb/gdb-8.3.ebuild
+++ b/sys-devel/gdb/gdb-8.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
diff --git a/sys-devel/gdb/gdb-9.1.ebuild b/sys-devel/gdb/gdb-9.1.ebuild
new file mode 100644
index 000000000000..fa5deb598106
--- /dev/null
+++ b/sys-devel/gdb/gdb-9.1.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{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} ]] ; }
+
+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"
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+	;;
+esac
+
+PATCH_VER=""
+PATCH_DEV=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 )
+"
+
+# ia64 kernel crashes when gdb testsuite is running
+# hppa kernel crashes when gdb testsuite is running
+RESTRICT="
+	hppa? ( test )
+	ia64? ( test )
+
+	!test? ( test )
+"
+
+RDEPEND="
+	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}"/${PN}-8.3.1-verbose-build.patch
+)
+
+GDB_BUILD_DIR="${WORKDIR}"/${P}-build
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	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=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--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
+
+	mkdir "${GDB_BUILD_DIR}" || die
+	pushd "${GDB_BUILD_DIR}" || die
+		ECONF_SOURCE=${S}
+		econf "${myconf[@]}"
+	popd
+}
+
+src_compile() {
+	emake -C "${GDB_BUILD_DIR}"
+}
+
+src_test() {
+	emake -C "${GDB_BUILD_DIR}" check
+}
+
+src_install() {
+	if use server && ! use client; then
+		emake -C "${GDB_BUILD_DIR}"/gdb/gdbserver DESTDIR="${D}" install
+	else
+		emake -C "${GDB_BUILD_DIR}" DESTDIR="${D}" install
+	fi
+
+	if use client; then
+		find "${ED}"/usr -name libiberty.a -delete || die
+	fi
+
+	# 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_BUILD_DIR}"/gdb/gdbserver/gdbreplay ]] && dobin "${GDB_BUILD_DIR}"/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
+
+	if use python; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	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 91c997c92c31..0917eed36ce3 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
@@ -14,7 +14,6 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 fi
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 
-MY_PV=${PV}
 case ${PV} in
 9999*)
 	# live git tree
@@ -86,8 +85,6 @@ BDEPEND="
 		nls? ( sys-devel/gettext )
 	)"
 
-S=${WORKDIR}/${PN}-${MY_PV}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
 )
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 5afa665a572d..e854b80ebc44 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,12 +1,9 @@
 AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede596ca9d7d8587d9c883fa2fc54b8d1109210ac2b435b4709a16c2043cef6cc8d5448dc58adab74aa2e8ce834abdee51163d8c51 SHA512 7887d2fbf4b9d9677688e6d8d785b6c10c76bc330cb7b40da432e0a1ff0f7fc1355bf8f671041a37477baa6c8508b6e39f90ead468674febd62777506badc227
-AUX gettext-0.19.8.1-format-security.patch 3932 BLAKE2B 791b05e3c72792b290946c3347ec40374cb50a91648857cb0c2e380b8616d32be0958eb9b0f2bcd022049d8fc7d53ed3e9df824ca91621c31972f359c140bc1e SHA512 7e8149a3c1e09854bb2a6cbfbc4635567e45f2b7f1a555acf5ab723aead3ad1a3a9118002c353bf42a551b8be159640b597556731317d79efbffc2fc0d96dbb8
 AUX gettext-0.20-avoid_eautomake.patch 878 BLAKE2B 6272d4445501c1f96c40bbc506d64a29d32ea37b60d87b6a62b90176f64c34fd2a6a2549a47c42d4409cfb26de1b42136d740794d7059f7fce1cf67067104980 SHA512 9f765f34e68b887242d1b727ac36dc8f91ee50a6a0920c2f0697fd3c0d2369cc470e728612441f6cf4b9274ad737d985e3e69aa006adcae21a61a664eea2af38
 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942
 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956
-DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 DIST gettext-0.21-rc1.tar.bz2 16947151 BLAKE2B 9bd846afdbe0b5cb82ce7d3b962fdaf6282be000d692d1109ffb7197fc081442f42b83f8c9332c430f2ce9676e15faba180c4ebfde81bc76545480830bf2fd80 SHA512 f8236062456e823f7e14b2bc9fbaaa82c7772605e3624e0114f6fc5a122c935ac5bf7015d35df694f69de8127b6f17a2862a3761a2a97dc3b4c19b768dbbc909
-EBUILD gettext-0.19.8.1.ebuild 3944 BLAKE2B 252d07123487ca11cd5a35b1364e521d9c54e0ca78c7a0a34ef6368f2eed8c933acc090975d242a589cc122ddd0f76620fdaba9ab7f694f22df15ee20805dbd2 SHA512 bdcd7b64f8c826bee49cc34b75fd9ce37df89c385713ca37ac2ce168c00346815874431d8047a8091b76984d03c7885843ad763252864410f5690503071a5315
 EBUILD gettext-0.20.1.ebuild 4052 BLAKE2B 747f6257773f23d4eab40735ead1976e7a9af9516076e935b06f9e34009f68d5e085c395adaf67fede4144691c764c86abb3c66372cd28fa70e58ba44260717b SHA512 911945d06bcc82f00f2b678e71759c869c9ebb738f34d5e915e73be017345845dc0acfbbf02b9030e77679dd94351317a0ede74bb8f98dd47111430eb6030c11
 EBUILD gettext-0.21_rc1.ebuild 4188 BLAKE2B 8b891dc26e504e0cdb74f2237177413c2f728c8b7e31a0cc1000d0cc31409389bec4c3dff99e1660412becda2347c0c2ff88f3df2a556da47e754fed6aab63ed SHA512 a9bce110ab72e3115b4506b505e530470aa9e9fda7d0dba47d36061d3e3fe9374ad74326512a8d0d4fcdd7ad5997bfff2fa60f9a11af567d32f3f7c5cd5f8edc
 MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507
diff --git a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch b/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
deleted file mode 100644
index 6af160419877..000000000000
--- a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Sun, 19 Feb 2017 23:32:46 -0800
-Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
-
-Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
-| gettext-tools/gnulib-lib/libcroco/cr-statement.c: In function 'cr_statement_dump_charset':
-| gettext-tools/gnulib-lib/libcroco/cr-statement.c:2661:17: error: format not a string literal and no format arguments [-Werror=format-security]
-|                  fprintf (a_fp, str) ;
-
-And:
-gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=]
-       fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++-----
- gettext-tools/gnulib-lib/libxml/timsort.h        |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-index 617520f..100104b 100644
---- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
-         g_return_if_fail (a_fp && a_this);
-         str = cr_statement_ruleset_to_string (a_this, a_indent);
-         if (str) {
--                fprintf (a_fp, str);
-+                fprintf (a_fp, "%s", str);
-                 g_free (str);
-                 str = NULL;
-         }
-@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent)
-         str = cr_statement_charset_to_string (a_this,
-                                               a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent)
- 
-         str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str);
-+                fprintf (a_fp, "%s", str);
-                 g_free (str) ;
-                 str = NULL ; 
-         }
-@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this,
- 
-         str = cr_statement_media_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp,
- 
-         str = cr_statement_import_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h
-index 795f272..443918a 100644
---- a/gettext-tools/gnulib-lib/libxml/timsort.h
-+++ b/gettext-tools/gnulib-lib/libxml/timsort.h
-@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size)
-     SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
-     if (tempstore == NULL)
-     {
--      fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-+      fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
-       exit(1);
-     }
-     store->storage = tempstore;
--- 
-2.10.2
-
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
deleted file mode 100644
index eb057564fb3e..000000000000
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with dev-libs/libintl.
-
-EAPI="5"
-
-inherit epatch epunt-cxx ltprune mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-# Only libasprintf is under the LGPL (and libintl is in a sep package),
-# so put that license behind USE=cxx.
-LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
-
-# only runtime goes multilib
-# Note: The version of libxml2 corresponds to the version bundled via gnulib.
-# If the build detects too old of a system version, it will end up falling back
-# to the bundled copy.  #596918
-# Note: expat lacks a subslot because it is dynamically loaded at runtime.  We
-# would depend on older subslots if they were available (based on the ABIs that
-# are explicitly handled), but expat doesn't currently use subslots.
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.3:=
-	dev-libs/expat
-	acl? ( virtual/acl )
-	ncurses? ( sys-libs/ncurses:0= )
-	java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
-	!git? ( cvs? ( dev-vcs/cvs ) )
-	git? ( dev-vcs/git )
-	java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# only installed for native ABI
-	/usr/include/gettext-po.h
-)
-
-QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
-	epatch "${FILESDIR}"/${PN}-0.19.8.1-format-security.patch
-
-	epunt_cxx
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# switches common to runtime and top-level
-		--cache-file="${BUILD_DIR}"/config.cache
-		--docdir="\$(datarootdir)/doc/${PF}"
-
-		# Emacs support is now in a separate package
-		--without-emacs
-		--without-lispdir
-		# glib depends on us so avoid circular deps
-		--with-included-glib
-		# libcroco depends on glib which ... ^^^
-		--with-included-libcroco
-		# this will _disable_ libunistring (since it is not bundled),
-		# see bug #326477
-		--with-included-libunistring
-		# Never build libintl since it's in dev-libs/libintl now.
-		--without-included-gettext
-		# Never build bundled copy of libxml2.
-		--without-included-libxml
-
-		$(use_enable acl)
-		$(use_enable cxx c++)
-		$(use_enable cxx libasprintf)
-		$(use_with git)
-		$(usex git --without-cvs $(use_with cvs))
-		$(use_enable java)
-		$(use_enable ncurses curses)
-		$(use_enable nls)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-
-	local ECONF_SOURCE=${S}
-	if ! multilib_is_native_abi ; then
-		# for non-native ABIs, we build runtime only
-		ECONF_SOURCE+=/gettext-runtime
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		dosym msgfmt /usr/bin/gmsgfmt #43435
-		dobin gettext-tools/misc/gettextize
-	fi
-}
-
-multilib_src_install_all() {
-	use nls || rm -r "${ED}"/usr/share/locale
-	use static-libs || prune_libtool_files --all
-
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
-
-	if use java ; then
-		java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
-		rm -f "${ED}"/usr/share/${PN}/*.jar
-		rm -f "${ED}"/usr/share/${PN}/*.class
-		if use doc ; then
-			java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2
-			rm -rf "${ED}"/usr/share/doc/${PF}/javadoc2
-		fi
-	fi
-
-	if use doc ; then
-		dohtml "${ED}"/usr/share/doc/${PF}/*.html
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/*.html
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index d7c2794fb8c3..68d365eddcce 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -13,7 +13,6 @@ AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b20
 AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c483e348786fb1cede29b09fa8e74d0fcf7fdb6ad36fd980823d13b3e20cc7a54d5c518e0f557928b440ef9d0fd6723a8d5f8774c098 SHA512 05c1cee7a3d90bf4768cabaaba47290dc668db7c14173abf99ed8e64dae92191537f89c3304a4d42c01ecc2280d37104c47f621e44b3d19db481846bb225a2a1
 AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996a63d849c5d8c257618a87792bf7c904481d07430553102da2917cb518c37790d2321ae6202572ab59614a8291e475fc8a043ee6 SHA512 f5658f87edc24e494fff1ad2b1932dcd4a8a1515e88a10f3d5bc076ac69570e11c4559a8a56d577dc24181de262c97d6c1cfb16b9cd8315264cf55bc1351bf71
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libtool-2.4.6-r3.ebuild 2565 BLAKE2B e21233d3096fab4c39b6828ade696d8aec8870773f66dbb14ec294b57f4151f5677380b6fc86e36d67d757afefdfa46a9fbab4faa4a82f0ae7dd748f8a265be3 SHA512 2e0791f01b88974d9ace1b74cf92527bb2998f78d0e5eedb86385eaec6f1d1b248c70d8e6584b19de61dcbc384fdbedfc08994fabda48bb327e5c394cd30c495
 EBUILD libtool-2.4.6-r6.ebuild 3583 BLAKE2B 84848878036290a5e51be69d5aede07f58069618c8ae3b563dbede35872bfea22d1d076644178fba08b8acf5afef0a731af749e6d897543ce183809356f3cb6b SHA512 c4e2a42524beaac9b2744be52990e51702ace31ff5096e359ff16cacbcd48be7637773b76349d270ce29abfee7e381541137cbb29f915e60dd1f37dcdf9b7de7
 EBUILD libtool-9999.ebuild 3236 BLAKE2B 2f47c0b3326d3f88b70591d3b23c5c8eeecb2b974e04b8ee08528e28fa83f9b3cae0ace76b94d53b21309f45003b5b730c21636e1a8ced3db8b2db183a7b6e1f SHA512 eb064c77276e9c912c667ef075779c5a0423270ba6cf0b11e39fccb4dadea7910d18437e12b72604b6c82ee0238a667f6e81842eab0dc0734d26a44519f2572b
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/sys-devel/libtool/libtool-2.4.6-r3.ebuild b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
deleted file mode 100644
index 96b79d172469..000000000000
--- a/sys-devel/libtool/libtool-2.4.6-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-LIBTOOLIZE="true" #225559
-WANT_LIBTOOL="none"
-inherit autotools epatch epunt-cxx multilib unpacker
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="vanilla"
-
-# Pull in libltdl directly until we convert packages to the new dep.
-RDEPEND="sys-devel/gnuconfig
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-	dev-libs/libltdl:0
-	!<sys-apps/sandbox-2.10-r4"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cd "${S}"
-		./bootstrap || die
-	else
-		unpacker_src_unpack
-	fi
-}
-
-src_prepare() {
-	use vanilla && return 0
-
-	epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
-	epatch "${FILESDIR}"/${P}-link-specs.patch
-	epatch "${FILESDIR}"/${P}-link-fsanitize.patch #573744
-	epatch "${FILESDIR}"/${P}-link-fuse-ld.patch
-	epatch "${FILESDIR}"/${P}-libtoolize-slow.patch
-	epatch "${FILESDIR}"/${P}-libtoolize-delay-help.patch
-	epatch "${FILESDIR}"/${P}-sed-quote-speedup.patch #542252
-	epatch "${FILESDIR}"/${P}-ppc64le.patch #581314
-	pushd libltdl >/dev/null
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	epunt_cxx
-
-	# Make sure timestamps don't trigger a rebuild of man pages. #556512
-	if [[ ${PV} != "9999" ]] ; then
-		touch doc/*.1
-		export HELP2MAN=false
-	fi
-}
-
-src_configure() {
-	# the libtool script uses bash code in it and at configure time, tries
-	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
-	# cause problems for people who switch /bin/sh on the fly to other
-	# shells, so just force libtool to use /bin/bash all the time.
-	export CONFIG_SHELL=/bin/bash
-
-	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
-	export ac_cv_path_SED=$(basename "$(type -P sed)")
-
-	ECONF_SOURCE=${S} econf --disable-ltdl-install
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	local x
-	while read -d $'\0' -r x ; do
-		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
-	done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0)
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 7d0003bec6f7..698831aa14f1 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -4,10 +4,10 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lld-10.0.0.9999.ebuild 1457 BLAKE2B 43b1aa0346348a59b00d021d516b62529ae0cb2884c975ea68373263173b421c200abf6e4d95db38314a7424859fb0290f24790cc355e5da4f24f6e5cec56d3c SHA512 ab143ad9ae74766b839206d9bd910b6cb1766f683f04dee1bef0498f4bde3ec817f9b0d23c2fc7e72cabd9c29136db953a40d5cb3337b0e216b9760d773a4b13
-EBUILD lld-10.0.0_rc1.ebuild 1457 BLAKE2B 43b1aa0346348a59b00d021d516b62529ae0cb2884c975ea68373263173b421c200abf6e4d95db38314a7424859fb0290f24790cc355e5da4f24f6e5cec56d3c SHA512 ab143ad9ae74766b839206d9bd910b6cb1766f683f04dee1bef0498f4bde3ec817f9b0d23c2fc7e72cabd9c29136db953a40d5cb3337b0e216b9760d773a4b13
-EBUILD lld-11.0.0.9999.ebuild 1457 BLAKE2B 43b1aa0346348a59b00d021d516b62529ae0cb2884c975ea68373263173b421c200abf6e4d95db38314a7424859fb0290f24790cc355e5da4f24f6e5cec56d3c SHA512 ab143ad9ae74766b839206d9bd910b6cb1766f683f04dee1bef0498f4bde3ec817f9b0d23c2fc7e72cabd9c29136db953a40d5cb3337b0e216b9760d773a4b13
+EBUILD lld-10.0.0.9999.ebuild 1451 BLAKE2B 0671ae0ee11d66cb8639483200ad22d27c6b125b2c774dec81e87ce34748431ad2a9e178a27fc10b23050d07bc192ea9ee22f87c265997de0097b095353aca4b SHA512 60d132707bda9f965644ad7e93e2d84fc8d0e5c130178766a0151014d503b3c1d43cac9dc8c90b2e45d4451a16b91763ff44087521a7e8730a065456859ec258
+EBUILD lld-10.0.0_rc1.ebuild 1451 BLAKE2B 0671ae0ee11d66cb8639483200ad22d27c6b125b2c774dec81e87ce34748431ad2a9e178a27fc10b23050d07bc192ea9ee22f87c265997de0097b095353aca4b SHA512 60d132707bda9f965644ad7e93e2d84fc8d0e5c130178766a0151014d503b3c1d43cac9dc8c90b2e45d4451a16b91763ff44087521a7e8730a065456859ec258
+EBUILD lld-11.0.0.9999.ebuild 1451 BLAKE2B 0671ae0ee11d66cb8639483200ad22d27c6b125b2c774dec81e87ce34748431ad2a9e178a27fc10b23050d07bc192ea9ee22f87c265997de0097b095353aca4b SHA512 60d132707bda9f965644ad7e93e2d84fc8d0e5c130178766a0151014d503b3c1d43cac9dc8c90b2e45d4451a16b91763ff44087521a7e8730a065456859ec258
 EBUILD lld-7.1.0.ebuild 1725 BLAKE2B 61454551884ee0d7d50ea65b4816ad516784f81965dca35ee696547e367ac446692c3430660f3d0b82446974d264ca0671517a2d3ed04fe3d263a4b435657923 SHA512 10fc7671b1afc5db3cc2a854e6b1f7c6b297c67967c6a90efb392537f5dc3b7150f4efe60a92554b2332dd2ce27284405053dc6c42d4a51ee739ead9ca65d1f4
 EBUILD lld-8.0.1.ebuild 1794 BLAKE2B 31cf9d99132629908515eb9a8c6b074caa7b84bfbd86446fcd7f65391e247ac23ffd272b715836fc0d787c004a00f613c2c7b0d1bff96a1c8e9054554ae3fe41 SHA512 3d29acfa6f2eedd49917bf811f93f0f9646de38f4b17cf78d748e93c0bb0653f95e7ff1d6aefa0e77ad7af4479f7d3b27d4b10a49ae34aa86efcbeb636064e79
-EBUILD lld-9.0.1.ebuild 1330 BLAKE2B b9891caafd13ea1f74b7e32c6b69355a5345b6a946b818b76ea4a840f913cbcb0c14ed5b324951feec4df7e7be0b26f2f41cec39a37fea2498274f99dd7f84d4 SHA512 9cce8c54f52e22e6b2ce1f9995b88eb46c4e86333f21dcba4175e544945b8381363f51b759c72e9b50a29a0d38a8fc78826a4bf7abbb70d9617cdf6de56c5e4d
+EBUILD lld-9.0.1.ebuild 1324 BLAKE2B 2f394afbbda45b7525ac8ddd76608720202c5a015d9c3e9658bc786195a969c504ccef4e3542391fc72fe87c9c90d10445756e8ff5baadd6040d5006b67b1c72 SHA512 4c6b6852d34f9108d9bc9ab702717b18d8bf740076efcac9627cfc66a9aa25f5e7da736f18723c580e644f3f0d4369ad8dc61a9324ce78f93f46d4353e136dda
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-10.0.0.9999.ebuild b/sys-devel/lld/lld-10.0.0.9999.ebuild
index 8d0d48bb02cc..664086deab85 100644
--- a/sys-devel/lld/lld-10.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
diff --git a/sys-devel/lld/lld-10.0.0_rc1.ebuild b/sys-devel/lld/lld-10.0.0_rc1.ebuild
index 8d0d48bb02cc..664086deab85 100644
--- a/sys-devel/lld/lld-10.0.0_rc1.ebuild
+++ b/sys-devel/lld/lld-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
diff --git a/sys-devel/lld/lld-11.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0.9999.ebuild
index 8d0d48bb02cc..664086deab85 100644
--- a/sys-devel/lld/lld-11.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
diff --git a/sys-devel/lld/lld-9.0.1.ebuild b/sys-devel/lld/lld-9.0.1.ebuild
index 4aadc56f36fe..57dccad139ec 100644
--- a/sys-devel/lld/lld-9.0.1.ebuild
+++ b/sys-devel/lld/lld-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index e667daa57859..d8c5544040c0 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -8,10 +8,10 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-10.0.0.9999.ebuild 12399 BLAKE2B 66b8e35c728127b6afadace59176f68206b7c2c8174f379abe560e0336425b049ed98535b71456b7e5d2f24bc6092d1265358a8b61302abb8a1d5e37c41dc751 SHA512 ebeec9f436fbbdad29953545f7fc43980c800b23d2c8be79c3a6f8a94d54f22a78fa7e8157e2ebd1a0aefb7b661d078a5706a1a712f0ffbd7899b42b589c8c3f
-EBUILD llvm-10.0.0_rc1.ebuild 12399 BLAKE2B 66b8e35c728127b6afadace59176f68206b7c2c8174f379abe560e0336425b049ed98535b71456b7e5d2f24bc6092d1265358a8b61302abb8a1d5e37c41dc751 SHA512 ebeec9f436fbbdad29953545f7fc43980c800b23d2c8be79c3a6f8a94d54f22a78fa7e8157e2ebd1a0aefb7b661d078a5706a1a712f0ffbd7899b42b589c8c3f
-EBUILD llvm-11.0.0.9999.ebuild 12399 BLAKE2B 66b8e35c728127b6afadace59176f68206b7c2c8174f379abe560e0336425b049ed98535b71456b7e5d2f24bc6092d1265358a8b61302abb8a1d5e37c41dc751 SHA512 ebeec9f436fbbdad29953545f7fc43980c800b23d2c8be79c3a6f8a94d54f22a78fa7e8157e2ebd1a0aefb7b661d078a5706a1a712f0ffbd7899b42b589c8c3f
+EBUILD llvm-10.0.0.9999.ebuild 12393 BLAKE2B c4b87b8137840d5a1fd7fa3adf90c1336e2ef4c676bf4edcaf95d200af690b898b9a3201afb386719a0247f327cf809a9b9e3f13c6b80b7ffd60cb381bf74ac3 SHA512 3674c0c6b34ef504058ec97c7973f1feb60076c1c1c35dc98a05e29c9ba635501ecee861b27b529bf5f9e091337e68ede3a150da12ed61ffe7ced6d616d8f517
+EBUILD llvm-10.0.0_rc1.ebuild 12393 BLAKE2B c4b87b8137840d5a1fd7fa3adf90c1336e2ef4c676bf4edcaf95d200af690b898b9a3201afb386719a0247f327cf809a9b9e3f13c6b80b7ffd60cb381bf74ac3 SHA512 3674c0c6b34ef504058ec97c7973f1feb60076c1c1c35dc98a05e29c9ba635501ecee861b27b529bf5f9e091337e68ede3a150da12ed61ffe7ced6d616d8f517
+EBUILD llvm-11.0.0.9999.ebuild 12393 BLAKE2B c4b87b8137840d5a1fd7fa3adf90c1336e2ef4c676bf4edcaf95d200af690b898b9a3201afb386719a0247f327cf809a9b9e3f13c6b80b7ffd60cb381bf74ac3 SHA512 3674c0c6b34ef504058ec97c7973f1feb60076c1c1c35dc98a05e29c9ba635501ecee861b27b529bf5f9e091337e68ede3a150da12ed61ffe7ced6d616d8f517
 EBUILD llvm-7.1.0.ebuild 7719 BLAKE2B ac71ea47d929d615fcc8223dcc2d0235f9fdea5aacdd93390017fcf35f7d341f3fca6ea583078f82e56cb12a2983dfb66822377ac33fcef4ad789af0c1a9cd4d SHA512 88f71d65812a4050b171f9ad794e76b4419e6b27df9d7a5f5f5917de9e90c120ae4080f0df39c965e26fc99a5676db5f8f19feac33291924915eb8fabce095a2
 EBUILD llvm-8.0.1.ebuild 8528 BLAKE2B fd37d9d02815f01541be12a4e064d570b019fb9fa17fa5b13a20f769b1ab12e30806221b584a6b858cb4206271cfa7717ca60ef0f0f7b3aeb7ee32ae22bb18c5 SHA512 fdee897c057332ef2b60e91701f17583a5885561aa0d07e6640227c9457a6953188c8d743b906365c91428269617dbf620943ea60199ad1ca8acf995b1b21820
-EBUILD llvm-9.0.1.ebuild 8566 BLAKE2B 077150fc99f6336e68e8c4a8d9ce1d3e9507049a011fd5d21b6132e239b85bd0c75799da664c5a7adc9501c7fb018083cbb1449003a8d9af2cecf76811de36a4 SHA512 2f7a25b03300dc3fe0b0ec7d22432fe4d151be045eabe6b3a5c987cfad7d0078cb4af46c5eddb26a6d6796191e1813cc5dffaf993fbd023e1a835708af55fa2d
+EBUILD llvm-9.0.1.ebuild 8560 BLAKE2B b63de028f5fa5da66234a02e5398347b7310c56e2cf9325aca8f0267dd04a3eabf8afa3f4b2580479e6b7afcbf7b3c010394e34a408f5fc892f2ca9250aee1bb SHA512 2060629c5abe6132e9557769876182a33e44352a19ed01e021e455279a2692ab8531028af586cfb72ee532210e840c0a3e0a3f9d1262f7471fe59d75cf1be314
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
index 66f38cdf8f9b..0382dba1d35a 100644
--- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
diff --git a/sys-devel/llvm/llvm-10.0.0_rc1.ebuild b/sys-devel/llvm/llvm-10.0.0_rc1.ebuild
index 66f38cdf8f9b..0382dba1d35a 100644
--- a/sys-devel/llvm/llvm-10.0.0_rc1.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
index 66f38cdf8f9b..0382dba1d35a 100644
--- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
diff --git a/sys-devel/llvm/llvm-9.0.1.ebuild b/sys-devel/llvm/llvm-9.0.1.ebuild
index 846bf17d9754..9bfbe3774a67 100644
--- a/sys-devel/llvm/llvm-9.0.1.ebuild
+++ b/sys-devel/llvm/llvm-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs