gentoo resync : 15.01.2020

97 files changed, 1814 insertions, 3121 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 96aefeaef7b5..1250863736d1 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index ecf0942c28c7..ff87754eff64 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -1,17 +1,11 @@
 AUX autogen-5.18.16-no-werror.patch 738 BLAKE2B f6228e7eb39cbdffae794d62e352ee0b3bee7a60f46ef31585838fc24ac85a8dac813aa698670f0d94fc1767add8b083c646dd89c56527c2e3765fac0d61f51c SHA512 ecf7f910957bface75eb2b828c5ba90b49c205183ea9242c2f47907fbf6bfd1154b4dc1d2ed0fef8bbf3c8f01d05bfa1450ecdef73786ff0292bbfdd904bd193
+AUX autogen-5.18.16-respect-TMPDIR.patch 824 BLAKE2B de70fb423955fc006ef10765ab5d534a02ff4e0d47bb29ab47706edf0e00cad241e8e51fd60aef2168181fce7b2af2623c4c1f163f8ef98ad09efa3c6488edd7 SHA512 9a37cb7c6703ffc24bd5f839f9d466db0fa92ce830d136f34594000863a1ade0d124d7aa4ef47baf411b0473ede65a8dd1f82d0e7fd7bb2713e003dfbf9437de
 AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a0426b757572217bdfaefe8b3fc308e7c3b29d41a6dd4db77677c208702cd836ac58a463814624bc965b71c8b5613935b SHA512 3279567863152a2874d64be1cae8129dfaa9d67612e6f2d3c0de408914ea5b2d19e037ade460393fd942d897776906fe5df483a69255c4f279c13893a6cec1fd
 AUX autogen-5.18.4-tmp-log.patch 500 BLAKE2B 131982c73b5fe2a0bf3515fcd8ead7df4149af7b9ab4f899dea0966f927319ee156d3748151b359c9be6e1a6f50b0a64a4330bbf3af985f048228024a1ececf2 SHA512 7467f09109b16aef1ce72e294e627a16bf46d861ecbbf467c3a7317e440a18cdea100d32f3fdbd37ef6140dd65b1b57523983b08b25c331e229ddd132e3b3824
 AUX autogen-5.18.4_fix_format.test_for_dash.patch 777 BLAKE2B 22621c5c825c47b94a8d28e6f471f3abc522761ce31a535bf357236eea1f71c546d9e025a879bf05719283147a4b3be83b8ee889f9aceda4597ee86f08c27a23 SHA512 4ac158532ad3e65219d0f8476acf05678d552b9fd13c3299e703a6979723e10fef2b87051983ae280609a6497ba2829e6197a97b18b54b2446ad106c6b9f1ae1
 AUX autogen-guile-2.2.patch 1033 BLAKE2B a18e884010f48b43b17bb5c78a4676a364503943f5144991ad2ab6acb8a9ba6f08044bd613f0763b5c863b380ecbcc7207df6cd29d08da3d034f07a386204bde SHA512 19c25fff1ca0427ff18627a14dab223b92da8670487351808df892fff77a8e33895e2ecc51acd8b03f3a89a5e19813fa12fb93c0aa54e47796812e99fd4ac7bf
-DIST autogen-5.18.10.tar.xz 1017960 BLAKE2B 3869abb5b0b97f480d4b50b205f25d54da2b9c5227c13a55e11754b5ceff4afd74576efc17a748d40762b7345e3c02c60fa38f6d20893671089e9de48b0e0240 SHA512 cfb06566aebe2aa833f2a032c513aa1d57a803eee82f03d6f6fe3806a0f570d5dbf8331015d2afde89a3d4e4c967b6a367d3e2820addb3ff6a5ac6d481a058be
-DIST autogen-5.18.12.tar.xz 1018412 BLAKE2B f8ac1efbd6c6afdaa248e3063cf43fe0d32da6bd1160397f8bf736970f15047c70772a6e21d6010c8103aecce6ea2c3d90a63b9c5cbd6199a97c82384630a341 SHA512 46de5910e2786a9b0ec96989d3e11be3ed12e5600f01d6fa9291bfbfae42a66994aeca2949837b471827ae3285ec4caafb42bc19ca91146cd7ea7a355aaffd03
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
-DIST autogen-5.18.4.tar.xz 1017936 BLAKE2B bc2b4d7143642baa923c49bfe37d60c0d3a0a3a09a9af504c5dc865f1054e4d510ca3144737c2098a75189a7335bc560ec26318689ebf6d1291969d5a081cfa2 SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6
-EBUILD autogen-5.18.10.ebuild 1122 BLAKE2B a780b77086e394228ab3b02bf656745dd90a8dafc792e431a52454698a2841f2297c7602ca4bd46bb3b651c6984031ed52bfc87f8764c4d1bef64d6b7a4043bc SHA512 928152080c981a9b0b8849f97213665e90f87fff7554ac1f829f4346426a4fd7daf8a0e7b6e17c5a816c2707dbdf6d3d47da27f5afb67f20bbdbe3218d77d0df
-EBUILD autogen-5.18.12.ebuild 1181 BLAKE2B 37d730c066e642885fc86dfd128e8e20336c24851c8c2d4eeb2656a8b340de707ac6500bbb1bee3b1588458bc905de2386a9c1901c9bd6cc5637628d3e9d86c1 SHA512 bf8e8efb8c1e0f2b4c7da1f09c3c849b4ccf7db7996a599cfeaa0a22870e5bd7f9cb588b6241fa33a03aa3e05c0a3ccaa3bcfda4227e9d71d0544a89c2f3968e
-EBUILD autogen-5.18.16-r1.ebuild 1847 BLAKE2B 361408fc3f23ab0baed355fda9c3657d1aeab59013b64c81968aa7c72e8acd52494f01bc9ae0616e811c396e394fbcb85b362a5c308d66972db561b6bfeaf83e SHA512 2abcf27eb6a5e47a5b9a1a9cecb5abb347b357b8f8ef7db73d0d002fd6154d43f6f8d4ea48c8638adc3b9e1b5f9a988e42cfe4e91d042610723ac0f5ad9fdf56
+EBUILD autogen-5.18.16-r1.ebuild 1887 BLAKE2B 480d7158392793a40acddbbe6554ff136af5a6b5574a575c4bf970c04f570f4c9d2e4d5d815916277bd003fa6645e03c2ad1c56a0495e36b80547a749ee8cd85 SHA512 933945998b67f7d1e8a5ff8d57ab11c7fe68ab5cf31a818a921ea5f349747139e8659a5cd43db035b3df140de513717335cd96d886a92f4edd4b7cbcb2451f62
 EBUILD autogen-5.18.16.ebuild 1545 BLAKE2B 48743c3b83053a2f3dbd97f5a59667bdc874aac402ba160d749778f729ced839941f83e0a37a552d2d939783ace2fa174ae12470f3b602f0d781050dab646709 SHA512 cd7a7be7005bf259b53cad5f58aaa70bf76388392f8166b08d3dbdfbea5efa659e1c38632efafcfda5cd459443d4706ec2774ce53e7ce612834d8c64cd4dfa29
-EBUILD autogen-5.18.4-r1.ebuild 942 BLAKE2B 059e7798f0d297543be2025431c1dea283bf862087a780ded71d8c3931471a023cc29145b0927a7d5b0b96426994b7308d1e85b8dece644b33eb2e2d14d2b7bf SHA512 8ca5b616d04218e76c8895ad27d5a4da9424104a0c1252668d6818b4e4640843d96a140f0f5c96297577cc0e24215811b9e46fb02da018d2e34e4b6dd0eaec45
-EBUILD autogen-5.18.4.ebuild 955 BLAKE2B 339d84025eee4ccf42cbffa73978b9ba7c6fbed70b2308854279aec5b185bda5b7b99350c7ba1628d1245a1d73c9295204841b9d98d5c47962d2ecc01c242e4f SHA512 83a84c4079ee75739177ce921bf997d0b452039d7930d6661ef9a84521941b8ed629e1430e5acbbc2887dfa588e020da92868bf526a500124193108e7ea39cce
 MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541
diff --git a/sys-devel/autogen/autogen-5.18.10.ebuild b/sys-devel/autogen/autogen-5.18.10.ebuild
deleted file mode 100644
index ddb0e9c23ccf..000000000000
--- a/sys-devel/autogen/autogen-5.18.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Program and text file generation"
-HOMEPAGE="https://www.gnu.org/software/autogen/"
-SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="libopts static-libs"
-
-# This should be guile-1.8+, but upstream has a bug with older versions:
-# https://savannah.gnu.org/support/index.php?109051
-RDEPEND=">=dev-scheme/guile-2.0:=
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# https://savannah.gnu.org/support/index.php?109050
-	sed -i \
-		-e "/--cflags-only-I/s:pkg-config:$(tc-getPKG_CONFIG):" \
-		configure || die
-}
-
-src_configure() {
-	# suppress possibly incorrect -R flag
-	export ag_cv_test_ldflags=
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if ! use libopts ; then
-		rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
-	fi
-}
diff --git a/sys-devel/autogen/autogen-5.18.12.ebuild b/sys-devel/autogen/autogen-5.18.12.ebuild
deleted file mode 100644
index eebface9f0f5..000000000000
--- a/sys-devel/autogen/autogen-5.18.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune toolchain-funcs
-
-DESCRIPTION="Program and text file generation"
-HOMEPAGE="https://www.gnu.org/software/autogen/"
-SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="libopts static-libs"
-
-# This should be guile-1.8+, but upstream has a bug with older versions:
-# https://savannah.gnu.org/support/index.php?109051
-RDEPEND=">=dev-scheme/guile-2.0:=
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-guile-2.2.patch"
-)
-
-src_prepare() {
-	default
-
-	# https://savannah.gnu.org/support/index.php?109050
-	sed -i \
-		-e "/--cflags-only-I/s:pkg-config:$(tc-getPKG_CONFIG):" \
-		configure || die
-}
-
-src_configure() {
-	# suppress possibly incorrect -R flag
-	export ag_cv_test_ldflags=
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if ! use libopts ; then
-		rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
-	fi
-}
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index a10a119e2d26..93712b018dfe 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.18.16-no-werror.patch
 	"${FILESDIR}"/${PN}-5.18.16-rpath.patch
+	"${FILESDIR}"/${PN}-5.18.16-respect-TMPDIR.patch
 )
 
 src_prepare() {
diff --git a/sys-devel/autogen/autogen-5.18.4-r1.ebuild b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
deleted file mode 100644
index 4e8ebe886019..000000000000
--- a/sys-devel/autogen/autogen-5.18.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-DESCRIPTION="Program and text file generation"
-HOMEPAGE="https://www.gnu.org/software/autogen/"
-SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="libopts static-libs"
-
-RDEPEND="
-	>=dev-scheme/guile-1.8:=
-	dev-libs/libxml2
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.18.4-tmp-log.patch #563352
-	"${FILESDIR}"/${PN}-5.18.4_fix_format.test_for_dash.patch #576674
-)
-
-src_configure() {
-	# suppress possibly incorrect -R flag
-	export ag_cv_test_ldflags=
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if ! use libopts ; then
-		rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
-	fi
-}
diff --git a/sys-devel/autogen/autogen-5.18.4.ebuild b/sys-devel/autogen/autogen-5.18.4.ebuild
deleted file mode 100644
index df05f7d08a36..000000000000
--- a/sys-devel/autogen/autogen-5.18.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Program and text file generation"
-HOMEPAGE="https://www.gnu.org/software/autogen/"
-SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="libopts static-libs"
-
-RDEPEND=">=dev-scheme/guile-1.8
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.18.4-tmp-log.patch #563352
-	epatch "${FILESDIR}"/${PN}-5.18.4_fix_format.test_for_dash.patch #576674
-}
-
-src_configure() {
-	# suppress possibly incorrect -R flag
-	export ag_cv_test_ldflags=
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if ! use libopts ; then
-		rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
-	fi
-}
diff --git a/sys-devel/autogen/files/autogen-5.18.16-respect-TMPDIR.patch b/sys-devel/autogen/files/autogen-5.18.16-respect-TMPDIR.patch
new file mode 100644
index 000000000000..792214e476da
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.16-respect-TMPDIR.patch
@@ -0,0 +1,29 @@
+User ebuild's ${T} instead of /tmp to hide leftover files from ./configure.
+
+'run-ag.sh' does not clean temporary directories after itself and makes
+it hard to implement it cleanly without changing 'run-ag.sh' structure.
+
+Reported-by: Fedja Beader
+Bug: https://bugs.gentoo.org/704740
+--- a/build-aux/run-ag.sh
++++ b/build-aux/run-ag.sh
+@@ -45,7 +45,7 @@ find_exe() {
+   return 0
+ }
+ 
+-STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d /tmp/run-ag-XXXXXXXX)
++STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d -t run-ag-XXXXXXXX)
+ exec 9>&2 2>> ${STAMP_TEMP_DIR}/mk-stamps.log
+ VERBOSE=1
+ 
+--- a/config/mk-shdefs.in
++++ b/config/mk-shdefs.in
+@@ -130,7 +130,7 @@
+ 
+ set -x
+ exec 9>&2
+-tmp=$(mktemp --suffix=.tdir -d /tmp/shdefs-XXXXXXXXX)
++tmp=$(mktemp --suffix=.tdir -d -t shdefs-XXXXXXXXX)
+ exec 2>> $tmp/mk-shdef.log
+ init $0 $1
+ mk_config
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 97e9b7e4725d..587d0b648987 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,7 +1,9 @@
 AUX binutils-config-5 12580 BLAKE2B d802830a52b76433152a073d5acb29afa606dcac6f41de03c138fb2178ea8118af6f7c8dfe22ee1b54b9d7c630d9661719ace12925f62fb033851a80c91fd0d9 SHA512 2909a98c1f4a49f952665b307121d3f263a2fb4b40b97d0393dc008b0a91f2b547b1cc104d78615f4d42a5e0b8e3b0fa20358e414999a2b14c468c0c69c2dee9
 AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d58df5bf45eaa78a01e73c45e17cfa845aadcf65828f2ff7b149a01e9188ae85e3f56c8c83170078211cd69 SHA512 79cd64c734650d76e47e4e6a84aab408ca39d04b57fbd6ecbe953089f246e52c05a6d3d1dd69ff8864e71246c8b6f53f4b89902963ae4f6b7194b949cb0f724c
+AUX binutils-config-5.2 11716 BLAKE2B cff36d78c6d872c329cd63a9cb5c03e4c30a2dde8ae148b0392aba0157313daf9cf1772edc5a56a6ac633bdb9d677339fa6c3ad828b57902f5af27e7dd30eada SHA512 083352834377abac7cecd412f89ead22f132244241ec643272c14c74f458b5db0ddf5fd539024df29fe32b3e654058044158cb497290a77d5cc4a20c1a9bc2cc
 AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
-EBUILD binutils-config-5-r4.ebuild 1064 BLAKE2B f65f64eacc916a4b693b826fa4af60b0833efc67e5285b8148972c4d8d44553f5c496987c8b8a0243ceb1e884a24a49923bbb75ddefd0f35363a69d2f8f5ae2d SHA512 48eb5cae87fe27a91dd3648955863bb4e98d92dfec01e5f0599603448ad8f523654ef428503c2c156130481d33981791bb3e5ee6ba3972b22e3cc85f786cc1f0
-EBUILD binutils-config-5.1-r1.ebuild 1069 BLAKE2B d0262ca0214c7924985882e6fd64615d4f8a21a4fe8640683e4801d2687d9a084c9806299f8505a9b45db3396bc59d615cd5b2e3987ee5e1d85a1d0051039aa0 SHA512 de03c7835c7c671397c72189680d07615b46573dbeac1cd66da44923fbf0bb6860a4d92f57ae21d476365d5e3ccb97d32124d16af27a1c5b6895bfe0c165c4ae
+EBUILD binutils-config-5-r4.ebuild 1087 BLAKE2B 487c4040bc721aadc171e41082d34dba00c04206f4ae8ed793c12cbe4a7c91f94e9bf637a2d7c5b89a689de2224ec1f91f00c2a22817d86e9843419ca1bf83d5 SHA512 291146723d4503af788074a27d2bcbe4fbbfe0f0113025dee5cedc7d57beca6938812eb4a8de8731a3d94e5f9e22be2780ff52f3f9e5c77cdf2f50d16667d4e0
+EBUILD binutils-config-5.1-r1.ebuild 1092 BLAKE2B 1121436ad2209c0d7d4dab84cc075e0d288b6c23afe3e0dcc0a8716a67b17bb4e3c33f7952fbb6fbcab429e609c143a9be50b04587b14b54ba296d4a2dcd2091 SHA512 6585fd508c853ee6283480abadca890ffb74cd4fc8443ad5adda921912b9c869cae7dc416470af6c478cbf76e86e06383ccbd52a69410c2e46a1163701bc00fc
+EBUILD binutils-config-5.2.ebuild 1105 BLAKE2B 74674ba431318ae992d7b4cac1c350dfec8abc2dc59dce39449c9f0c21fb054baa6604632e589f442893710e241c7cbfa51572eaba3a493a94561edcabfce45d SHA512 a5a6a9bfb7c204092f6b4bfb4f242ad5c19b811ad385ea103e655d79c311430d2ff2101fe54238fc507b0a5d1ae45a0cd86658a54885f274035cc5650fbe9797
 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 c6b253148a5b..a821d197847e 100644
--- a/sys-devel/binutils-config/binutils-config-5-r4.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit prefix
 
 DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
 SRC_URI=""
 
 LICENSE="GPL-2"
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 04b99251ed87..02bdd68ef893 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit prefix
 
 DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/sys-devel/binutils-config/binutils-config-5.2.ebuild b/sys-devel/binutils-config/binutils-config-5.2.ebuild
new file mode 100644
index 000000000000..152af30c9117
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-5.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+# We also RDEPEND on sys-apps/findutils which is in base @system
+RDEPEND="sys-apps/gentoo-functions"
+
+S=${WORKDIR}
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN}
+	use prefix && eprefixify "${ED}"/usr/bin/${PN}
+	sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die
+	doman "${FILESDIR}"/${PN}.8
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/binutils.eselect
+}
+
+pkg_preinst() {
+	# Force a refresh when upgrading from an older version that symlinked
+	# in all the libs & includes that binutils-libs handles. #528088
+	if has_version "<${CATEGORY}/${PN}-5" ; then
+		local bc current
+		bc="${ED}/usr/bin/binutils-config"
+		if current=$("${bc}" -c) ; then
+			"${bc}" "${current}"
+		fi
+	fi
+}
diff --git a/sys-devel/binutils-config/files/binutils-config-5.2 b/sys-devel/binutils-config/files/binutils-config-5.2
new file mode 100644
index 000000000000..69ca530a7045
--- /dev/null
+++ b/sys-devel/binutils-config/files/binutils-config-5.2
@@ -0,0 +1,456 @@
+#!/bin/bash
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Format of /etc/env.d/binutils/:
+#  config-TARGET:	CURRENT=version for TARGET
+#  TARGET-VER:		has a TARGET and VER variable
+
+EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
+	EPREFIX=""
+fi
+
+: ${ROOT:=/}
+[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
+[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
+
+EROOT="${ROOT%/}${EPREFIX}/"
+
+cd "${EPREFIX}/"
+
+trap ":" INT QUIT TSTP
+
+argv0=${0##*/}
+FUNCTIONS_SH="${EPREFIX}/lib/gentoo/functions.sh"
+source ${FUNCTIONS_SH} || {
+	echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2
+	exit 1
+}
+esyslog() { :; }
+die() { eerror "${argv0}: $*"; exit 1; }
+umask 022
+
+usage() {
+cat << USAGE_END
+Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}[binutils profile]${NORMAL}
+
+${HILITE}General Options:${NORMAL}
+  ${GOOD}-c, --get-current-profile${NORMAL}  Print current profile
+  ${GOOD}-l, --list-profiles${NORMAL}        Print a list of available profiles
+  ${GOOD}-u, --uninstall${NORMAL}            Remove all signs of specified target
+  ${GOOD}-d, --debug${NORMAL}                Execute with debug output
+
+Profile names are of the form:  ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
+For example:                    ${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
+
+For more info, please see ${HILITE}binutils-config${NORMAL}(8).
+USAGE_END
+
+	exit ${1:-1}
+}
+
+mv_if_diff() {
+	if cmp -s "$1" "$2" ; then
+		rm -f "$1"
+	else
+		mv -f "$1" "$2"
+	fi
+}
+atomic_ln() {
+	local target=$1 linkdir=$2 linkname=$3 linktmp linkfull
+	linktmp="${linkdir}/.binutils-config.tmp.${linkname}"
+	linkfull="${linkdir}/${linkname}"
+	if [[ -d ${linkfull} ]] ; then
+		# if linking to a dir, we need a little magic to
+		# make it atomic since `mv -T` is not portable
+		rm -rf "${linktmp}"
+		mkdir -p "${linktmp}"
+		ln -sf "${target}" "${linktmp}/${linkname}"
+		mv "${linktmp}/${linkname}" "${linktmp}/../"
+		rmdir "${linktmp}"
+	else
+		# `ln` will expand into unlink();symlink(); which
+		# is not atomic for a small amount of time, but
+		# `mv` is a single rename() call
+		ln -sf "${target}" "${linktmp}"
+		mv "${linktmp}" "${linkfull}"
+	fi
+}
+
+setup_env() {
+	unset TARGET VER LIBPATH
+	source "${ENV_D}/${PROFILE}"
+	if [[ -z ${TARGET} ]] ; then
+		eerror "${PROFILE} is invalid (no \$TARGET defined) :("
+		return 1
+	fi
+	if [[ -z ${VER} ]] ; then
+		eerror "${PROFILE} is invalid (no \$VER defined) :("
+		return 1
+	fi
+
+	#
+	# Generate binary symlinks
+	#
+	BINPATH=""
+	BINPATH_LINKS=""
+	if [[ ${TARGET} != ${HOST} ]] ; then
+		#
+		# Newer paths: /usr/${HOST}/${TARGET}/...
+		# Older paths: /usr/${TARGET}/...
+		#
+		if [[ -d "${EROOT}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then
+			BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER}
+			BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET}
+		fi
+	fi
+	if [[ -z ${BINPATH} ]] ; then
+		BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER}
+		BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin
+	fi
+}
+
+# Lists of headers that various versions have installed.
+HEADERS=(
+	ansidecl.h bfd.h bfdlink.h demangle.h dis-asm.h dyn-string.h
+	fibheap.h hashtab.h libiberty.h objalloc.h plugin-api.h
+	splay-tree.h symcat.h
+)
+
+switch_profile() {
+	local x
+
+	ebegin "Switching to ${PROFILE}"
+
+	setup_env || return 1
+
+	cd "${ROOT}/${BINPATH}" || exit 1
+	mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin"
+	for x in * ; do
+		atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}"
+		atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${TARGET}-${x}"
+		if [[ ${TARGET} == ${HOST} ]] ; then
+			atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}"
+		fi
+	done
+
+	#
+	# Generate library / ldscripts symlinks
+	#
+	: ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}}
+	cd "${ROOT}/${LIBPATH}" || exit 1
+	if [[ ${TARGET} == ${HOST} ]] ; then
+		dstlib=${EROOT}/usr/${HOST}/lib
+	else
+		dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
+	fi
+	# When upgrading, we need to clean up ldscripts and libs.
+	# Don't symlink back in the libs -- the binutils-lib package handles
+	# these now.
+	# TODO: Stop requiring even the ldscripts symlink.
+	mkdir -p "${dstlib}"
+	rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
+	atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"
+	find -L "${dstlib}" -xtype l -name 'lib*' -delete
+	# Detect older binutils w/broken rpaths. #562460
+	# We can hardcode the "/lib" part since that's what the binutils
+	# configure scripts have.  They did not include any other path.
+	if [[ $(scanelf -qF '%r#F' "${ROOT}/${BINPATH}/as") == */lib ]] ; then
+		ewarn "Old cross-binutils detected; please re-emerge to fix (see bug #562460)."
+		for x in lib* ; do
+			atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}"
+		done
+	fi
+
+	#
+	# Clean out old generated include symlinks
+	#
+	INCPATH=${LIBPATH}/include
+	if [[ -d ${ROOT}/${INCPATH} ]] ; then
+		cd "${ROOT}/${INCPATH}" || exit 1
+		if [[ ${HOST} != ${TARGET} ]] ; then
+			# Clean out old path -- cannot use '-exec {} +' syntax here
+			find . -type f -exec rm -f "${EROOT}/usr/${TARGET}/usr/include/{}" \;
+			rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null
+			rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null
+			rmdir "${EROOT}/usr/${TARGET}" >& /dev/null
+		fi
+	fi
+
+	#
+	# Make sure proper paths get updated
+	#
+	local env_update_flag="--no-ldconfig"
+	if [[ ${TARGET} == ${HOST} ]] ; then
+		# Delete old config now that binutils-libs installs these files.
+		# Note: This skips ldconfig update if env.d had LDPATH, but meh.
+		# Most people have upgraded to ld.so.conf.d, and someone else will
+		# eventually re-run ldconfig for us.
+		x="${EROOT}"/etc/ld.so.conf.d/05binutils.conf
+		if [[ -e ${x} ]]; then
+			rm -f "${x}"
+			env_update_flag=""
+		fi
+
+		DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER}
+		local e="${EROOT}"/etc/env.d/05binutils
+		local ee="${e}.tmp"
+		rm -f "${ee}"
+		[[ -d ${ROOT}/${DATAPATH}/man  ]] && echo "MANPATH=${DATAPATH}/man"   >> "${ee}"
+		[[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
+		mv_if_diff "${ee}" "${e}"
+	fi
+
+	local c="${ENV_D}/config-${TARGET}"
+	local cc="${c}.tmp"
+	echo "CURRENT=${VER}" > "${cc}"
+	mv_if_diff "${cc}" "${c}"
+
+	eend 0
+
+	#
+	# Regen env.d if need/can be
+	#
+	if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then
+		env-update ${env_update_flag}
+		echo
+		ewarn "Please remember to run:"
+		echo
+		ewarn "  # . ${EPREFIX}/etc/profile"
+		echo
+	fi
+
+	return 0
+}
+
+uninstall_target() {
+	: ${TARGET:=${UARG}}
+
+	if [[ ${TARGET} == ${HOST} ]] ; then
+		die "refusing to uninstall native binutils"
+	fi
+
+	shopt -s nullglob
+	PROFILE=""
+
+	for PROFILE in "${ENV_D}"/${TARGET}-* ; do
+		ewarn "Removing all signs of ${PROFILE##*/}"
+		rm -f "${ENV_D}"/${PROFILE}
+	done
+	if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
+		die "no profiles exist for '${TARGET}'"
+	fi
+
+	rm -f "${ENV_D}"/config-${TARGET}
+
+	local x
+	for x in \
+		addr2line ar as c++filt dwp elf2flt elfedit flthdr gprof \
+		ld ld.{bfd,gold,real} \
+		nm objcopy objdump ranlib readelf size strings strip
+	do
+		x=(
+			"${EROOT}"/usr/bin/${TARGET}-${x}
+			"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
+			"${EROOT}"/usr/libexec/gcc/${TARGET}/${x}
+		)
+		rm -f "${x[@]}"
+	done
+	for x in "${HEADERS[@]}" ; do
+		rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
+	done
+	for x in bfd iberty opcodes ; do
+		rm -f "${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
+	done
+	# Delete broken symlinks
+	local destdir="${EROOT}/usr/${HOST}/${TARGET}"
+	rm -f "${destdir}"/lib/ldscripts
+	find -L "${destdir}"/lib -type l -exec rm {} +
+	rmdir \
+		"${destdir}"/{bin,include,lib,usr} \
+		"${destdir}" \
+		"${EROOT}"/var/db/pkg/cross-${TARGET} \
+		"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \
+		"${EROOT}"/usr/libexec/gcc/${TARGET} \
+		2>/dev/null
+
+	rm -f "${ENV_D}"/${TARGET}-*
+}
+
+set_current_profile() {
+	if [[ ! -f ${ENV_D}/config-${TARGET} ]] ; then
+		eerror "${argv0}: unable to locate a profile for target: ${TARGET}"
+		return 1
+	fi
+
+	source "${ENV_D}/config-${TARGET}"
+
+	if [[ -z ${CURRENT} ]] ; then
+		eerror "${argv0}: no binutils profile is active!"
+		return 1
+	fi
+
+	echo "${TARGET}-${CURRENT}"
+
+	return 0
+}
+get_current_profile() { echo "${PROFILE}" ; }
+
+list_profiles() {
+	local x i target
+
+	if [[ ${ROOT} != / ]] ; then
+		echo "Using binutils-config info in ${ROOT}"
+	fi
+
+	set -- "${ENV_D}"/*
+	target=
+	i=1
+
+	for x ; do
+		# skip broken links and config files
+		[[ -f ${x} ]] || continue
+		[[ ${x} == */config-* ]] && continue
+
+		source "${x}"
+		if [[ ${target} != ${TARGET} ]] ; then
+			[[ -n ${target} ]] && echo
+			target=${TARGET}
+		fi
+
+		x=${x##*/}
+		if [[ -e ${ENV_D}/config-${TARGET} ]] ; then
+			source "${ENV_D}/config-${TARGET}"
+			if [[ ${VER} == ${CURRENT} ]] ; then
+				[[ ${TARGET} == ${HOST} ]] \
+					&& x="${x} ${GOOD}*${NORMAL}" \
+					|| x="${x} ${HILITE}*${NORMAL}"
+			fi
+		fi
+
+		# We would align the [...] field like so:
+		#printf ' [%*ss] %s\n' ${##} "${i}" "${x}"
+		# but this breaks simple scripting: `binutils -l | awk '{print $2}'`
+
+		# Or we could align the target col like so:
+		#printf ' [%s]%*s %s\n' "${i}" $(( ${##} - ${#i} )) "" "${x}"
+		# but i'm not sold that it looks better
+
+		# So keep it simple ... only makes a diff anyways for crazy people
+		# like me which have 100+ binutils packages installed ...
+		echo " [$i] ${x}"
+		((++i))
+	done
+}
+
+set_HOST() {
+	# Set HOST to CHOST if it isn't already set
+	: ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
+}
+
+ENV_D="${EROOT}etc/env.d/binutils"
+
+DEBUG="no"
+NEED_ACTION="yes"
+DOIT="switch_profile"
+PROFILE="current"
+HOST=""
+TARGET=""
+unset UARG
+
+select_action() {
+	if [[ ${NEED_ACTION} != "no" ]] ; then
+		NEED_ACTION="no"
+		DOIT=$1
+	else
+		die "one action at a time!"
+	fi
+}
+
+while [[ $# -gt 0 ]] ; do
+	x=$1
+	shift
+	case ${x} in
+		-c|--get-current-profile)  select_action get_current_profile ;;
+		-l|--list|--list-profiles) select_action list_profiles ;;
+		-u|--uninstall)            select_action uninstall_target ;;
+		-d|--debug)                DEBUG="yes" ;;
+		-h|--help)                 usage 0 ;;
+		-V|--version)
+			ver="@PV@"
+			echo "binutils-config-${ver/@'PV'@/git}"
+			exit 0
+			;;
+		-*)
+			die "invalid switch!  Try '--help'."
+			;;
+		*)
+			if [[ ${UARG+set} == "set" ]] ; then
+				die "only one profile/target at a time please"
+			fi
+			NEED_ACTION="maybe"
+			UARG=${x}
+			;;
+	esac
+done
+
+[[ ${NEED_ACTION} == "yes" ]] && usage 1
+[[ ${DEBUG} == "yes" ]] && set -x
+
+# All operations need to know the current HOST to figure out
+# what is a native target and what is a cross target
+set_HOST
+
+# All operations need to know the profile the user wants
+case ${DOIT} in
+switch_profile)
+	# decode user's profile choice
+	x=${UARG:-$(TARGET=${HOST} set_current_profile)}
+	PROFILE=""
+	if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
+		# User gave us a # representing the profile
+		i=1
+		for y in "${ENV_D}"/* ; do
+			[[ ${y/config-} != ${y} ]] && continue
+
+			if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]] ; then
+				PROFILE=${y##*/}
+				break
+			fi
+			((++i))
+		done
+	fi
+
+	if [[ -z ${PROFILE} ]] ; then
+		# User gave us a full HOST-ver
+		x=${x##*/}
+		if [[ -f ${ENV_D}/${x} ]] ; then
+			# Valid HOST-ver yeah!
+			PROFILE=${x}
+		else
+			# Not a valid HOST-ver ...
+			if [[ ! -f ${ENV_D}/config-${x} ]] ; then
+				# Maybe they just gave us a ver ...
+				if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
+					x=${HOST}-${x}
+				else
+					die "could not locate '$x' in '${ENV_D}/'!"
+				fi
+				PROFILE=${x}
+			else
+				# Maybe they just gave us a target ... pick active profile
+				PROFILE=$(TARGET=${x} set_current_profile)
+			fi
+		fi
+	fi
+	;;
+*)
+	# lookup current profile as the user gave us a target
+	PROFILE=$(TARGET=${UARG:-${HOST}} set_current_profile) || exit 1
+	;;
+esac
+
+eval ${DOIT}
+
+# vim:ts=4
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 6bbcb0e0d3bd..97bf8d87edd5 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -13,8 +13,10 @@ DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f59
 DIST binutils-2.31.1-patches-7.tar.xz 76828 BLAKE2B 354e7c3aa76c0cfe8fc6bb419a5b19294c0be09ebdff2fc4533dd16116fcd4f4a1b4c8db02233dabe33ca68347e0a30e542456988a4ead407edb47ed031e018c SHA512 c84ff9cd9f5b1e313e93d0f25bb4244950a73e0d97ec4dacb8763382219a08a01b16a8e93173032232ea4239098b29448331ed461f792e663e1117eb0811f85b
 DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
 DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
+DIST binutils-2.32-patches-3.tar.xz 151372 BLAKE2B 70d5f78d9f3e3bf9ff096b6f24babcc35c63395a5e1155a981a5ceb4b7a5706ad2ee0c77c74e910fc0eefeaed19763113186deb9665eed538dc3b8e227bef12d SHA512 5e91eff63332c2aca86a82a287ca4959a6098065ed88078265a3d79a2c851abd113e9736b75d8102a208996ed1191b0e23569921217ece975f1d9005a55afd0d
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
 DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
+DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-9999-patches-5.tar.xz 17492 BLAKE2B 4d5072d26d714dbc2a65899102c35791887b3c1298eb40a72088f5f964f500fa82581ac27a47f075812610e1757ba1ca5ac7d055dccc0d819ec06a86ca98f395 SHA512 c8a843cf04b72f010eef405cc2d029e49fb1f4582686f1e0409579d544b02d249c31f7cb9cd59747bc94727e29ddaba89951043b392017c6963ca14f3a0202b1
 EBUILD binutils-2.26.1.ebuild 258 BLAKE2B 404f3410d09218c9601956568f3b47006782b4a7c6381277b43f7567822a9ad8f3be057f05e158fd8eced075e518b9d3f6f6db0af714990dd0d95bbc413ff9f9 SHA512 20ac1a4f721ebf8505096522a9c5d7115c8299942e9ded9efb0dc5c00664d2a7fc1fc90a9daf28555334de504a5a642c9080911bca00f83c819ba37d2bd3ab33
@@ -24,6 +26,8 @@ EBUILD binutils-2.29.1-r1.ebuild 306 BLAKE2B 580c086c26214234bdd84dc8d8d6d3931a5
 EBUILD binutils-2.30-r4.ebuild 12023 BLAKE2B c65a3859d19e6cf1be2a717138a1d8ecc6b98cb73c9d24f99d9dc42c6b38993e1af0f611a164c1907a678fed425d968a13ee815469b9a83f4a6aebc1221fbe2b SHA512 dc4acf3c61b4a926216e4254e4b55256fa6be4323722c01c112e6a29358b6f21ff53d3195c2bcccf96106a1f369aad1d808af25789e6cc0de297256105233eef
 EBUILD binutils-2.31.1-r6.ebuild 12417 BLAKE2B 494abb53efdf8de5c577a19400b57787dd9d26dbe8212c83dc9c25787af8ba48b631d92fbc8ca50b203910b4e0f46c72c8c8af5bdd37d522f6d45756028a62fc SHA512 214987a371d304f66f9408956247d04a7bff1391d01cfc632ee6408e57433e60d483d5609f3ed27896b0aa4b0c186b2b40d70801945444c0c1fc810d9bbda512
 EBUILD binutils-2.32-r1.ebuild 12622 BLAKE2B f8a47a3a2ffd6e0e07cf57e6cc149c4fc8fa40215457c596ebd79789167199ac2b1386e40d1592527d17277d2010e1434eaaf3ae16d1fb981e54961edd4d1bac SHA512 e8d8aba2842c583d838a856bfff0c5888208bcf425771efa73cb4b97b073e5342b3c28fda488a8e85e53ecde9bc28ce03c3f60dd79c24ec633f9afc1ac078cc2
+EBUILD binutils-2.32-r2.ebuild 12323 BLAKE2B 07f6f4d751047269334bed629b91207253fc1f38dfd1a9950ce8f42e8f83e658d351fa84f0170e42535e50825b3a4a84bc4e24a5e504ab6a85fc2f7b7860bd9c SHA512 119823211d2c243f68d468e7558c6d39cd77dd2f42fc1ddebb989da9dd37cb241f6e1d2188d0366fedb3e15a6a4905584c139f6dee1b1840dbabf294fb55d0d1
+EBUILD binutils-2.33.1-r1.ebuild 12097 BLAKE2B 709354c141329a0d2327d04b21aec229c76f8076f68c9dade227a6598416450e17b626b4415a3333bc37baf9267c62b52d36eb337f7623789b1da938d332b380 SHA512 91a19fff42adf037922a679dfb834beaee7282b7e6356978a0f82efbff186bcc4450eb85df0092b1e609d46d8267860341953b66086136f692f1f11703fb3546
 EBUILD binutils-2.33.1.ebuild 12100 BLAKE2B d84533854129ce059dca2a3ff12df371ad005398f718ae352c5c4b2073c5abb923a7a4454f10c7f96856ea00833c8a49d84528cefca0fe81b470868ef974ae7b SHA512 028d77b61b611aec549beb803f05103c324623199541b2959e3a3eaa72163af0ab32660cb82c5159d2d430e4687afce8c40d5b092cf2a3057ad5742c801c4d2a
 EBUILD binutils-9999.ebuild 12121 BLAKE2B b9c04c1954d42a58b2316f054928ee2c5aa64204d385a78cba2955fdc53319428eca1827a982ecf519d53c2287d95688e44c420d63cd6590cc6a67d9490ef102 SHA512 4113e5af0372e2bad7a4b7702c91e14654a68ee2c8678b53d7fb9a9ddfd000d35d1465d5a3f9becbe08863c6470bf36982d3b4d9e4c346853c7daab5c280a9ec
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.32-r2.ebuild b/sys-devel/binutils/binutils-2.32-r2.ebuild
new file mode 100644
index 000000000000..9d02442c6e83
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.32-r2.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils libtool flag-o-matic gnuconfig multilib
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+LICENSE="GPL-3+"
+IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
+REQUIRED_USE="default-gold? ( gold )"
+
+# Variables that can be set here:
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=3
+PATCH_DEV=slyfox
+
+case ${PV} in
+	9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		SLOT=${PV}
+		;;
+	*.9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		EGIT_BRANCH=$(ver_cut 1-2)
+		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
+		SLOT=$(ver_cut 1-2)
+		;;
+	*)
+		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+		SLOT=$(ver_cut 1-2)
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+		;;
+esac
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+# Disable gold testsuite since it always fails.
+PATCHES=( "${FILESDIR}/${PN}-2.29.1-nogoldtest.patch" )
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	doc? ( sys-apps/texinfo )
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR=${WORKDIR}/build
+
+src_unpack() {
+	case ${PV} in
+		*9999)
+			git-r3_src_unpack
+			;;
+		*)
+			;;
+	esac
+	default
+	mkdir -p "${MY_BUILDDIR}"
+}
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		# Use upstream patch to enable development mode
+		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
+
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# This check should probably go somewhere else, like pkg_pretend.
+	if [[ ${CTARGET} == *-uclibc* ]] ; then
+		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
+			die "sorry, but this binutils doesn't yet support uClibc :("
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered. #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Fix locale issues if possible #122216
+	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
+		einfo "Fixing misc issues in configure files"
+		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
+			ebegin "  Updating ${f/${S}\/}"
+			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
+				|| eerror "Please file a bug about this"
+			eend $?
+		done
+	fi
+
+	# Fix conflicts with newer glibc #272594
+	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
+		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
+	fi
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${PV}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}"
+	local myconf=()
+
+	if use plugins ; then
+		myconf+=( --enable-plugins )
+	fi
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use gold ; then
+		myconf+=( --enable-gold )
+		if use default-gold; then
+			myconf+=( --enable-gold=default )
+		fi
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd.  This matches
+	# the bi-arch logic in toolchain.eclass. #446946
+	# We used to do it for everyone, but it's slow on 32bit arches. #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
+	# on everyone in alpha (for now), we'll just enable it when possible
+	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
+	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.27) offer a configure flag now.
+		--enable-relro
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		${EXTRA_ECONF}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# Change SONAME to avoid conflict across
+		# {native,cross}/binutils, binutils-libs. #666100
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+	)
+	echo ./configure "${myconf[@]}"
+	"${S}"/configure "${myconf[@]}" || die
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake tooldir="${EPREFIX}${TOOLPATH}" all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}"
+
+	# bug 637066
+	filter-flags -Wall -Wreturn-type
+
+	emake -k check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${ED}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${PV} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}"
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${PV}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${PV}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${PV}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+		binutils-config ${CTARGET}-${PV}
+	fi
+}
+
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. Many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not allow ./configure to tweak every location
+# we need for slotting binutils hence all the shuffling in
+# src_install(). This note is about SCRIPTDIR define handling.
+#
+# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
new file mode 100644
index 000000000000..b961ec55af15
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
@@ -0,0 +1,433 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils libtool flag-o-matic gnuconfig multilib
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+LICENSE="GPL-3+"
+IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
+REQUIRED_USE="default-gold? ( gold )"
+
+# Variables that can be set here:
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=2
+PATCH_DEV=slyfox
+
+case ${PV} in
+	9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		SLOT=${PV}
+		;;
+	*.9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		EGIT_BRANCH=$(ver_cut 1-2)
+		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
+		SLOT=$(ver_cut 1-2)
+		;;
+	*)
+		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+		SLOT=$(ver_cut 1-2)
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+		;;
+esac
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	doc? ( sys-apps/texinfo )
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR=${WORKDIR}/build
+
+src_unpack() {
+	case ${PV} in
+		*9999)
+			git-r3_src_unpack
+			;;
+		*)
+			;;
+	esac
+	default
+	mkdir -p "${MY_BUILDDIR}"
+}
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# This check should probably go somewhere else, like pkg_pretend.
+	if [[ ${CTARGET} == *-uclibc* ]] ; then
+		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
+			die "sorry, but this binutils doesn't yet support uClibc :("
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered. #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Fix locale issues if possible #122216
+	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
+		einfo "Fixing misc issues in configure files"
+		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
+			ebegin "  Updating ${f/${S}\/}"
+			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
+				|| eerror "Please file a bug about this"
+			eend $?
+		done
+	fi
+
+	# Fix conflicts with newer glibc #272594
+	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
+		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
+	fi
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${PV}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}"
+	local myconf=()
+
+	if use plugins ; then
+		myconf+=( --enable-plugins )
+	fi
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use gold ; then
+		myconf+=( --enable-gold )
+		if use default-gold; then
+			myconf+=( --enable-gold=default )
+		fi
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd.  This matches
+	# the bi-arch logic in toolchain.eclass. #446946
+	# We used to do it for everyone, but it's slow on 32bit arches. #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
+	# on everyone in alpha (for now), we'll just enable it when possible
+	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
+	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.27) offer a configure flag now.
+		--enable-relro
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		${EXTRA_ECONF}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# Change SONAME to avoid conflict across
+		# {native,cross}/binutils, binutils-libs. #666100
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+	)
+	echo ./configure "${myconf[@]}"
+	"${S}"/configure "${myconf[@]}" || die
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake tooldir="${EPREFIX}${TOOLPATH}" all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}"
+
+	# bug 637066
+	filter-flags -Wall -Wreturn-type
+
+	emake -k check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${ED}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${PV} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}"
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${PV}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${PV}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${PV}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+		binutils-config ${CTARGET}-${PV}
+	fi
+}
+
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. Many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not allow ./configure to tweak every location
+# we need for slotting binutils hence all the shuffling in
+# src_install(). This note is about SCRIPTDIR define handling.
+#
+# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/byfl/Manifest b/sys-devel/byfl/Manifest
deleted file mode 100644
index 4f120970a03e..000000000000
--- a/sys-devel/byfl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST byfl-1.6-llvm-6.0.0.tar.gz 556081 BLAKE2B 34e233d29aebc340a0dadfa2ca74b35fe8a8c90e8b7d79ebde0da877a2462144d3a82a5c63633786e177c52e04444cd623dd91db870b654f322ee1becbb1e336 SHA512 3b69eb98247cc4e3398788dfbf450624a918c4de731e1ec1b709a5e6aa0dd29988088827468f0bbf4397563b18aca51350cc947ddcbd2e513b51e1fce17ccc01
-EBUILD byfl-1.6-r1.ebuild 1088 BLAKE2B 63365abfa04e1244929003d5b1094e5f5e49796bdc78955291e3970cd83f74b0f725727ca7001e854ecb8e057ecb7ed0b82ec3b9e3f83cb5b4105cd9bcbd6229 SHA512 d3d82de1446362bfadb03196b8ac04abbcc96dac373ba9300e45c26b35ea47d223a506fcc7e9f90f77bf4295606515ca2c9174eb3b095a8f27104bb2fdd4c4b3
-EBUILD byfl-9999.ebuild 1088 BLAKE2B 5b0463b0d1cfa97e1e3fe6a6d7857dc4fa74b90b575672723e21be49a19a2e8592ca0d84357398ee3f6695a0e18acea326a64c9c9b2833fe4434b757f6d67c71 SHA512 f04bd81961aaaffb14c5945f7f1a3c5cafc1b230b9fe9d7e62361f2caa997bb4cff2a4e16eff59184bbd1b17897efdbecab5f400e307dd0bbb564ecc789038a9
-MISC metadata.xml 327 BLAKE2B c1b85e4d2ef64f4eb4c9ad62d47dca1bde431dc11fe2c02974a3d019b6b2d0d97d8505847e37dde82f89241a4c62d5d20aba217edcfb81c0a6ed9b9c2b7b2ae6 SHA512 ed1eea05cc9adab8173a1ce8af0cc2dc54675947bda8ffeef935504e9bbb3cf959f36989302ff2cad22c16ff1e499470373bb8c4817c5dc20522b7bfc59c6d47
diff --git a/sys-devel/byfl/byfl-1.6-r1.ebuild b/sys-devel/byfl/byfl-1.6-r1.ebuild
deleted file mode 100644
index 721d35dbab42..000000000000
--- a/sys-devel/byfl/byfl-1.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic llvm
-
-if [ "${PV}" = "9999" ]; then
-	LLVM_VERSION="6.0.0"
-	LLVM_SLOT=6
-	EGIT_REPO_URI="https://github.com/lanl/Byfl.git"
-	inherit autotools git-r3
-	KEYWORDS=""
-else
-	LLVM_VERSION="6.0.0"
-	LLVM_SLOT=6
-	MY_P="${P}-llvm-${LLVM_VERSION}"
-	SRC_URI="https://github.com/lanl/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~amd64-linux"
-fi
-
-DESCRIPTION="Compiler-based Application Analysis"
-HOMEPAGE="https://github.com/lanl/Byfl"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="hdf5 static-libs sqlite"
-
-RDEPEND="
-	>=sys-devel/clang-${LLVM_VERSION}:${LLVM_SLOT}
-	>=sys-devel/llvm-${LLVM_VERSION}:${LLVM_SLOT}
-	sys-devel/binutils:*
-	dev-lang/perl:=
-	dev-perl/Switch
-	hdf5? ( sci-libs/hdf5[cxx] )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	use sqlite || export ac_cv_lib_sqlite3_sqlite3_errstr=no
-	econf H5CXX=$(usex hdf5 h5c++ no)
-}
diff --git a/sys-devel/byfl/byfl-9999.ebuild b/sys-devel/byfl/byfl-9999.ebuild
deleted file mode 100644
index 4d749435eab1..000000000000
--- a/sys-devel/byfl/byfl-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic llvm
-
-if [ "${PV}" = "9999" ]; then
-	LLVM_VERSION="6.0.0"
-	LLVM_SLOT=6
-	EGIT_REPO_URI="https://github.com/lanl/Byfl.git"
-	inherit autotools git-r3
-	KEYWORDS=""
-else
-	LLVM_VERSION="5.0.1"
-	LLVM_SLOT=5
-	MY_P="${P}-llvm-${LLVM_VERSION}"
-	SRC_URI="https://github.com/lanl/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~amd64-linux"
-fi
-
-DESCRIPTION="Compiler-based Application Analysis"
-HOMEPAGE="https://github.com/lanl/Byfl"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="hdf5 static-libs sqlite"
-
-RDEPEND="
-	>=sys-devel/clang-${LLVM_VERSION}:${LLVM_SLOT}
-	>=sys-devel/llvm-${LLVM_VERSION}:${LLVM_SLOT}
-	sys-devel/binutils:*
-	dev-lang/perl:=
-	dev-perl/Switch
-	hdf5? ( sci-libs/hdf5[cxx] )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	use sqlite || export ac_cv_lib_sqlite3_sqlite3_errstr=no
-	econf H5CXX=$(usex hdf5 h5c++ no)
-}
diff --git a/sys-devel/byfl/metadata.xml b/sys-devel/byfl/metadata.xml
deleted file mode 100644
index 72ecaff33a5b..000000000000
--- a/sys-devel/byfl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lanl/Byfl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 5e62f6d2d813..f9f617ea6a67 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,13 +1,8 @@
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
-DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
-DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
-DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-common-10.0.0.9999.ebuild 513 BLAKE2B 3ca10da9963052dfcd89bfbc0399f9839325caba42a63e916ccb3ab5f10c0b1f1089cf2b932ce1f166e0dc60ae2d605003e345354eed6310eebc29a40275405d SHA512 18c55050f97348880eaa7676dcf4bde318f2db16c9014713ca32b17c2c02997e68034ed20dc8737a1f1c5d51de88da321dd68bfe83068008dc7f92857d782997
 EBUILD clang-common-7.1.0.ebuild 766 BLAKE2B a0b5b93670719d86b7edbaaa26586ba2b605a0a9054dd1bef53e566d205f84a9fae06fddc895eb7de4774924f89bdd619e974d9c3877a97b056464ddd534c5cb SHA512 7e7e4aff9bedc62d9bb59cdfa81d404ac0caac9d0b48811195a608db030a4eeda5f98c556a111d115b638c85b52bd27b450ce5a8ec047b220fad3d7213459257
 EBUILD clang-common-8.0.1.ebuild 798 BLAKE2B ee3a460e6e80ac0700fec452f3cf47a1f6054c7b93139e0fd4c5efec8ccf84d1cfe933420cca84e017e115bf45474db42f58813b98dc2f396feb61c00f2901d5 SHA512 feda961724c5bfde42926b0928107fae7df056e63041705a68eb7521ffc1e9f5be8f86591db41d10f97b940ef1ac664dc35ad11e59b29635b46b2fe5ea8c974b
-EBUILD clang-common-9.0.0.ebuild 589 BLAKE2B b91f6c2adde1765c0a00a0449f6be5fecfc7902c347d04d86619b834fd6ee3fa8a2f383095681330248f06d712a7fb99dc58624a8c99f811a9a3827903f9124d SHA512 9dd411a4a7eac3d88706452b8021ef17ae14c6260fe80e7dc7ae3fa300e14777b763932f7536a7e00bb421ae2c835c4bacd9444798f88fdcc4c37407f007711c
-EBUILD clang-common-9.0.1.9999.ebuild 513 BLAKE2B 3ca10da9963052dfcd89bfbc0399f9839325caba42a63e916ccb3ab5f10c0b1f1089cf2b932ce1f166e0dc60ae2d605003e345354eed6310eebc29a40275405d SHA512 18c55050f97348880eaa7676dcf4bde318f2db16c9014713ca32b17c2c02997e68034ed20dc8737a1f1c5d51de88da321dd68bfe83068008dc7f92857d782997
-EBUILD clang-common-9.0.1_rc2.ebuild 589 BLAKE2B b91f6c2adde1765c0a00a0449f6be5fecfc7902c347d04d86619b834fd6ee3fa8a2f383095681330248f06d712a7fb99dc58624a8c99f811a9a3827903f9124d SHA512 9dd411a4a7eac3d88706452b8021ef17ae14c6260fe80e7dc7ae3fa300e14777b763932f7536a7e00bb421ae2c835c4bacd9444798f88fdcc4c37407f007711c
-EBUILD clang-common-9.0.1_rc3.ebuild 589 BLAKE2B b91f6c2adde1765c0a00a0449f6be5fecfc7902c347d04d86619b834fd6ee3fa8a2f383095681330248f06d712a7fb99dc58624a8c99f811a9a3827903f9124d SHA512 9dd411a4a7eac3d88706452b8021ef17ae14c6260fe80e7dc7ae3fa300e14777b763932f7536a7e00bb421ae2c835c4bacd9444798f88fdcc4c37407f007711c
+EBUILD clang-common-9.0.1.ebuild 589 BLAKE2B b91f6c2adde1765c0a00a0449f6be5fecfc7902c347d04d86619b834fd6ee3fa8a2f383095681330248f06d712a7fb99dc58624a8c99f811a9a3827903f9124d SHA512 9dd411a4a7eac3d88706452b8021ef17ae14c6260fe80e7dc7ae3fa300e14777b763932f7536a7e00bb421ae2c835c4bacd9444798f88fdcc4c37407f007711c
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild b/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild
deleted file mode 100644
index d1bfe71d2f80..000000000000
--- a/sys-devel/clang-common/clang-common-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
-llvm.org_set_globals
-S=${WORKDIR}/clang/utils
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-PDEPEND="sys-devel/clang:*"
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-}
diff --git a/sys-devel/clang-common/clang-common-9.0.0.ebuild b/sys-devel/clang-common/clang-common-9.0.1.ebuild
index 3fc7a056a923..3fc7a056a923 100644
--- a/sys-devel/clang-common/clang-common-9.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-9.0.1.ebuild
diff --git a/sys-devel/clang-common/clang-common-9.0.1_rc2.ebuild b/sys-devel/clang-common/clang-common-9.0.1_rc2.ebuild
deleted file mode 100644
index 3fc7a056a923..000000000000
--- a/sys-devel/clang-common/clang-common-9.0.1_rc2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
-llvm.org_set_globals
-S=${WORKDIR}/clang/utils
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-PDEPEND="sys-devel/clang:*"
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-}
diff --git a/sys-devel/clang-common/clang-common-9.0.1_rc3.ebuild b/sys-devel/clang-common/clang-common-9.0.1_rc3.ebuild
deleted file mode 100644
index 3fc7a056a923..000000000000
--- a/sys-devel/clang-common/clang-common-9.0.1_rc3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
-llvm.org_set_globals
-S=${WORKDIR}/clang/utils
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-PDEPEND="sys-devel/clang:*"
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 37190b0b64e6..8c0e5cac7811 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,8 +1,5 @@
 EBUILD clang-runtime-10.0.0.9999.ebuild 643 BLAKE2B d513da18fea612d5908924aedc4ccc2a01e25a66b306b1229e9d7c6ad5a8508a3be51b551246f64eba90f406c47c4f384d5fa69545d581aaeb55e6b2116895c2 SHA512 8f9cdfe5312cccfe2b7b5f7929d9aa3ffd8e9e007ddded8284a391bfbfe9f4e11462164336679fdfa40bb1d3b5449498d28a25fa97af2a3fbd5b978bb450b822
 EBUILD clang-runtime-7.1.0.ebuild 808 BLAKE2B 0063d26d15d1d2e068b0eca1189ec3e676618eabd4f22a8ede570d57b11ea4c4f8c8d25abc22ea4845832bb1d0a50bbb60a1080589c373675bbac9f6326b86e0 SHA512 234be48d982ae1b334680e051c969ef4233708b9dbb97727c93d973f0a35662db9437f30ae11c891423b7e00ba7a1ee1ad090d4ae69408aaf893e2bba33b2dc1
 EBUILD clang-runtime-8.0.1.ebuild 807 BLAKE2B 4d30a481ae14d01c2e5603e3fe4eb677ac3d3ba587660f206f0b45077e7d1ec4a9be544631374791d2fac78be6d07eb01283590afcd13a587460ecd68d95693b SHA512 fae9b0337505bcd52585564a80aab48ffc7ffdddfa22cc41c7f728df0b14c098bf36e51f1676fa33d247034e0b0d7dd8a23195bbd373ad311dbb83fafa7b55ae
-EBUILD clang-runtime-9.0.0.ebuild 701 BLAKE2B 05f22220e6952e2933df92f82ad703ffc2aa743083d2db14a2c78450673b06f5fbb89de73f4ef665fe999daed3ae6c0b53e998654f57594f1c29f8d479808fff SHA512 e14e30b1083979802546b3b2fbe58e791cb01a032c7c54f983f590f0ec140af3f45da751e349647e6f875254f2998b71250e2e3d6c3312818463ff50a88470dd
-EBUILD clang-runtime-9.0.1.9999.ebuild 643 BLAKE2B d513da18fea612d5908924aedc4ccc2a01e25a66b306b1229e9d7c6ad5a8508a3be51b551246f64eba90f406c47c4f384d5fa69545d581aaeb55e6b2116895c2 SHA512 8f9cdfe5312cccfe2b7b5f7929d9aa3ffd8e9e007ddded8284a391bfbfe9f4e11462164336679fdfa40bb1d3b5449498d28a25fa97af2a3fbd5b978bb450b822
-EBUILD clang-runtime-9.0.1_rc2.ebuild 701 BLAKE2B 05f22220e6952e2933df92f82ad703ffc2aa743083d2db14a2c78450673b06f5fbb89de73f4ef665fe999daed3ae6c0b53e998654f57594f1c29f8d479808fff SHA512 e14e30b1083979802546b3b2fbe58e791cb01a032c7c54f983f590f0ec140af3f45da751e349647e6f875254f2998b71250e2e3d6c3312818463ff50a88470dd
-EBUILD clang-runtime-9.0.1_rc3.ebuild 701 BLAKE2B 05f22220e6952e2933df92f82ad703ffc2aa743083d2db14a2c78450673b06f5fbb89de73f4ef665fe999daed3ae6c0b53e998654f57594f1c29f8d479808fff SHA512 e14e30b1083979802546b3b2fbe58e791cb01a032c7c54f983f590f0ec140af3f45da751e349647e6f875254f2998b71250e2e3d6c3312818463ff50a88470dd
+EBUILD clang-runtime-9.0.1.ebuild 701 BLAKE2B 05f22220e6952e2933df92f82ad703ffc2aa743083d2db14a2c78450673b06f5fbb89de73f4ef665fe999daed3ae6c0b53e998654f57594f1c29f8d479808fff SHA512 e14e30b1083979802546b3b2fbe58e791cb01a032c7c54f983f590f0ec140af3f45da751e349647e6f875254f2998b71250e2e3d6c3312818463ff50a88470dd
 MISC metadata.xml 708 BLAKE2B 56cc586deba4a72cc9ebf5d0ac6b9dbb3767b736a96f1c0e4f8d9a715076645be25e42f1c610f55ba69e500bc828d629e7f2253e7c9ed6fd4b01032722bec3c8 SHA512 764eefdff5358c66cad9e8fe18fc7b938c7656268208639cbb92a4b5ae76f7de0dee86a729cc1e6745ddbf7308180885ef99047502e0e040020e738e3d0d1425
diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.1.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.1.9999.ebuild
deleted file mode 100644
index 806c398483be..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS=""
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-PROPERTIES="live"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
index 6250baa76c9e..6250baa76c9e 100644
--- a/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.1_rc2.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.1_rc2.ebuild
deleted file mode 100644
index 6250baa76c9e..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-9.0.1_rc2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.1_rc3.ebuild b/sys-devel/clang-runtime/clang-runtime-9.0.1_rc3.ebuild
deleted file mode 100644
index 6250baa76c9e..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-9.0.1_rc3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 0e0ac04d8623..44786e7a1b09 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,27 +1,17 @@
 AUX 7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch 1244 BLAKE2B 0a5f0b4af299ae49b13eac0e6ff06ce84264baf05bc09437b481830d4cfafab68ec2a3adf5814fcd8efbe91770e2dda0ce5fa5e10fcefc10d6fbe2c17ca067b6 SHA512 cec3d531b7d6121f7fc5da731d7d89d03a7d1a38e32abd5d7812790ffa62e6d3b9f18084983702203502905d447ad89bd4e2a7f3ca51ee7d696ebe623b035ac6
 AUX 8.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533
-AUX 9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch 1324 BLAKE2B 83a02461f65f2fc660e2ad0a07ec0d75c56da04e7ad849bdb80aeec9200b2cdbfd5f283710294bfa0f4abf26bfa24da2961ac9decd9d50d9d51fbb148fc5d573 SHA512 03669ad470bd85237673c217aea0deca6080d374e2b31531c17da6594959c323dde7e187fcc3ba6ae387b03a9252d89d75caafb8ef715b49b9ba9f2cdd5c242d
-AUX 9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch 1496 BLAKE2B c35f07b4f97152f9a4885431d0e18066d9223b1f29853d558d39b35a791c4283d5d5fe8000dcb5d2f0ac1e1f1e2aaeb17a7a886b4b210a477170b01906d7274c SHA512 f57e1126578f88c3d53e15148d4e8cee41b58ff69a2a541a3b9ea55d70cabeb640e727e8d967e92123d457e058e0d140a4723d67468f426f217e43574d83e7b1
-AUX 9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch 1034 BLAKE2B 507ffab1a094b50c8b514044f02d5b8860310c61e62aa82a8c8f4c85c0a066c528ea6e4c40c5b35ea00e0b759d3c8450fd55a0704a415eb50730c82490edac7f SHA512 7fabf33ae58988d1dca01d3c456c14b10189b417cfb812b2825185c634eff6b771c3bfe8ae73d50f111b0d82b914f32160fd98cbdd1250f416ece8003ed2de36
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
-DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
 DIST clang-tools-extra-7.1.0.src.tar.xz 901328 BLAKE2B 20865cf188cf08e4eae969d1083d9d69f57159c3dceb71e3e00a3f4dd96814b99e25fe633eb46801923d64cc9f884da24a417c21af71f0b3535bda0cce7d73da SHA512 8c22136324808b42601915e8163e06a90db078693f9e12369050bca6bab8cb971efaddcda82c5abf08e67ba7a5be1ac32e1bef0aff29a1b433e80eca8eba3e7b
 DIST clang-tools-extra-8.0.1.src.tar.xz 1994068 BLAKE2B 7d312c1a958d9c5b24515067cbb1db3a92b34cdf77c2345c08ef2f327d2ae4ca7f05252d72ede6569e25cda34225963a8d415cc64279e39d542449ba56eae9c9 SHA512 d39962c30ee9d8a1679d8007009b48dea2c8aaeb283bed781a9e22a1a57b8186c2cfe058da046658882ace1c84a30ddf9b4cb75bce988891189e8423b6c6a72c
-DIST clang-tools-extra-9.0.0.src.tar.xz 2183436 BLAKE2B d9682cc615ddeb2ac4fba665089658b423bea085e935c54f1e8c8c71807a9c3c910aee60652accbb24fc4dae262c7877fc7c2f7e098b118f7dc3eef9c7e5941e SHA512 70fd5cdeb8d371e5bbc369bdea3b94a1e3f450e1fdc109a2328d75b30a09c56fbed31678e211172e0a1fc1ff82c9ab4dfea4238be2cc0b82598f71ce9b7ab7d3
 DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073
 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
-DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
-DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
-EBUILD clang-10.0.0.9999.ebuild 10864 BLAKE2B cb02b96f71d390e0a72a26cf606fb4aa0828a5dc67a0305a9dceb212708e082231cc29ec4003043d477ebd968a913dc461cc0a4954f4d75beee0452de0006118 SHA512 9c7bffd7c5133311235392c716fed76a52dc5098765bffe4eae377da7e14a09d85339f8c865afc0c0b7b611cf33792061535ecc3c1e0b306c998ad500c2a7d9c
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+EBUILD clang-10.0.0.9999.ebuild 10941 BLAKE2B d583f80b5b78f40d2a32e9cc81e538f11ddde4b504d5f2da7a1509d386a5eafffe99732731ff035d881682fce7f0e29c28bc5db4110cfd8a77687eb9e506f588 SHA512 9dbeacd9c26b9a49b4d778982c0c35cbe08b97c7ba4ac4ab6456fb0dae10d9ccb5f9210032ecbce4d937a7ae1d09c367ff3d05693de0063952a4dcd47cd56950
 EBUILD clang-7.1.0.ebuild 10240 BLAKE2B 08dd7cdbd92c674a50e4d84f52fd25bd2c01ca562b819c659ca1973675803478cc7d3e6a8bd5dcff1caac19a02d8ebb4d149685b843b16b4cc1e5f2be1ddf9ef SHA512 1e3ea5ac965f96240faba9e7d01b3745ecb40b124a857fdb27727cda4af8317087bf593f98ced940632149d8fd13e1c9e970b2307abb6b132fe87896f1d004d3
 EBUILD clang-8.0.1.ebuild 10138 BLAKE2B a2c91918e468c3f070ba10d7a0478e006c5d23289db387d6ca57ee082a7567ef24ad7af66a3b93e0e8934c69fbcd5a4fefbfbd77ba0ef077776b4110b30a6773 SHA512 da86670ee496b2a1bfe3f99eb7146cd8a85d793f580ae2ebd94bfb65363c6e39c58fb77b3b00c27e5d9bdc70ecb1688154e500506525b019da3f95d356f815e1
-EBUILD clang-9.0.0.ebuild 9417 BLAKE2B 7ac7078841e70139625864659cb5e7ced80e24c5701917f57c02e64d8d17f0c88c65e6485fabca9f1418fdf0ee96860500561e0abd80259c0cdc311f6985bf80 SHA512 5985ff467dc2fdf3694b63369dc6d129c62d095ea2bb4a45796875a18c228acd82a285b666db24400842ea942c2e3c93121e1e450a9f81b84a4bbb002e5bcc82
-EBUILD clang-9.0.1.9999.ebuild 8471 BLAKE2B 035d02dffe3b38697e6499f25e729d6445b22187f61741a3b06aae693011247872629a5444db28a204aa14aea672b6df2cd7925ed17747f3d31bfea9f4061c10 SHA512 bade8a359dc3f4208059f57bebca1c49f5419998a80c5f68290443543a29489a76be052d8d3a0ac73dc47847f0dc21fc6582a796a3be83cdd740355f19edaeb1
-EBUILD clang-9.0.1_rc2.ebuild 8499 BLAKE2B 217af7f679375bb716281681c7a425b2cc0fb3481860124a5d84bb7b6387e4559d931974315bc7d4b57f4f1c2ede61b9aafa641ba81b55af8222a58bc4758fe4 SHA512 41d5a29a1ac8e542e2cdff4ad07f319c0f67f8f5562f8ee4dcac6db27a6e4bd8c6ccfbf5b3e67601af55680b1d53775c2c320f38e17caeb889e3bb1db4421de4
-EBUILD clang-9.0.1_rc3.ebuild 8514 BLAKE2B f575ec70d6e96fc2ea3711425941e19b4fed73acc43324a12fcaf8058d451f94a285f399f7ef3d5a34495b0031f2595366c291e8a1ed2e1cda4b25d601f128bd SHA512 fcea9ef2ed1e767e8971de8052f05ac5435bcdfa892344b484886eebfbf92afb8b6b56987e76e8f4f9695e8e7831f0787043943872208d911a8ab8e03b4d973d
+EBUILD clang-9.0.1.ebuild 8991 BLAKE2B 92b26400d2afb0aed966b230e57d61b9eeb483c095e187f15bed602083768a4bef3db78d5989f6db28926ef4be72832ea0033556ccdc137ee97390ad9514adcf SHA512 e4ccbd5b6485fcfd26d82646cd2458df14d2be354ef0d1fd5787a07a2b1b441054f85ece7e8c4be8cf033dec508fab3551432002daab51cd83243dfc7a2a0360
 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 cdd1274c4236..78e777565781 100644
--- a/sys-devel/clang/clang-10.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.0.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
 	pax-utils python-single-r1 toolchain-funcs
 
@@ -209,6 +209,7 @@ multilib_src_configure() {
 	local clang_version=$(ver_cut 1-3 "${llvm_version}")
 
 	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
 		# relative to bindir
diff --git a/sys-devel/clang/clang-9.0.0.ebuild b/sys-devel/clang/clang-9.0.0.ebuild
deleted file mode 100644
index bd334de6d5cd..000000000000
--- a/sys-devel/clang/clang-9.0.0.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
-	pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )"
-LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-)
-llvm.org_set_globals
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/clang
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	sys-devel/clang-common
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-PATCHES=(
-	# fix linking in non-native build (without tools-extra)
-	# https://bugs.llvm.org/show_bug.cgi?id=43281
-	"${FILESDIR}"/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch
-	# fix build with gcc-9.0.0
-	# https://bugs.llvm.org/show_bug.cgi?id=40547
-	"${FILESDIR}"/9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch
-	# fix silly test failure due to '.src' in path
-	# https://bugs.llvm.org/show_bug.cgi?id=42979
-	"${FILESDIR}"/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
-)
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# create extra parent dir for CLANG_RESOURCE_DIR
-	mkdir -p x/y || die
-	cd x/y || die
-	llvm.org_src_unpack
-	mv clang-tools-extra clang/tools/extra || die
-
-	if ! use doc; then
-		ebegin "Unpacking llvm-${PV}-manpages.tar.bz2"
-		tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
-		eend
-	fi
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=$(usex doc)
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
-		)
-		use doc && mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=ON
-			-DLLVM_ENABLE_SPHINX=ON
-			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-clang
-	multilib_is_native_abi && cmake-utils_src_make check-clang-tools
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1 "${llvm_version}")
-	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	# install pre-generated manpages
-	if ! use doc; then
-		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-		doins "${WORKDIR}/x/y/llvm-${PV}-manpages/clang"/*.1
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
-	elog "Some of them are vim integration scripts (with instructions inside)."
-	elog "The run-clang-tidy.py script requires the following additional package:"
-	elog "  dev-python/pyyaml"
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-9.0.1.9999.ebuild b/sys-devel/clang/clang-9.0.1.9999.ebuild
deleted file mode 100644
index 0d3eaa9b27bd..000000000000
--- a/sys-devel/clang/clang-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
-	pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-)
-llvm.org_set_globals
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/clang
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	sys-devel/clang-common
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# create extra parent dir for CLANG_RESOURCE_DIR
-	mkdir -p x/y || die
-	cd x/y || die
-	llvm.org_src_unpack
-	mv clang-tools-extra clang/tools/extra || die
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=$(usex doc)
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
-		)
-		use doc && mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=ON
-			-DLLVM_ENABLE_SPHINX=ON
-			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-clang
-	multilib_is_native_abi &&
-		cmake-utils_src_make check-clang-tools check-clangd
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1 "${llvm_version}")
-	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
-	elog "Some of them are vim integration scripts (with instructions inside)."
-	elog "The run-clang-tidy.py script requires the following additional package:"
-	elog "  dev-python/pyyaml"
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-9.0.1_rc3.ebuild b/sys-devel/clang/clang-9.0.1.ebuild
index 8636b7166174..c72230eaae4f 100644
--- a/sys-devel/clang/clang-9.0.1_rc3.ebuild
+++ b/sys-devel/clang/clang-9.0.1.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
 	pax-utils python-single-r1 toolchain-funcs
 
+MANPAGE_P=llvm-9.0.0-manpages
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
+SRC_URI="
+	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${MANPAGE_P}.tar.bz2 )"
 LLVM_COMPONENTS=( clang clang-tools-extra )
 LLVM_TEST_COMPONENTS=(
 	llvm/lib/Testing/Support
@@ -80,6 +83,12 @@ src_unpack() {
 	cd x/y || die
 	llvm.org_src_unpack
 	mv clang-tools-extra clang/tools/extra || die
+
+	if ! use doc; then
+		ebegin "Unpacking ${MANPAGE_P}.tar.bz2"
+		tar -xf "${DISTDIR}/${MANPAGE_P}.tar.bz2" || die
+		eend ${?}
+	fi
 }
 
 multilib_src_configure() {
@@ -87,6 +96,7 @@ multilib_src_configure() {
 	local clang_version=$(ver_cut 1-3 "${llvm_version}")
 
 	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
 		# relative to bindir
@@ -243,6 +253,12 @@ multilib_src_install_all() {
 		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
 	fi
 
+	# install pre-generated manpages
+	if ! use doc; then
+		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
+		doins "${WORKDIR}/x/y/${MANPAGE_P}/clang"/*.1
+	fi
+
 	docompress "/usr/lib/llvm/${SLOT}/share/man"
 	# match 'html' non-compression
 	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
diff --git a/sys-devel/clang/clang-9.0.1_rc2.ebuild b/sys-devel/clang/clang-9.0.1_rc2.ebuild
deleted file mode 100644
index ac5562725d7f..000000000000
--- a/sys-devel/clang/clang-9.0.1_rc2.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
-	pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang clang-tools-extra )
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing/Support
-	llvm/utils/{lit,llvm-lit,unittest}
-)
-llvm.org_set_globals
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/clang
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	sys-devel/clang-common
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# create extra parent dir for CLANG_RESOURCE_DIR
-	mkdir -p x/y || die
-	cd x/y || die
-	llvm.org_src_unpack
-	mv clang-tools-extra clang/tools/extra || die
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=$(usex doc)
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
-		)
-		use doc && mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=ON
-			-DLLVM_ENABLE_SPHINX=ON
-			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-clang
-	multilib_is_native_abi && cmake-utils_src_make check-clang-tools
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1 "${llvm_version}")
-	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
-	elog "Some of them are vim integration scripts (with instructions inside)."
-	elog "The run-clang-tidy.py script requires the following additional package:"
-	elog "  dev-python/pyyaml"
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch b/sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch
deleted file mode 100644
index 67ae5a8e4dcf..000000000000
--- a/sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bfb5b0cb86cf90d9fa794f873644aa642b652c43 Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Thu, 12 Sep 2019 13:06:12 +0000
-Subject: [PATCH] [clang] [unittest] Import LLVMTestingSupport if necessary
-
-Add LLVMTestingSupport directory from LLVM_MAIN_SRC_DIR when building
-clang stand-alone and LLVMTestingSupport library is not present.  This
-is needed to fix stand-alone builds without clang-tools-extra.
-
-Differential Revision: https://reviews.llvm.org/D67452
-
-llvm-svn: 371733
----
- clang/unittests/CMakeLists.txt | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
-index 9a41000cf43..4c222e24599 100644
---- a/unittests/CMakeLists.txt
-+++ b/unittests/CMakeLists.txt
-@@ -1,6 +1,15 @@
- add_custom_target(ClangUnitTests)
- set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang tests")
- 
-+if(CLANG_BUILT_STANDALONE)
-+  # LLVMTestingSupport library is needed for some of the unittests.
-+  if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
-+      AND NOT TARGET LLVMTestingSupport)
-+    add_subdirectory(${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
-+      lib/Testing/Support)
-+  endif()
-+endif()
-+
- # add_clang_unittest(test_dirname file1.cpp file2.cpp)
- #
- # Will compile the list of files together and link against the clang
--- 
-2.23.0
-
diff --git a/sys-devel/clang/files/9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch b/sys-devel/clang/files/9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch
deleted file mode 100644
index cc397f7c078a..000000000000
--- a/sys-devel/clang/files/9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3398b3f937dd025c81d75a7322a6b7b2205ca8da Mon Sep 17 00:00:00 2001
-From: Serge Guelton <sguelton@redhat.com>
-Date: Thu, 19 Sep 2019 00:54:40 +0000
-Subject: [PATCH] Initialize all fields in ABIArgInfo.
-
-Due to usage of an uninitialized fields, we end up with
-a Conditional jump or move depends on uninitialised value
-
-Fixes https://bugs.llvm.org/show_bug.cgi?id=40547
-
-Commited on behalf of Martin Liska <mliska@suse.cz>
-
-llvm-svn: 372281
----
- clang/include/clang/CodeGen/CGFunctionInfo.h | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/clang/include/clang/CodeGen/CGFunctionInfo.h b/clang/include/clang/CodeGen/CGFunctionInfo.h
-index 1f81072e23d..5069d9af42a 100644
---- a/include/clang/CodeGen/CGFunctionInfo.h
-+++ b/include/clang/CodeGen/CGFunctionInfo.h
-@@ -109,14 +109,12 @@ private:
-     UnpaddedCoerceAndExpandType = T;
-   }
- 
--  ABIArgInfo(Kind K)
--      : TheKind(K), PaddingInReg(false), InReg(false) {
--  }
--
- public:
--  ABIArgInfo()
-+  ABIArgInfo(Kind K = Direct)
-       : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0),
--        TheKind(Direct), PaddingInReg(false), InReg(false) {}
-+        TheKind(K), PaddingInReg(false), InAllocaSRet(false),
-+        IndirectByVal(false), IndirectRealign(false), SRetAfterThis(false),
-+        InReg(false), CanBeFlattened(false), SignExt(false) {}
- 
-   static ABIArgInfo getDirect(llvm::Type *T = nullptr, unsigned Offset = 0,
-                               llvm::Type *Padding = nullptr,
--- 
-2.23.0
-
diff --git a/sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch b/sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
deleted file mode 100644
index 250302da8e4c..000000000000
--- a/sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f18d747107de3504ceac73abc1ec351fe8f58c95 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Mon, 30 Sep 2019 23:42:17 +0000
-Subject: [PATCH] Fix Driver/modules.cpp test to work when build directory name
- contains '.s'
-
-Reviewers: dyung, rsmith, hansw
-
-Subscribers: mati865, mgorny, cfe-commits
-
-Tags: #clang
-
-Differential Revision: https://reviews.llvm.org/D66176
-
-llvm-svn: 373275
----
- clang/test/Driver/modules.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clang/test/Driver/modules.cpp b/clang/test/Driver/modules.cpp
-index 7c549c1300f..4f4e3a41400 100644
---- a/test/Driver/modules.cpp
-+++ b/test/Driver/modules.cpp
-@@ -15,7 +15,7 @@
- // RUN: %clang -std=c++2a %t/module.pcm -S -o %t/module.pcm.o -v 2>&1 | FileCheck %s --check-prefix=CHECK-COMPILE
- //
- // CHECK-COMPILE: -cc1 {{.*}} {{-emit-obj|-S}}
--// CHECK-COMPILE-SAME: -o {{.*}}.{{pcm.o|s}}
-+// CHECK-COMPILE-SAME: -o {{.*}}module{{2*}}.pcm.o
- // CHECK-COMPILE-SAME: -x pcm
- // CHECK-COMPILE-SAME: {{.*}}.pcm
- 
--- 
-2.23.0
-
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 69431efc9120..316c18934bd4 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,4 +1,4 @@
-DIST crossdev-20191014.tar.xz 27240 BLAKE2B 06a76250490c333d03d0227e0505c4cf1125426bc51fddfe1c87700b289a150596318d60e1ba92d9a104a55e23edd9a603edd7887cdcecfe23f9e5c3a759b02a SHA512 82317f0db3f8e3ebe69e5d132d2f248795416f481161a67bf09cccbf82a95b79656a64c476c97c1e31e4dfac1bac6c89b159afae5f0516d08f320cab6cfdbbab
-EBUILD crossdev-20191014.ebuild 819 BLAKE2B 64591e74a4bdd47ad079dd6d743347b855ac80dc9e710e7bbaf2d4c8905e071073eb935e256822d56a63308c595f92b03ebcd76606ccbc511d78113d2ac37252 SHA512 1a429e0d583be04c2ceb922f34241b19e489c5b55263c4e5c7e95827120c54ba160ee3271ac1254f90029a303544b690dec107d776fec5226cb1241e9cd630f0
-EBUILD crossdev-99999999.ebuild 838 BLAKE2B 0929d14ddd6d81ae41c49bdc429340eba5290b72a8386b06e37b10606ea1d91378d305f34f91cb03ae9264187674c0a9c6182f91f6346b8eb4b74e94bafad2d3 SHA512 4b94f7887ce3d0320614df2a8c7019584ebc618633b265e190cbb9cc05d5aacfd988725e4d2d94417516f239f2c5612750a581f100900aa82108981f12c3a8e0
+DIST crossdev-20191222.tar.xz 27320 BLAKE2B 375e0ccb7bfd5c5c365b9c874a7dbf75207843b68dbe6d4cf9da07b36efb7b3bb1e6c84f85268fea6c71d6afc1e284f9bd1dcfeca5536d0947f8d3a3f5344ca9 SHA512 ad32f2231663f312b2b35bdea81c9ddac584d13f9affd496f36cbed072a97e6f80deb3436dcbea184621a4bd86bb25d52fb0434208226a3d743f0f664cd91fd0
+EBUILD crossdev-20191222.ebuild 841 BLAKE2B b2a8ecc38d94f3fc024114dbdf8614debadfbbfc59b4cf17698a659c6f9a4337579cf1b5b9babe695d1255ddc3230c97d46a12e8f15d9e8b0479b6bfd99958e5 SHA512 21736fc6b900ed7474810693d00c57226a0ff93cb2aa592e3a81de98b01415c243b8a82f0bc6d6c59d6013b4114e2349689facabec3355089b115370e36fefae
+EBUILD crossdev-99999999.ebuild 860 BLAKE2B c5b9a0fe2b7ac3bf31bfeabe620ef2d657378c6e6147dd70152a6d081809e5ad5e23ed29497b507fe6aa6647d46e77780609119b480f9ee3e4ef157184785ca4 SHA512 b805b5c73290d90d3a820847319cdc30be0032ee2e52a85e1526b07f22971c2e9031797780ca940fa0ae19485c466e1d8e3a124754f7184e9498bc6769c7ed01
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20191014.ebuild b/sys-devel/crossdev/crossdev-20191222.ebuild
index 3928150c1624..ca3d3ff234d2 100644
--- a/sys-devel/crossdev/crossdev-20191014.ebuild
+++ b/sys-devel/crossdev/crossdev-20191222.ebuild
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index e79d217e31f9..b9ef8900b80c 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 4282078ea4a5..6d0efe96c18f 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,15 +1,12 @@
 AUX distcc-3.0-xinetd.patch 558 BLAKE2B a381f2282c71f0eb28dc218cd57a2a914f02ffedad068c8cb7a510ae0cbf0a200de38e2bb31918ce5e10960359e1452365f36393c804984db1054410156e4b61 SHA512 1c0aa31606e1ce828ad52c9fff672d9e13a00494b8a3441095aca101d76f0f296308e359330a85745e2c60533eb1dcf82cea3feff2d0a3154b204d56735f0d14
 AUX distcc-3.2_rc1-socks5.patch 5462 BLAKE2B 5c18de909306bf0fa24690fae618c193396f5d27ef77cb9341bda69e3f8319f3b779c760af27cb19e9a6f88a46f02fe888d4bf4fbaef6419beae239964c4ee47 SHA512 707b6ad02bb7ff1507cfbfbb4cee673d5f0dc776006e9b7e801deabccf05c6057b33ea43c6a3ddd1756b8d07ff1d5e3087b635f15285195ba795b8679ebdc860
 AUX distcc-3.3.2-freedesktop.patch 4210 BLAKE2B 7c1500df8cd8568d68c51a3d14eb7240f16adabf9c664b3295171901f4781a9d7b9b9510e577ca0b85abaf21b9783dd9fa98f351089dc98f52f6182bb841c658 SHA512 7454df35d134dff9f5640f7a1a4241b99fe4c6051682af185657837f25cb870c27885ec9be74b5f01075801542decb54daf7db5d80fbdbecf5c8c721a6ee4e7c
-AUX distcc-3.3.2-noexist-crash.patch 732 BLAKE2B 36aa1175d9650ca4f7799e595346dd59d480b8ff478b286fcb93448e7cff1e64b1658869679687ebebdf39dc94fa183b3370fcddfc493ca4f858dd76289b24e0 SHA512 ff8369a7acc09ed366709000ed2fac726cc74d4bce29f9ed5b1dc40e683a250219e552d2caebde7d8a801cc40fb1a97086332a07fd4c295e688ef22f234c0116
 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.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
-DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138 SHA512 fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10
 DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135
-EBUILD distcc-3.3.2-r5.ebuild 5698 BLAKE2B 5b8292c329aae5fd986e9866ce34a5aef87667ebdee12279e3c4382067c9c7d3b0c1b84ceabbf585d9f3f889314c20cd637042f659ad382f56a41f3213711a59 SHA512 37e46b0085ced2f6fcdb80548f176aee90ba80e0c81226f88404c3ab70c15a7e1c3f9d5565d9bf503807baa60f53ad19e316979ad0cab162d5da7fb9e9295ae7
-EBUILD distcc-3.3.3.ebuild 5590 BLAKE2B 2cc7a9ea18360335ba84e422e8016d56ff5e5d602475c456480698e41e60e39f42386f4f9a540a4829b81cf24fb9ce9828f3edf6c2668096ac9216c71cccbb03 SHA512 e1b5b790a26bab5440369f293248f805fb5c701a0c49e24dd7593a8ef5a0a45e7c758ffda7e3046565926749405035c094ded117009853d319a3ed3afbabb53d
+EBUILD distcc-3.3.3.ebuild 5602 BLAKE2B 5c577e3e604e9d8491430bdf1f523e938e07d618151ebbfd952eb7110194b94e5352e9ff00dc47023d23e9c5f342a2d88fa94ecf1dde50b021e108a1b2a5d5aa SHA512 24b1003b5b511d84cd2ba1ae40076f14c3eede23d43f777ee8478de8a03158173d3e9293ed3bbc59375490f225e74c1a02d3bf43405e1952bc024ed77dacc20b
 MISC metadata.xml 606 BLAKE2B e6d738b3d7fed20430d4ae45738c9e4b2447a61a1a57735bf0fa8e1e177e1e0d027a71ebff71de9cbcc5d1d5800a31946002b1e36d73a8c31b2c097360a1dc64 SHA512 e196028491d2e4bcbb7390e220313a1ce4f5a41706a792775d31c66b3caf92bbb23680d26d3f41d285b2ba2f8b4dceb4e09760ac7ed0724eafdbc4b2ca8ecc6f
diff --git a/sys-devel/distcc/distcc-3.3.2-r5.ebuild b/sys-devel/distcc/distcc-3.3.2-r5.ebuild
deleted file mode 100644
index ebf2f5ab8472..000000000000
--- a/sys-devel/distcc/distcc-3.3.2-r5.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit autotools flag-o-matic python-single-r1 systemd \
-	toolchain-funcs user xdg-utils prefix
-
-DESCRIPTION="Distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
-
-RESTRICT="test"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/popt
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		x11-libs/gtk+:2
-		x11-libs/pango
-	)
-	gssapi? ( net-libs/libgssglue )
-	gtk? ( x11-libs/gtk+:2 )
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-"
-DEPEND="${CDEPEND}
-	sys-devel/autoconf-archive
-	sys-libs/binutils-libs
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!net-misc/pump
-	dev-util/shadowman
-	>=sys-devel/gcc-config-1.4.1
-	selinux? ( sec-policy/selinux-distcc )
-	xinetd? ( sys-apps/xinetd )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/distcc"
-
-pkg_setup() {
-	enewuser distcc 240 -1 -1 daemon
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-3.0-xinetd.patch"
-	# bug #255188
-	eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch"
-	# SOCKSv5 support needed for Portage, bug #537616
-	eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch"
-	# crash on missing directory
-	eapply "${FILESDIR}"/distcc-3.3.2-noexist-crash.patch
-	eapply_user
-
-	# Bugs #120001, #167844 and probably more. See patch for description.
-	use hardened && eapply "${FILESDIR}/distcc-hardened.patch"
-
-	sed -i \
-		-e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \
-		-e "s:@PYTHON@:${EPYTHON}:" \
-		pump.in || die "sed failed"
-
-	sed \
-		-e "s:@EPREFIX@:${EPREFIX:-/}:" \
-		-e "s:@libdir@:/usr/lib:" \
-		"${FILESDIR}/distcc-config" > "${T}/distcc-config" || die
-
-	hprefixify update-distcc-symlinks.py src/{serve,daemon}.c
-	python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--libdir=/usr/lib
-		$(use_enable ipv6 rfc2553)
-		$(use_with gtk)
-		$(use_with gnome)
-		$(use_with gssapi auth)
-		$(use_with zeroconf avahi)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	# override GZIP_BIN to stop it from compressing manpages
-	emake DESTDIR="${D}" GZIP_BIN=false install
-	python_optimize
-
-	newinitd "${FILESDIR}/distccd.initd" distccd
-	systemd_newunit "${FILESDIR}/distccd.service-1" distccd.service
-	systemd_install_serviced "${FILESDIR}/distccd.service.conf"
-
-	cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die
-	if use zeroconf; then
-		cat >> "${T}/distccd" <<-EOF || die
-
-		# Enable zeroconf support in distccd
-		DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf"
-		EOF
-
-		sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die
-	fi
-	doconfd "${T}/distccd"
-
-	newenvd - 02distcc <<-EOF || die
-	# This file is managed by distcc-config; use it to change these settings.
-	# DISTCC_LOG and DISTCC_DIR should not be set.
-	DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}"
-	DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}"
-	DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}"
-	DISTCC_TCP_CORK="${DISTCC_TCP_CORK}"
-	DISTCC_SSH="${DISTCC_SSH}"
-	UNCACHED_ERR_FD="${UNCACHED_ERR_FD}"
-	DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}"
-	DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}"
-	EOF
-
-	keepdir /usr/lib/distcc
-
-	dobin "${T}/distcc-config"
-
-	if use gnome || use gtk; then
-		einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui"
-		einfo "This is to have a little sensability in naming schemes between distccmon programs"
-		mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die
-		dosym distccmon-gui /usr/bin/distccmon-gnome
-	fi
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins "doc/example/xinetd" distcc
-	fi
-
-	insinto /usr/share/shadowman/tools
-	newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin"
-	newins - distccd <<<"${EPREFIX}/usr/lib/distcc"
-
-	rm -r "${ED}/etc/default" || die
-	rm "${ED}/etc/distcc/clients.allow" || die
-	rm "${ED}/etc/distcc/commands.allow.sh" || die
-}
-
-pkg_postinst() {
-	# remove the old paths when switching from libXX to lib
-	if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \
-			-d ${EROOT%/}/usr/$(get_libdir)/distcc ]]; then
-		rm -r -f "${EROOT%/}/usr/$(get_libdir)/distcc" || die
-	fi
-
-	if [[ ${ROOT} == / ]]; then
-		eselect compiler-shadow update distcc
-		eselect compiler-shadow update distccd
-	fi
-
-	use gnome && xdg_desktop_database_update
-
-	elog
-	elog "Tips on using distcc with Gentoo can be found at"
-	elog "https://wiki.gentoo.org/wiki/Distcc"
-	elog
-	elog "distcc-pump is known to cause breakage with multiple packages."
-	elog "Do NOT enable it globally."
-	elog
-	elog "To use the distccmon programs with Gentoo you should use this command:"
-	elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5"
-
-	if use gnome || use gtk; then
-		elog "Or:"
-		elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome"
-	fi
-
-	elog
-	elog "***SECURITY NOTICE***"
-	elog "Since distcc-3.3, whitelist is used for what distccd could execute. The whilelist"
-	elog "has been generated by compiler-shadow distccd.  To revert to the old behavior, "
-	elog "you need to pass --make-me-a-botnet to distccd in /etc/conf.d/distccd."
-	elog "Cf. https://github.com/distcc/distcc/pull/243."
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
-		eselect compiler-shadow remove distcc
-	fi
-}
-
-pkg_postrm() {
-	use gnome && xdg_desktop_database_update
-}
diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild b/sys-devel/distcc/distcc-3.3.3.ebuild
index a9e338051520..bb6a39b7e51b 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools flag-o-matic python-single-r1 systemd \
 	toolchain-funcs user xdg-utils prefix
 
 DESCRIPTION="Distribute compilation of C code across several machines on a network"
-HOMEPAGE="http://distcc.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/distcc/distcc"
+SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch b/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch
deleted file mode 100644
index 7f378082d99e..000000000000
--- a/sys-devel/distcc/files/distcc-3.3.2-noexist-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 24f73c5cd8f839bd520eb52e91d0d26e07689373 Mon Sep 17 00:00:00 2001
-From: Shawn Landden <shawn@git.icu>
-Date: Wed, 29 Aug 2018 04:52:38 -0700
-Subject: [PATCH] fix #304
-
----
- src/daemon.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon.c b/src/daemon.c
-index 5765982..c8fee7c 100644
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -166,7 +166,7 @@ static void dcc_warn_masquerade_whitelist(void) {
-         rs_log_crit(LIBDIR "/distcc not found. %s", warn);
-         dcc_exit(EXIT_COMPILER_MISSING);
-     }
--    if (!readdir(e) && !readdir(d)) {
-+    if ((!e || !readdir(e)) && (!d || !readdir(d))) {
-         rs_log_crit(LIBDIR "/distcc empty. %s", warn);
-         dcc_exit(EXIT_COMPILER_MISSING);
-     }
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 2f70d857bdce..65fa3dc1a9de 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,4 +1,6 @@
 DIST gcc-config-2.1.tar.xz 15520 BLAKE2B 0e37762877116d90265a31cf6d9bc99da9b358afc26c0f7cb6fdbbb44dce23ebf59a1d5c2e481d456c03fbcc383efb7a56559af0bbd1f2bd78f407a853c88369 SHA512 0b19cb758a1e8c5e2e1f7901799fa1eb598d9d5c8d89ceace2e294ec569bfa90978bef72f52b9c2a3455f2ffd21be0899fb3e23b5fbdf62b70e978c153961272
+DIST gcc-config-2.2.tar.xz 15956 BLAKE2B c83c1e2584c42d5e6317e044fc6681f5006d9158ecb8d7127383a773e0b51fc2388aab9462088c087a877d77f8ee0631eb00b48b4ef13125af2bbb3871ea2582 SHA512 501d870488ebbeab2e704cab046b6432379c0dcf430fa24737fc97d9a0aa635e25fd4f7c0b7983f349ffd4c378b1971e4c8c82dc524b4916415985a6e0e7480b
 EBUILD gcc-config-2.1.ebuild 1186 BLAKE2B 3905cecbc57750da47ac4358cd367c513d84baf69e6470c08c5ecc641c69671d6d5a84c4c7c5ea81b273dc5f208c75bac25a6f61641cdb620f164c5bd51a3f37 SHA512 2866e4c3dc8a4ada5ce0fac596271281a31355ea16e1e54428e6062257dce5c655c258853fce7b8470405923ff6b711faec945baf707774cf7c23b66463f22fe
+EBUILD gcc-config-2.2.ebuild 1199 BLAKE2B 907baa9a57b1691667ef09b8721bf9d53e84849b58ffd5a4e512067cd36f253d25e795397b636596b7efe2e4f7eb83938be9f81f31dd4b078070c01babf0ba00 SHA512 05e5d6053e8fc02d879dd882fa23c0fde1e0e6b0488ff640a443842fcda20f0633548bb245f7246502c0391669a0fd8be055a6126b4e24800a727049410ed1ec
 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.2.ebuild b/sys-devel/gcc-config/gcc-config-2.2.ebuild
new file mode 100644
index 000000000000..14719662eb89
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-2.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
+	inherit git-r3
+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="Utility to manage compilers"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/gentoo-functions-0.10"
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)" \
+		install
+}
+
+pkg_postinst() {
+	# Scrub eselect-compiler remains
+	rm -f "${ROOT}"/etc/env.d/05compiler &
+
+	# We not longer use the /usr/include/g++-v3 hacks, as
+	# it is not needed ...
+	rm -f "${ROOT}"/usr/include/g++{,-v3} &
+
+	# Do we have a valid multi ver setup ?
+	local x
+	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		gcc-config ${x}
+	done
+
+	wait
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 21eee229e0e3..806def1af403 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -67,8 +67,6 @@ DIST gcc-5.5.0-uclibc-patches-1.0.tar.bz2 3518 BLAKE2B b528d79d41de1099f3540c168
 DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1
 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.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8 SHA512 4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345
-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
@@ -77,8 +75,10 @@ DIST gcc-8.3.0-patches-1.1.tar.bz2 14430 BLAKE2B c702fbdb18c3c952cdb9adead3a193c
 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.2.0-patches-3.tar.bz2 15452 BLAKE2B 8ebd8beef1a7d3b0e0e544a0967599e9a06662092e9f4626e071051c3dbbbfd9b74fcc1bcec6405960a50133d741906f77cbf2058fba140b5cd35f632e999a92 SHA512 ea1a400d6285c545d28b00258d8ed67f7deb3211c28db32e2c9a427c166481d80a36d0b2b89c532e84aea76ed705cdfddc51ccb2817cef7928398c092937a9ad
+DIST gcc-9.2.0-patches-4.tar.bz2 21655 BLAKE2B 2acf6d83ec934a65e77d2079a024b42622e1234f0516f12839f7d03c2f3e1bb275037b020e35ba847d6809d5577ba966619c78345b75355df0a754d02ccf9819 SHA512 114e01a7b08ecb1feab24ef3cfc72c8953748f1526722b80c18602025eef132e2b4c05db59c7a23eb2e7f42ed48eb02d92bcd73b1ca932374d6bedaf89cc66d0
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
+EBUILD gcc-10.0.0_pre9999.ebuild 1321 BLAKE2B d3e8622606d13eda7ccf0b0fe6addd07a47d6aa83f3de47bb598b4ca638511f2262c27db35e6ba9c2198fa3567e949e2998c88c7e30ace96c3fb0af2062d478e SHA512 e7066fa8a304141b52d0362dd8b2c7293eb93412e4170a6bbea5774bcc12d15bd57d9c17d5eef3052ac6a7ddad9e3d128b241f3b7a2825fcbf1a60f08684862c
 EBUILD gcc-3.3.6-r5.ebuild 1242 BLAKE2B 9c316577e76d305f8eac6ba33ca97c26c207cade4da2f0d37c33be02fac6f9faa0eb487ddf9f68fb6db2cd128d6dabc3355eaef62c6775626af56eb96ba2f5b0 SHA512 3d11094be8ea52010d5128941db2dd23fae8e80460f2f03b03ee9111e5a32e3f6dfdf214d257de59de8cc02bdab9cdb563252a5b1a19ccb577d1e7ad8156cb81
 EBUILD gcc-3.4.6-r5.ebuild 1366 BLAKE2B 8049232e639cd5fd334a093b955969b8ee90361ab72cff7a457f332331fb1c336c70e2d5dcc58b6bf65a478b2a383a14297e86e1cbdba814c2f2a9dc509c943d SHA512 db12f820946cc3adf257a091631396c117969469d168bf281cf1eb55f262ef963dbf490dd90bd2160f86715d6ab0e52ea76f43e98f4194671e3519a8fe38dc7e
 EBUILD gcc-4.0.4-r3.ebuild 242 BLAKE2B 269e476876f1ee62e288c7a3ee14a2261698bd12be875cd6bde54cb6d048bbcff11a82fec5b46d740fc4c607deed8cc6e1452cfcd4e5fa32b8a11708b86fca20 SHA512 8bb91642a9f12b48ac79011885bf416afdc501f080459b02a32efd2577ead6d6076f2a6637024eeb2364889de1a45191c0b3e47e7038871287b073072b420015
@@ -93,10 +93,10 @@ EBUILD gcc-4.8.5-r3.ebuild 1389 BLAKE2B 37df6ef3df83f2e01b5bb925dd9c5a2325b8901f
 EBUILD gcc-4.9.4-r1.ebuild 1448 BLAKE2B dc46a837d0c7cbf779acb42d2f594c24e31784ee3e2de2f19f105bf06afd8a1c6dea7b1b741b402c9c59f717be9c6f9311664b916a50241a009954ce5fcf621e SHA512 aa8de516f9b193eb83532761d7cc37611e70bc4e9bdc007e88935933db8ee10ef1eb1b464d79169754f98f8ae50586ac6e209dd91b7372b561fd35e39ba2d519
 EBUILD gcc-5.5.0.ebuild 1263 BLAKE2B b3b1d3b078f1ea9d1ddd25ff5af34b2de4ddbb9bedb15ee986ec09b5ae8182cf3ce4b4ef98e735d4585716a48e3dcb0341703a082fea3d17affa444f01363eca SHA512 74e4006d54a9a17f5d734b597169d2c5e9b84a1b07fb964507662e9432e2660f829abeb2b43f639d993f42333e88184aab41683f11952fcb000bc0e95d934a97
 EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B 628463c07685e8552a8c1648e482b5cacb6e06bb0e2270d3dac66f7dbedb05354ba5c7fb3d3300ca72db0f4979da75bf22e897299a6904707695d0563a1b5c4b SHA512 5605e214d01b3d267e70ed84e4fdb0766185fc8f08cce72f499b39d0ae04e1b4c0ecee5f58e03df9d3d46f25ec1bb558394df1db7290ac9b97a09d712ff80cd8
-EBUILD gcc-7.3.0-r6.ebuild 462 BLAKE2B 26d0de6704967597198c75b3dbb1d92463fab1bff82c3d6843d2403f0b78e53ddc37f80db036f8acc24a8363dec731597188e8f7a1254cf9903aa095dc5eb576 SHA512 7966184346741c9932588b3495fc8d0f2c0e8d4876ef3f089d0b58b8511423934243d7fa2737be978ed1fea62d0bed5f3b46c4b5b98dcb161e0ca55477940898
 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.3.0-r1.ebuild 587 BLAKE2B 715429395b96a959d8ebd2a6ca0ca830bc8178b7865996951d081cfa7ff3deb309d40e8930221f726d1114557e8053874a849e23f39896c3bd448271a8b4b633 SHA512 3a7e946786d04176c6bb90ba5232e53a725502fbb1ac1a91465a10c3b52e17c0b72ef8bc35bdbc6162c4724e45758c4768092b5632f69d7ef773b05a30508e34
 EBUILD gcc-8.3.0-r3.ebuild 545 BLAKE2B cca196e019ec3ee7ba29e90e0fd9f446c6b8b53fbfa287515645a53ada5a17d7a59cf7ef742a5c3593f6300afb8f1d3743e6d6f56ceee5c30194faba2c90088f SHA512 bb5448afa3dfc6eeec9329081ce83f82a1e919bc2a964134dadd285021d4f6dd100261bfcfa1875179bc66a42bb2ddd14141bf06911747256b11fb4989da050f
 EBUILD gcc-9.2.0-r2.ebuild 445 BLAKE2B a467d04330b8c9f87b6673ee0cdcf0300de4447a0a04ed26b884d191f3f53d6c5844796b0f7f6d15b34fe6ee6946dde1a85214eb809d984be24e346a608342ed SHA512 3e0009a394555c2d4bb29aebd8b6e65c03c61468f6b199f0c3f37063dd47ab0333b63e9676a2162e452a51fffa090f471916195433569a36fc30d02332cede13
+EBUILD gcc-9.2.0-r3.ebuild 456 BLAKE2B 4c5bbafcba69f65751ab73ec7e6dd7bf6b3ba1a35964c5c2bf00fa92e921ae8b4c398f8da805cf558aa160f65e3828d5d9961e9537ffd70b64be36807a648708 SHA512 335f35dc3125660c52a241df199883cc635d8f9cfc3a9122c6a379ea4aedde08b6202709b4942e23b7e839053976db55751b3ac2b1909a92a3b0766f1aa9c992
 MISC metadata.xml 2903 BLAKE2B 1dab10dda72341050bf32178c4d55b8199a0ddabfb6001b8da5c3286e9389eef6bf3d88309bf9273221fdfd65b102d824aa2ce702437c523a10a32ff8bfb7deb SHA512 c4e79dbbc7c76df4875ef287ee7aa916f65868743a7803e00836cb61bec0c1df2bb18974dec591075c3f78cd872b828218df7c7ded8455290df03a253df0320b
diff --git a/sys-devel/gcc/gcc-10.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-10.0.0_pre9999.ebuild
new file mode 100644
index 000000000000..b0210fa880a8
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.0.0_pre9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_GCC_VER="9.2.0" # reuse subset of patches for latest for live ebuilds gcc
+PATCH_VER="4"
+
+inherit toolchain
+
+# Don't keyword live ebuilds
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+# No gcc-10 branch yet
+EGIT_BRANCH=master
+
+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() {
+	local p ignore_patches=(
+		04_all_default-ssp-fix.patch # needs a port
+		11_all_extra-options.patch # needs a port
+		15_all_disable-systemtap-switch.patch # needs a port
+
+		25_all_ia64-bootstrap.patch # upstreamed
+		27_all_sparc-PIC-constant-PR91472.patch # upstreamed
+		28_all_sparc-fpu-subregs-91269.patch # upstreamed
+		29_all_mips_split_move-SEGV.patch # upstreamed
+		30_all_arm64-march-native.patch # upstreamed
+		31_all_openmp-for-SEGV.patch # upstreamed
+		32_all_sparc-PIC-constant-part2.patch # upstreamed
+		33_all_extend-lifetime.patch # upstreamed
+	)
+	for p in "${ignore_patches[@]}"; do
+		rm "${WORKDIR}"/patch/"${p}" || die "failed to delete '${p}'"
+	done
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-7.3.0-r6.ebuild b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
index 89324cc3e678..107ecc45981b 100644
--- a/sys-devel/gcc/gcc-7.3.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
@@ -3,11 +3,11 @@
 
 EAPI="7"
 
-PATCH_VER="1.8"
+PATCH_VER="4"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos"
+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 237b5a9272c6..0accf8cc1285 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 6876 BLAKE2B a06f6afec25b137d7e0e2a37d18f1e1b8af9230a15806d6f4308777f0503a70e1da8ed0b9f658208b4143f3e3e2c443675b59b0776a19d29486cb4e7fcb4374c SHA512 0b0a5fe28e3c97c4c5dbdb487497a22d0fc05c3a7c23d4026017e8ce15d4cd9e73a460ea37eb6f82a1ab83301e920bba056cad0351d92b78326aa80e5a019cc8
-EBUILD gdb-8.3.ebuild 6631 BLAKE2B f7962f1cd162c549a76afb1b9fe4a27473b968dd24d9d110a003f664a17e516b22eb45ea6471185da55792637135d949cc44f3cf0013d41596cea919a7ecbfda SHA512 8024da206c4aa1babfc89e1d7a1ab2091ab09a7c10734937eec6a23a9157f6275bad9899ae926b5c22fc1c210513fd637afe08c8438d4d91325eacf3784dc80f
-EBUILD gdb-9999.ebuild 6885 BLAKE2B 760158a1cfaa6535c447002ef1f6f4f42eb9596e9879b21e89794c0cd8a3dc2e212582bf244abd2ee97dc07926985ad05735a375ad354120d7f2bf39073b84e6 SHA512 578b63fdc04611abc3687c6dcb1babf59c9fe5e52374bf5f48fb57c711564dec9b6827d57dace88b610dd032b4713589804daa0b1bf559b7cba2f6c9d0e86894
+EBUILD gdb-8.3.1.ebuild 6871 BLAKE2B f07683f851403890ac038d2040c3851762500e5d3e2293488871be3dd7d30a4c9ee5ae0f34b35813d491ed7bb8005f7666018c04e927782f548286480c8994e4 SHA512 ae82e3b38d2703d258b361d07881c28526551d7308fd93387fd67609844481c5ec6f8814777f708f6676b0396fa8abfd36a8a92461e1f2cbf67bda93ac9c556d
+EBUILD gdb-8.3.ebuild 6627 BLAKE2B 77d4fc3f1e46ddb9b6790596697820f52b13e83d892bf9d0c9923bf6188b69c7da04ec98e7ac9de7da04d348749f9af21efe8ab8db2eee2105ec439bd34e5d35 SHA512 6e577aecb2b120a3b16c3f6f7e1d9142872bb66f8207eb631cacae49b6fbe93a8cdac1344c8f60f5a5f9b55bea579a2b8641eee1be32f4a9266ddb7eb23d02dd
+EBUILD gdb-9999.ebuild 6881 BLAKE2B aeb4c36ab3ffcf6886320871080f1aea29d43a9c32e2ae35195d4e9c9a25a946be9d7ac21c23e86afd6b187ad75b8803c0321ca8cb1744d5d4db136dc2ad58e3 SHA512 2f1349caa82db7add8e69bda139780fa07c33039d697218738fae2cf1968827e1444b9d4fbed80701d995092de7054a53b8fa7e44246e4b8868f2f19bfbb55ba
 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 fa97a322dce4..a818c73f4771 100644
--- a/sys-devel/gdb/gdb-8.3.1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
@@ -46,7 +46,7 @@ SRC_URI="${SRC_URI}
 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"
+	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="
diff --git a/sys-devel/gdb/gdb-8.3.ebuild b/sys-devel/gdb/gdb-8.3.ebuild
index 1d67160a80fa..7a0a6a6c29c5 100644
--- a/sys-devel/gdb/gdb-8.3.ebuild
+++ b/sys-devel/gdb/gdb-8.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 635cd50b6fb2..9fc57491538d 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 4f0b6dd3d6f0..d282e694d23d 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -5,5 +5,5 @@ AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f298
 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
 EBUILD gettext-0.19.8.1.ebuild 3943 BLAKE2B a47b7da091c324ba47f8311b637f4d8e5b011240ce096b904d7e98523a86f80510efd85e6cd03b2b427af4a99d28710edcb1cbd76f90302c831630438912da19 SHA512 d7a1e4971a092f428a0b4f92f13f3e30a52030af45ade53161c99cad8b8217ab49e96ddd027b6ee6d68935c39787f1fc8d9969116fdc64973526d5c22fd79a79
-EBUILD gettext-0.20.1.ebuild 4080 BLAKE2B 051fea9d6833fdd5cdb1eefd7686bdfc41496aaf5a1f8352400f9ea89d764c58b513232c38244e067cf891f633cedf0ae6cdefacd9e4ced82edbeb3ba28323a8 SHA512 5cddaf83dd49aea9307f57da10dfddeaf1b23097157a66724649d1d445afcd3a71bc6563228f094d5b463f2e37642656a9a02f3517996d121d72197a51692add
+EBUILD gettext-0.20.1.ebuild 4058 BLAKE2B 84e900b96ff417adecce980692b895cb90ebbd45c5d0345d62de6b93b2724096f4993103adbbfd44c887718fdd68cffcdc13f1a50a0dc9f67b5a6942f1dd84f7 SHA512 2796e19acb81cb2b5b9f11e3818aaddc796f32e10be3ced3ccaae4a4d58f57a4464d08fd98d1f9414298abd0f2db5afa5d20c5e8186abd7d8d5fe2b9e7e7a289
 MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507
diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild
index 7de043924130..08e7bc3f61f3 100644
--- a/sys-devel/gettext/gettext-0.20.1.ebuild
+++ b/sys-devel/gettext/gettext-0.20.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: Keep version bumps in sync with dev-libs/libintl.
 
 EAPI=7
 
-inherit epunt-cxx mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit mono-env libtool java-pkg-opt-2 multilib-minimal
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="https://www.gnu.org/software/gettext/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 # 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"
+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
@@ -70,7 +70,6 @@ src_prepare() {
 
 	default
 
-	epunt_cxx
 	elibtoolize
 }
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 3250878e4e55..f057ae87fd8a 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,20 +1,19 @@
 AUX libtool-2.2.10-eprefix.patch 462 BLAKE2B d219aac1c2b68926a6c3c83bc85b51fe5e69cbbf76e3af096b024d649180f9cc4a025ceae14ada4ddb2b8836f669318a700b59811a4b44c91db82098099565bc SHA512 c9657a2726d0750241558337af57ac7d55afa4e74ac5eef411261394cbf7070b52876074367390ed5a2bbc09d9286ba200133ec6afd88a5fe5af08b8db04e189
-AUX libtool-2.2.6a-darwin-module-bundle.patch 1202 BLAKE2B dfc1de3f09ceb164f757700e12c514ab5846a1bac8eb55b63fd27a24118ebcae36a9f7619eed3d63e02a2d5aff23efd1252975822fa136f5fd860b1172283152 SHA512 aca1cfbab9b1c9508f7fac85b346865106ce1f63d69095cd5b13e02f8d3605f04cd1142e077f19e4f6f8174cb9a9f39823061e494dfafc4fe4589c4e11120353
-AUX libtool-2.4.3-use-linux-version-in-fbsd.patch 1124 BLAKE2B 69aad533a01e88a87ea73eade9e9c510ad2e72f0601839ff3872d7df854c186642f0a1ec0c0fc103369885588a6758f3050aca25cf577076ea512e5897d0a602 SHA512 6134fb39cf0e115a91cf69de175c9a088d405684139f8ba3dcf77f2c039e5f4603e2b70652f27bb59773aacb562560c1bcdbf439de1564bd19095d524b0ee5c7
-AUX libtool-2.4.6-darwin-use-linux-version.patch 493 BLAKE2B 39c0b2e630fec412a3dbb31ab93ba1686496c7f0939f1f737e0ca929aded9c3f0b1b47102cdebccced9f7ac6107c02f10d772df9802152da03eae5c4fdefd97e SHA512 5cce0c85a59fef8c3c605e72f3f4a8a16c0ee2da464643c67fcf675fedfcb227866938fb98b1379506616b4141cca5b29175d976402510987053bade4fc482f9
+AUX libtool-2.2.6a-darwin-module-bundle.patch 1184 BLAKE2B 29fcb8ab11e2960fbf233dbf7776a334e7c399ef16dca4248eb8b5fe70505602f13c052b53a4ee10b03a19cbc4bef40d586441dc1e07b952bc8055a9b6359618 SHA512 7fe59a0f4c452fa3a619539d426f7b2dccc9eb740eb2121c36d568f9c7dff31139386bf698412de489d169fba77d723f99f05632e4bce8999facc5ccc33c1df3
+AUX libtool-2.4.3-use-linux-version-in-fbsd.patch 1108 BLAKE2B da9673ca8234cf35d3b5358d53ab3701bb453b2e827d955d0c2336bf0ae476474eb253354d1282adba134abd896dd7ca44c1cf831d5b95393f72e904ebf4d03f SHA512 ae21b7b7315ff50451d087fc87feaf949ff9094c236657b7a9b6aa381e998fa131930dcb55c099f1da8285ae5e471a2d981c78727cada931d55209c0797be65d
+AUX libtool-2.4.6-darwin-use-linux-version.patch 469 BLAKE2B 00abc1635036d1a1cdb4b1ce7ffd8a0f52f6eb0ce3f87babe6fc3468f9f990a8c2bb09bab416ee33ab77554732d86ce0a8deaf4cf83db048dd651adf4e3e59d7 SHA512 910fb30f49779f855faebfa4cdbb1a454d5cc711d366e76e16dc1f45855f518ea80027fa5f2515c8eb80dd7dfe06368c81498ba08dbb00b49982eaa851a3d53b
 AUX libtool-2.4.6-libtoolize-delay-help.patch 1591 BLAKE2B 0a2eef74ef726d71e425c5aa7d82018bf596db66baa5ea1e02db758d5bf74ade52edc482b1c4b62e7e986be20e73ae869818905954b0688c682fbad2ac1726f5 SHA512 19c160cc706081d63b65d6580fd8cb4d01e6a5e45652dd3c4fd83e71df5b765c355e861e257ab37489c2d4c78b4aa14bc94ad9718c91c90b467e4604f484b9c3
 AUX libtool-2.4.6-libtoolize-slow.patch 4659 BLAKE2B 79abc560d5e0654457a8ba26e0777bd91b4e15ad0b33e689709d31d12b6b28bed54285d3688d04a45bae4bb9c6c6d99862219335ab7cd2f7a3cdb5f237fc3f21 SHA512 a98333983a493b27f4188b83d75548abc63c1d50720a8720d47a1f88f231331de078a78440f0f0569e6aeb646b14f16db26a7eefd20fdac6fc7321b9428ddbfd
-AUX libtool-2.4.6-link-fsanitize.patch 2364 BLAKE2B 97cbf349945c315000d694f5f156835078f079998d568ebfdd1a9a664300fcbcc1a785e34cec535ffa3ac4c902cc5095517f4f0b0b8575cd66d2dbd47251bc1c SHA512 567487334e4084b94f0431561213ac520a7871a0acb904b019204e728b750a8ab8155b88f0b5a90cefdd5f524130f9f3f9f0de34d8d9a2bd821bb8be6266cf69
-AUX libtool-2.4.6-link-fuse-ld.patch 2365 BLAKE2B 806e47a27b0c73bcf67d1d1cf00412eb0114cb71955bf3248eb9529b3c73a5730bcb4c0887e441cd72ec6c8111ade8e72d765b6e5d9586e643d37a8e155f6809 SHA512 273f9bef6dffc50f9773a8a91101d13ed2a13c72e077c4620f1e3da37b27271acb005fdcde7bcd9acc7cfcb1ee71ec2cb3eba3c9fcf262eb141e12f43fd06b6e
-AUX libtool-2.4.6-link-specs.patch 2438 BLAKE2B 99dcefe58ea905e89d7169b926ed9d9f186c5603c84f262a1feff3a926a26aa839d205e47dacbfa87cadd118d8940ac58d60fba4a9ed19e019dfb838d1094c42 SHA512 349675e58a82227930859d7ced1f7bafc7b05f3d4d902e4bfec3f4f1337c7a724ff7d8f509da4212c74c6f4c07b7f3604a6c28070ca5091543a8c4616e0263c9
-AUX libtool-2.4.6-mint.patch 1672 BLAKE2B 0a7eee18610dd1126d058360f8fdadb190c6f3cb37c3c4bfc17617a06330fab5ad6f6dea7a027777d112ac19ea06586e42d907a0e8bb2a6f929188ffb34bc75a SHA512 a022703b39596ca5aafd27f463aee403c2d4565d3283c0ea20c259996c3d32056096536bbec079e3ed08b03618f9d5e46c0684db08c90477fe31e4219596e22b
+AUX libtool-2.4.6-link-fsanitize.patch 2046 BLAKE2B ba7a04b03290d4f0ac4dfe9397625f250622ba801be1246ee6a1f6aaccdbc04f35376b32fff59cc1b0401ecee45151bab4f72b68076f58410529aab971734032 SHA512 9469987b93e9335d5baa2085e47b3e16cd95b456abbd5e81de33be0330094a3ed378ea8c945dda35aa4e84c59726e998414cb7e7e83eef1fbb354e3d124dc062
+AUX libtool-2.4.6-link-fuse-ld.patch 2047 BLAKE2B 32743aecff31e1db75d16e76b8743717b5b9f4ba7602bd1435595f42e60a5c2ad1837673dd7e4bfa72e5b69c33a43f1ca1687614fc2f4315dbbe649c755a8a0e SHA512 96a05d314d764adcc45db5b23006c4a3199ff6a41448db50abcf05f959c6a2a6c8fd88d7d1daa4ee7ebb854cbe58959db4609d68dce257569e65ac49597edf4c
+AUX libtool-2.4.6-link-specs.patch 2119 BLAKE2B 9ad6203dd06b32ea5bff40731ea97855015f351a34a51320802933c2364e04b9de0c49403ece0a6b7c180d80bd17c5ce1d54615cb18db64aa5eb6fa08e195bbc SHA512 89eebfbfd1a32daf2cbedc61f358dce20e19608ea2d882e6ab2eb06c39671bde4ce88de8a2023783deddc414dd2b3cab78d60fa15ea6d5917cc06476295b058a
+AUX libtool-2.4.6-mint.patch 1158 BLAKE2B aef4853bd00a459c939c1afbaf5ab70da22dc206a75addb8a5c60fc3537037b976f5e83db173242aff114c944b18a6d2712a80ae7fef1903a46b7ef06ff64b8f SHA512 78f75c3c54039816c2fef4cde7edd53d719f356b048d343bd71e35eaef0bcf34ad195a9cc04ee04f4240a9b2a95a2d9757a3f2045a786ce9428b236c9679b6ee
 AUX libtool-2.4.6-ppc64le.patch 3672 BLAKE2B 1c1f068f0f1ab8b8180a98412e6a3bb1e4cc84c3e9c8894b4a0a2f8e110ea7ce198fc02d07ba2f18023cf38696d8cfd46e9fae979d5ab30ace2c82b020493f34 SHA512 e9dc9fad5eebabcc65506dddabf3a917c73237485f2ad24765a20437404f654a8c04411755381c7c5d90c2ae13cabd5d89f9ad15839e2e1b9d43300d57adf178
 AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b2019cb63b4901b6de68f5efcfe9d42dbaafd7c40ea03f1b247cea8718ef92a51c1bd0ce429ec49665f05a61e26d25fa SHA512 037cf598c644d167de5fef9f4ecee6ccd573d2516f2f777eeaad94135ff05dd0775191d3e21cca397bb664bc0449a5db0b9ef0bbaa16e178762be9769c13c31e
-AUX libtool-2.4.6-pthread_bootstrapped.patch 556 BLAKE2B a381e0a8d8c585f6f79cd2f15d473f4cd46dec0cf28657a4fa695efaad4bbfc963cc71fc5d8a4681a7a9f3e789b41c6e281329dae3117df2ec4c14a2cf5ca051 SHA512 22d7ba329f7e4c6a9b157f460e2076f1a08cd8f16fc68572c3f07b9ee10f8249855b2d7044be33710ce5ef1fecca3db351dd587001940cb834f9351f901df7fb
-AUX libtool-2.4.6-sed-quote-speedup.patch 8262 BLAKE2B c9194732921aa28713c9e0019d5e9de7e1ad2d6a18059c0f7681b0d683bdf460bb8257381269e8193ead866f26af000a6bddfc7c56410f7fde94fbf32bdbe8af SHA512 d4a1ab01e1d6f3b05221bded3fc7c8204e686b1ac11dc00267a7a75a6759adfa8ac3d7041dc5710084031c7fe47f2deb88bc9c23e3502a944a97244942529927
+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 2564 BLAKE2B 3eaae24785c03a7ad35a5e6ab7d06b5ab553b9fa1e3065aa8b4b8f75b98f76e0449d55f778e9b56a73e988014af2c0c0e9af9dbe7a47efc54ef4cd5d7181858a SHA512 eeba50e6d2bfdf056ba88fda462e8658acd7373d4cb2902470aa57356aad91294ab60b70db4a834de51b6b4346cf7929a3246939af7ce9e4efcbe6324ba87caa
-EBUILD libtool-2.4.6-r4.ebuild 3524 BLAKE2B 9d29818985a5bf3bf92af0ed0503640ad6d365bdd112b1fecd789e036f4faf99f1abc9a056070b11638bfddbb0126a10b49c11437ec709e0d174e12f10cd8f5a SHA512 c0637d6ccd622500d9cefcec5410fcfda4d35ed55dc55ea5aeefb7036b8b9dbec20b790ee726c72a2efa3ec246c72f4d64dc43ad69a59efaf0ab22268f5a71c0
-EBUILD libtool-2.4.6-r5.ebuild 3664 BLAKE2B 0d7071dfde38723d1fb76b8b80d742b542ac43abd0326c7a3de348cff3c254ffdb03fc6d1882c6920b2387985eb33652c718cc22e3e8283e715e352483054f48 SHA512 f93d15624ad853809c4c1c8ad4bbd15faf5b33b34ffcb1bf52d745c12286e4430e9bc9aa0a326919971af273f59eb1198b4200afb2ee16efd909247ea97d99b3
-EBUILD libtool-9999.ebuild 3316 BLAKE2B be8a8c44f454a714c8c13d6e7cb5c57ed8cf8306aa5065c8c6afc99b68196bc4242692b342d82695bd23ac817d44825b2e97378b12731334d7b30527988d06b0 SHA512 e5fa949c085dbe2af282e468c58511fc32d5a0f6982002ce2807dd0687a4e5015bf3ec5db199cea84f93c3f8368dfce152d6e036e6f642c701fc0cee63c36fb5
+EBUILD libtool-2.4.6-r6.ebuild 3594 BLAKE2B 61f9bebebbd6d4da7116a3a8ae175f0197c83ababa60286d4b5b2748e89edd8dda5d6295de6bb4aa1b9a68712dd421f00109bd89c01d572f45725e84a166f3ab SHA512 a6823a9f68b14b91ddef2e3e300697dbadc10eba591f56e94d7f55ce8f28f8adbd5e925a7cfb365b1733e2fcc35849ed2f9e009804eb775e41e8ae399c8f5fef
+EBUILD libtool-9999.ebuild 3236 BLAKE2B 2f47c0b3326d3f88b70591d3b23c5c8eeecb2b974e04b8ee08528e28fa83f9b3cae0ace76b94d53b21309f45003b5b730c21636e1a8ced3db8b2db183a7b6e1f SHA512 eb064c77276e9c912c667ef075779c5a0423270ba6cf0b11e39fccb4dadea7910d18437e12b72604b6c82ee0238a667f6e81842eab0dc0734d26a44519f2572b
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch b/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch
index c6b63ed32766..81364d4d02af 100644
--- a/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch
+++ b/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch
@@ -11,10 +11,10 @@ in this context refers to the binary itself, not to a structured
 hierarchy. Bundles have the .bundle extension; for example,
 MyBundle.bundle.)
 
---- libltdl/m4/libtool.m4
-+++ libltdl/m4/libtool.m4
-@@ -2271,7 +2271,7 @@
-   soname_spec='${libname}${release}${major}$shared_ext'
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -2645,7 +2645,7 @@
+   soname_spec='$libname$release$major$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
diff --git a/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch b/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch
index 8244eaa7e3e7..aa1e870649b6 100644
--- a/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch
+++ b/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch
@@ -7,7 +7,7 @@ http://bugs.gentoo.org/109105
 
 --- a/m4/libtool.m4
 +++ b/m4/libtool.m4
-@@ -1375,7 +1375,14 @@
+@@ -2666,7 +2666,14 @@
      *) objformat=elf ;;
      esac
    fi
@@ -22,9 +22,9 @@ http://bugs.gentoo.org/109105
 +
    case $version_type in
      freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -1386,6 +1392,12 @@
-       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+@@ -2678,6 +2685,12 @@
+       library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
        need_version=yes
        ;;
 +    linux)
diff --git a/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch b/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch
index b4409815f8b4..aded304989d2 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch
@@ -1,8 +1,8 @@
 * revert old 1.5 behaviour
 
---- libtool-2.4.6/m4/libtool.m4
-+++ libtool-2.4.6/m4/libtool.m4
-@@ -2272,7 +2272,7 @@
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -2641,7 +2641,7 @@
    version_type=darwin
    need_lib_prefix=no
    need_version=no
diff --git a/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch b/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch
index c1ea8a82940f..853a22eff54f 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch
@@ -13,15 +13,10 @@ linker to allow trivial use of the clang address sanitizer.
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
 Copyright-paperwork-exempt: Yes
----
- build-aux/ltmain.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 1cbe875..2a5aaad 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -5382,10 +5382,11 @@ func_mode_link ()
+@@ -5362,10 +5362,11 @@
        # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        # -specs=*             GCC specs files
        # -stdlib=*            select c++ std lib with clang
@@ -34,13 +29,9 @@ index 1cbe875..2a5aaad 100644
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
-
-patch the generated file too to keep help2man from generating man pages
-https://bugs.gentoo.org/556512
-
 --- a/build-aux/ltmain.sh
 +++ b/build-aux/ltmain.sh
-@@ -5382,10 +5382,11 @@ func_mode_link ()
+@@ -7274,10 +7274,11 @@
        # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        # -specs=*             GCC specs files
        # -stdlib=*            select c++ std lib with clang
@@ -53,6 +44,3 @@ https://bugs.gentoo.org/556512
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
--- 
-2.6.2
-
diff --git a/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch b/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch
index 55ec5ae9e0a6..f6c0a3dc89f1 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch
@@ -10,15 +10,10 @@ Starting with gcc-4.8, there's a -fuse-ld flag that can be used to select
 between bfd & gold.  Make sure we pass it through to the linking stage.
 
 * build-aux/ltmain.in (func_mode_link): Pass -fuse-ld=* flags through.
----
- build-aux/ltmain.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 2a5aaad..4c24d5d 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -5383,10 +5383,11 @@ func_mode_link ()
+@@ -5363,10 +5363,11 @@
        # -specs=*             GCC specs files
        # -stdlib=*            select c++ std lib with clang
        # -fsanitize=*         Clang/GCC memory and address sanitizer
@@ -31,13 +26,9 @@ index 2a5aaad..4c24d5d 100644
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
-
-patch the generated file too to keep help2man from generating man pages
-https://bugs.gentoo.org/556512
-
 --- a/build-aux/ltmain.sh
 +++ b/build-aux/ltmain.sh
-@@ -5383,10 +5383,11 @@ func_mode_link ()
+@@ -7275,10 +7275,11 @@
        # -specs=*             GCC specs files
        # -stdlib=*            select c++ std lib with clang
        # -fsanitize=*         Clang/GCC memory and address sanitizer
@@ -50,5 +41,3 @@ https://bugs.gentoo.org/556512
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
--- 
-2.3.2
diff --git a/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch b/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch
index a8fbf28f80c0..c7720935d8fd 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch
@@ -10,15 +10,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=985592
 to the linker, Fedora uses this option for hardening.
 
 Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
----
- build-aux/ltmain.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index d5cf07a..0c40da0 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -5360,10 +5360,12 @@ func_mode_link ()
+@@ -5360,10 +5360,12 @@
        # -tp=*                Portland pgcc target processor selection
        # --sysroot=*          for sysroot support
        # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
@@ -32,13 +27,9 @@ index d5cf07a..0c40da0 100644
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
-
-patch the generated file too to keep help2man from generating man pages
-https://bugs.gentoo.org/556512
-
 --- a/build-aux/ltmain.sh
 +++ b/build-aux/ltmain.sh
-@@ -5360,10 +5360,12 @@ func_mode_link ()
+@@ -7272,10 +7272,12 @@
        # -tp=*                Portland pgcc target processor selection
        # --sysroot=*          for sysroot support
        # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
@@ -52,6 +43,3 @@ https://bugs.gentoo.org/556512
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
--- 
-2.6.2
-
diff --git a/sys-devel/libtool/files/libtool-2.4.6-mint.patch b/sys-devel/libtool/files/libtool-2.4.6-mint.patch
index 341a0f02ef1e..4fe5bcede5a3 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-mint.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-mint.patch
@@ -2,10 +2,9 @@ Patch by Alan Hourihane
 
 http://bugs.gentoo.org/show_bug.cgi?id=266984
 
-diff -ur libtool-2.2.6/configure libtool-2.2.6-mint/configure
---- libtool-2.2.6/configure	2008-09-07 17:52:50.000000000 +0000
-+++ libtool-2.2.6/configure	2009-04-21 08:49:27.000000000 +0000
-@@ -4986,6 +4986,11 @@
+--- a/configure
++++ b/configure
+@@ -5897,6 +5897,11 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -17,10 +16,9 @@ diff -ur libtool-2.2.6/configure libtool-2.2.6-mint/configure
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-diff -ur libtool-2.2.6/libltdl/configure libtool-2.2.6-mint/libltdl/configure
---- libtool-2.2.6/libltdl/configure	2008-09-07 17:53:05.000000000 +0000
-+++ libtool-2.2.6/libltdl/configure	2009-04-21 08:50:08.000000000 +0000
-@@ -4422,6 +4422,11 @@
+--- a/libltdl/configure
++++ b/libltdl/configure
+@@ -4782,6 +4782,11 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -32,10 +30,9 @@ diff -ur libtool-2.2.6/libltdl/configure libtool-2.2.6-mint/libltdl/configure
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-diff -ur libtool-2.2.6/libltdl/m4/libtool.m4 libtool-2.2.6-mint/libltdl/m4/libtool.m4
---- libtool-2.2.6/m4/libtool.m4	2008-09-05 11:54:41.000000000 +0000
-+++ libtool-2.2.6/m4/libtool.m4	2009-04-21 08:50:26.000000000 +0000
-@@ -1527,6 +1527,11 @@
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1708,6 +1708,11 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
diff --git a/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch
index 54461ccc54ee..b093d74266f2 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch
@@ -1,8 +1,8 @@
 https://bugs.gentoo.org/650876
 
---- libtool-2.4.6/build-aux/ltmain.sh
-+++ libtool-2.4.6/build-aux/ltmain.sh
-@@ -7079,6 +7079,16 @@
+--- a/build-aux/ltmain.sh
++++ b/build-aux/ltmain.sh
+@@ -7127,6 +7127,16 @@
  	    *" $arg "*) ;;
  	    * ) func_append new_inherited_linker_flags " $arg" ;;
  	esac
diff --git a/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch b/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch
index 0eeffac7a0da..580d635d04aa 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch
@@ -20,18 +20,10 @@ of '$SED $sed_quote_subst'.
 (func_mode_link): Likewise.
 * NEWS: Document.
 * bootstrap: Sync with funclib.sh.
----
- NEWS                    |  3 +++
- bootstrap               | 61 +++++++++++++++++++++++++++++++++++++++++++------
- build-aux/ltmain.in     | 10 ++++----
- gl/build-aux/funclib.sh | 61 +++++++++++++++++++++++++++++++++++++++++++------
- 4 files changed, 117 insertions(+), 18 deletions(-)
 
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 0c40da0..24acefd 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -3346,7 +3346,8 @@ else
+@@ -3346,7 +3346,8 @@
    if test \"\$libtool_execute_magic\" != \"$magic\"; then
      file=\"\$0\""
  
@@ -41,7 +33,7 @@ index 0c40da0..24acefd 100644
      $ECHO "\
  
  # A function that is used when there is no print builtin or printf.
-@@ -8596,8 +8597,8 @@ EOF
+@@ -8598,8 +8599,8 @@
  	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
  	  fi
  	done
@@ -52,7 +44,7 @@ index 0c40da0..24acefd 100644
        fi
  
        # Only actually do things if not in dry run mode.
-@@ -8843,7 +8844,8 @@ EOF
+@@ -8845,7 +8846,8 @@
        done
        # Quote the link command for shipping.
        relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -62,8 +54,6 @@ index 0c40da0..24acefd 100644
        if test yes = "$hardcode_automatic"; then
  	relink_command=
        fi
-diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
-index 39d972e..47d8b95 100644
 --- a/build-aux/funclib.sh
 +++ b/build-aux/funclib.sh
 @@ -1,5 +1,5 @@
@@ -73,7 +63,7 @@ index 39d972e..47d8b95 100644
  
  # General shell script boiler plate, and helper functions.
  # Written by Gary V. Vaughan, 2004
-@@ -1026,6 +1026,57 @@ func_relative_path ()
+@@ -1026,6 +1026,57 @@
  }
  
  
@@ -131,7 +121,7 @@ index 39d972e..47d8b95 100644
  # func_quote_for_eval ARG...
  # --------------------------
  # Aesthetically quote ARGs to be evaled later.
-@@ -1042,12 +1093,8 @@ func_quote_for_eval ()
+@@ -1042,12 +1093,8 @@
      func_quote_for_eval_unquoted_result=
      func_quote_for_eval_result=
      while test 0 -lt $#; do
@@ -146,20 +136,18 @@ index 39d972e..47d8b95 100644
        if test -n "$func_quote_for_eval_unquoted_result"; then
  	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
        else
-
-patch the generated file too to keep help2man from generating man pages
-https://bugs.gentoo.org/556512
-
 --- a/build-aux/ltmain.sh
 +++ b/build-aux/ltmain.sh
-@@ -1,5 +1,5 @@
+@@ -64,7 +64,7 @@
+ # libraries, which are installed to $pkgauxdir.
+ 
  # Set a version string for this script.
 -scriptversion=2015-01-20.17; # UTC
 +scriptversion=2015-10-04.22; # UTC
  
  # General shell script boiler plate, and helper functions.
  # Written by Gary V. Vaughan, 2004
-@@ -1026,6 +1026,57 @@ func_relative_path ()
+@@ -1091,6 +1091,57 @@
  }
  
  
@@ -217,7 +205,7 @@ https://bugs.gentoo.org/556512
  # func_quote_for_eval ARG...
  # --------------------------
  # Aesthetically quote ARGs to be evaled later.
-@@ -1042,12 +1093,8 @@ func_quote_for_eval ()
+@@ -1107,12 +1158,8 @@
      func_quote_for_eval_unquoted_result=
      func_quote_for_eval_result=
      while test 0 -lt $#; do
@@ -232,7 +220,7 @@ https://bugs.gentoo.org/556512
        if test -n "$func_quote_for_eval_unquoted_result"; then
  	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
        else
-@@ -3346,7 +3346,8 @@ else
+@@ -5258,7 +5305,8 @@
    if test \"\$libtool_execute_magic\" != \"$magic\"; then
      file=\"\$0\""
  
@@ -242,7 +230,7 @@ https://bugs.gentoo.org/556512
      $ECHO "\
  
  # A function that is used when there is no print builtin or printf.
-@@ -8596,8 +8597,8 @@ EOF
+@@ -10510,8 +10558,8 @@
  	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
  	  fi
  	done
@@ -253,7 +241,7 @@ https://bugs.gentoo.org/556512
        fi
  
        # Only actually do things if not in dry run mode.
-@@ -8843,7 +8844,8 @@ EOF
+@@ -10757,7 +10805,8 @@
        done
        # Quote the link command for shipping.
        relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -263,6 +251,3 @@ https://bugs.gentoo.org/556512
        if test yes = "$hardcode_automatic"; then
  	relink_command=
        fi
--- 
-2.6.2
-
diff --git a/sys-devel/libtool/libtool-2.4.6-r4.ebuild b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
deleted file mode 100644
index a7dc840c4d43..000000000000
--- a/sys-devel/libtool/libtool-2.4.6-r4.ebuild
+++ /dev/null
@@ -1,112 +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 prefix
-
-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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-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
-
-	epatch "${FILESDIR}"/${PN}-2.4.6-mint.patch
-	epatch "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
-	epatch "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
-	if use prefix ; then
-		# seems that libtool has to know about EPREFIX a little bit
-		# better, since it fails to find prefix paths to search libs
-		# from, resulting in some packages building static only, since
-		# libtool is fooled into thinking that libraries are unavailable
-		# (argh...). This could also be fixed by making the gcc wrapper
-		# return the correct result for -print-search-dirs (doesn't
-		# include prefix dirs ...).
-		epatch "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
-		eprefixify m4/libtool.m4
-	fi
-
-	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=$(type -P bash)
-
-	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
-	export ac_cv_path_SED=$(basename "$(type -P sed)")
-
-	local myconf
-	[[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"
-	ECONF_SOURCE=${S} econf ${myconf} --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/libtool/libtool-2.4.6-r5.ebuild b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
index 9f5c38a68cd5..0ac78632b965 100644
--- a/sys-devel/libtool/libtool-2.4.6-r5.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 LIBTOOLIZE="true" #225559
 WANT_LIBTOOL="none"
-inherit autotools epatch epunt-cxx multilib unpacker prefix
+inherit autotools prefix
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
@@ -24,48 +23,42 @@ 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"
+RDEPEND="
+	sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.69:*
+	>=sys-devel/automake-1.13:*
+	dev-libs/libltdl:0"
+DEPEND="${RDEPEND}"
+[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
-	"${FILESDIR}"/${P}-link-specs.patch
-	"${FILESDIR}"/${P}-link-fsanitize.patch #573744
-	"${FILESDIR}"/${P}-link-fuse-ld.patch
-	"${FILESDIR}"/${P}-libtoolize-slow.patch
-	"${FILESDIR}"/${P}-libtoolize-delay-help.patch
-	"${FILESDIR}"/${P}-sed-quote-speedup.patch #542252
-	"${FILESDIR}"/${P}-ppc64le.patch #581314
+	"${FILESDIR}"/${PN}-2.4.6-link-specs.patch
+	"${FILESDIR}"/${PN}-2.4.6-link-fsanitize.patch #573744
+	"${FILESDIR}"/${PN}-2.4.6-link-fuse-ld.patch
+	"${FILESDIR}"/${PN}-2.4.6-libtoolize-slow.patch
+	"${FILESDIR}"/${PN}-2.4.6-libtoolize-delay-help.patch
+	"${FILESDIR}"/${PN}-2.4.6-sed-quote-speedup.patch #542252
+	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch #581314
 
 	"${FILESDIR}"/${PN}-2.4.6-mint.patch
 	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
 )
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		unpacker_src_unpack
-	fi
-}
-
 src_prepare() {
-	if [[ "${PV}" = 9999 ]] ; then
-		eapply "${FILESDIR}"/${P}-pthread.patch #650876
+	if [[ ${PV} == *9999 ]] ; then
+		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch #650876
 		./bootstrap || die
 	else
 		PATCHES+=(
-			"${FILESDIR}"/${P}-pthread_bootstrapped.patch #650876
+			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch #650876
 		)
 	fi
 
+	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
+	chmod +w build-aux/ltmain.sh || die
+
 	if use vanilla ; then
 		eapply_user
 		return 0
@@ -85,15 +78,14 @@ src_prepare() {
 		eprefixify m4/libtool.m4
 	fi
 
-	pushd libltdl >/dev/null
+	pushd libltdl >/dev/null || die
 	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null
+	popd >/dev/null || die
 	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
+	if [[ ${PV} != *9999 ]] ; then
+		touch doc/*.1 || die
 		export HELP2MAN=false
 	fi
 }
@@ -108,15 +100,10 @@ src_configure() {
 	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
 	export ac_cv_path_SED="$(basename "$(type -P sed)")"
 
-	local myconf
-	[[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"
+	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
 	ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install
 }
 
-src_test() {
-	emake check
-}
-
 src_install() {
 	default
 
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 96ef613cceea..a929635d35d7 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 LIBTOOLIZE="true" #225559
 WANT_LIBTOOL="none"
-inherit autotools epunt-cxx multilib unpacker prefix
+inherit autotools prefix
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
@@ -24,14 +23,13 @@ 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"
+RDEPEND="
+	sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.69:*
+	>=sys-devel/automake-1.13:*
+	dev-libs/libltdl:0"
+DEPEND="${RDEPEND}"
+[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
@@ -40,27 +38,25 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
 )
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		unpacker_src_unpack
-	fi
-}
-
 src_prepare() {
-	if [[ "${PV}" = 9999 ]] ; then
+	if [[ ${PV} == *9999 ]] ; then
 		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch #650876
 		./bootstrap || die
 	else
 		PATCHES+=(
-			"${FILESDIR}"/${P}-pthread_bootstrapped.patch #650876
+			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch #650876
 		)
 	fi
 
-	use vanilla && return 0
+	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
+	chmod +w build-aux/ltmain.sh || die
 
-	default
+	if use vanilla ; then
+		eapply_user
+		return 0
+	else
+		default
+	fi
 
 	if use prefix ; then
 		# seems that libtool has to know about EPREFIX a little bit
@@ -73,15 +69,15 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
 		eprefixify m4/libtool.m4
 	fi
-	pushd libltdl >/dev/null
+
+	pushd libltdl >/dev/null || die
 	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null
+	popd >/dev/null || die
 	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
+	if [[ ${PV} != *9999 ]] ; then
+		touch doc/*.1 || die
 		export HELP2MAN=false
 	fi
 }
@@ -96,15 +92,10 @@ src_configure() {
 	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
 	export ac_cv_path_SED="$(basename "$(type -P sed)")"
 
-	local myconf
-	[[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"
+	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
 	ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install
 }
 
-src_test() {
-	emake check
-}
-
 src_install() {
 	default
 
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 1f54bbde079f..885697543438 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,16 +1,10 @@
 DIST lld-7.1.0.src.tar.xz 912604 BLAKE2B f18a96233217a92f4c3033446dbfd03d161c4f9e2b87a3b8383879f21737fb9bc10744e60499245ffda0bc42a0ee78b853284a62283a70a4c583fedf7c6e3660 SHA512 7743bba771f8cd0b8596f65d7daf44d3d7ab9c2683a776bb0030bb510cb03a182f094a9b79f270ed8b223216c6aa3d9789440765c80a8f6a28a7852541973a57
 DIST lld-8.0.1.src.tar.xz 996440 BLAKE2B 9e205427f5534a69b665620b5ecf6713194421a35e3e815d257545d5a1e8a11d42e32abd685df1d439463b6e9e2dd6134755b458196edcd7c7807b89c779027d SHA512 646418d4a4ce922d1a69e9bf2e472f5d758f25ec21b80a2c66dfe5effc59c9c312fb167cf64ee2d8a2ced986e7474ed3d2996a38be66fbf63c574229d28e0900
-DIST lld-9.0.0.src.tar.xz 1100608 BLAKE2B 3deaa980db62fe8e045cfb6fcc057161c4dd54f7f72e8f447794a563b9ebb6c255e81710d3ce4ffe14ce3a9d3d42be602e88f623c0290e870af18e50e55e884c SHA512 bc4812232840ef5edbd8edf1d1a329e85a4bfd3a7859fe322e11dd053435e722c6f1140a718fd2b3524ee9783a357178d2ba30d12519847bd3acc294698007f3
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
-DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
-EBUILD lld-10.0.0.9999.ebuild 1459 BLAKE2B f59003d44ddc7fd961aef614642a836dd5903e6a43ab8c28c3d23b3da525b9f6709910c143b8d38973ea29ed6e366305e1dce05fd729376b7beb541dda02f742 SHA512 1fa91d16eb705704d09925f50fa015b791619ad9d6c7f90f8cbf834cc5d20e07f95b93713c7637e71676912c80d846546fdb96283406fca2ba95f93b339eea4d
+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-7.1.0.ebuild 1725 BLAKE2B 61454551884ee0d7d50ea65b4816ad516784f81965dca35ee696547e367ac446692c3430660f3d0b82446974d264ca0671517a2d3ed04fe3d263a4b435657923 SHA512 10fc7671b1afc5db3cc2a854e6b1f7c6b297c67967c6a90efb392537f5dc3b7150f4efe60a92554b2332dd2ce27284405053dc6c42d4a51ee739ead9ca65d1f4
 EBUILD lld-8.0.1.ebuild 1794 BLAKE2B 31cf9d99132629908515eb9a8c6b074caa7b84bfbd86446fcd7f65391e247ac23ffd272b715836fc0d787c004a00f613c2c7b0d1bff96a1c8e9054554ae3fe41 SHA512 3d29acfa6f2eedd49917bf811f93f0f9646de38f4b17cf78d748e93c0bb0653f95e7ff1d6aefa0e77ad7af4479f7d3b27d4b10a49ae34aa86efcbeb636064e79
-EBUILD lld-9.0.0.ebuild 1336 BLAKE2B a61d7f26913105465fc178398fdd736b4b67afb86d69d22beae24bc649a52fe0cfd43345adfbc1c9d47a4da18f98943d60403b9254071fbdf822753c062fd1af SHA512 4618436b1710849f8258a0de88f0b4b596fd4ee48f02e940f1169452118441abbe51e1cd0d0f579be88f90b17a121dce5e0cef09e1ae54a9a1d88a24ad5c8269
-EBUILD lld-9.0.1.9999.ebuild 1306 BLAKE2B a6a6163883468f2a694799b353aae0da4c93438101a950bc5f2e6a4881bc3ea1d6db27c017536e75e9c580c53fe89fe88a42672de122ff8de70dd00388e53ec2 SHA512 4afd940fb0b4cc109199464d2dad47d433f004148c5ac03d916c6f892089ddb696bb0232e44e433e28c3f68d2e549bb6f68f3a63f79ecaf0106750fd6785ac0c
-EBUILD lld-9.0.1_rc2.ebuild 1336 BLAKE2B a61d7f26913105465fc178398fdd736b4b67afb86d69d22beae24bc649a52fe0cfd43345adfbc1c9d47a4da18f98943d60403b9254071fbdf822753c062fd1af SHA512 4618436b1710849f8258a0de88f0b4b596fd4ee48f02e940f1169452118441abbe51e1cd0d0f579be88f90b17a121dce5e0cef09e1ae54a9a1d88a24ad5c8269
-EBUILD lld-9.0.1_rc3.ebuild 1336 BLAKE2B a61d7f26913105465fc178398fdd736b4b67afb86d69d22beae24bc649a52fe0cfd43345adfbc1c9d47a4da18f98943d60403b9254071fbdf822753c062fd1af SHA512 4618436b1710849f8258a0de88f0b4b596fd4ee48f02e940f1169452118441abbe51e1cd0d0f579be88f90b17a121dce5e0cef09e1ae54a9a1d88a24ad5c8269
+EBUILD lld-9.0.1.ebuild 1334 BLAKE2B be17acd60de67fc4ab22a30ff55fe991d0febb0e7125869713e139cc4f9fbcef6306232e9cde47cda3d6516fc51a5d66e47c9a5a3c0e790a511b1dc27250c2a3 SHA512 8c566dc5e7548b5e90da141dc8c3e771413f7d1563e3f9f86be5a107a5c4624246e468ef94bf8a91879a390317fb72f3c575e3d86f31c129c3b74eb5a7a4abb4
 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 fed376f6958a..8d0d48bb02cc 100644
--- a/sys-devel/lld/lld-10.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-10.0.0.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{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.0.ebuild b/sys-devel/lld/lld-9.0.0.ebuild
deleted file mode 100644
index ce499310894b..000000000000
--- a/sys-devel/lld/lld-9.0.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lld
-}
diff --git a/sys-devel/lld/lld-9.0.1.9999.ebuild b/sys-devel/lld/lld-9.0.1.9999.ebuild
deleted file mode 100644
index 08b0bcbf80e9..000000000000
--- a/sys-devel/lld/lld-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lld
-}
diff --git a/sys-devel/lld/lld-9.0.1_rc3.ebuild b/sys-devel/lld/lld-9.0.1.ebuild
index ce499310894b..bb3df2a9ac7e 100644
--- a/sys-devel/lld/lld-9.0.1_rc3.ebuild
+++ b/sys-devel/lld/lld-9.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{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_rc2.ebuild b/sys-devel/lld/lld-9.0.1_rc2.ebuild
deleted file mode 100644
index ce499310894b..000000000000
--- a/sys-devel/lld/lld-9.0.1_rc2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lld
-}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 30e4277ab2bb..45425702150d 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,13 +1,8 @@
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
-DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-common-10.0.0.9999.ebuild 528 BLAKE2B 957a2fbd49748e29068dfa987ee45e4fe1330c386ec4c3d7f2105136d1561c4427fe098f4199052b0f8267f4b5e50ff10f0c359435e4df007a6b4d9970275bd4 SHA512 643116074781e724ffb1184eaaa2ae041e20c9fb9b8927f1e6f1784c0a94b62021138267ff4d1fc1714e40eb4cf2e9b378b72d17ed16da32c9a0696580c8fe30
 EBUILD llvm-common-7.1.0.ebuild 823 BLAKE2B 303878e56feb88de440edeb2e36b9f1ab6068b661e3acf2c74eb28d41506f3159f61f9b23875159f86fb87ba61b0dde94a8d31349e00c8712f6fa674cf2c0cbe SHA512 d8617f793fddbca40aab02ccca07dd1ea886666800483c7c8e9ad612bfa3cdc1fad67c151677a875a96c1b07acf639eb5a279371488f90d97da58d0dee971372
 EBUILD llvm-common-8.0.1.ebuild 855 BLAKE2B 81171ca3ce7d05be60c151d814ceb592e18fd2d8986db8a1106662727d0b1f94011cac9057f7fe8b398197b2d8fe588e684dacf7ed6b4d93777f4a8cdbfdc644 SHA512 f6a1f1b256bb1dae884dcecbeb6b22c295407ea3b3126839ac99c7c6e745c074c77167f52d7790b38501a0cab5680109274323ff8f6d27ea9b39bdec82ff8f7f
-EBUILD llvm-common-9.0.0.ebuild 604 BLAKE2B af30f6a0ba31d0d1accbaf2fe0ccdf670523ffaf3df6d882ce95b13f563e78ad8758fd7325ae6576b0dc9cfd1ee9da25400449c394b06c25552eef7420190dc5 SHA512 5d03af9b060a60cb5610378b6a7539462093b957ca01072bb2f451c1f2131686780da09af966955cb60636bef71474c4c6f2685a1ca2b45c4dac3710eabf725c
-EBUILD llvm-common-9.0.1.9999.ebuild 528 BLAKE2B 957a2fbd49748e29068dfa987ee45e4fe1330c386ec4c3d7f2105136d1561c4427fe098f4199052b0f8267f4b5e50ff10f0c359435e4df007a6b4d9970275bd4 SHA512 643116074781e724ffb1184eaaa2ae041e20c9fb9b8927f1e6f1784c0a94b62021138267ff4d1fc1714e40eb4cf2e9b378b72d17ed16da32c9a0696580c8fe30
-EBUILD llvm-common-9.0.1_rc2.ebuild 604 BLAKE2B af30f6a0ba31d0d1accbaf2fe0ccdf670523ffaf3df6d882ce95b13f563e78ad8758fd7325ae6576b0dc9cfd1ee9da25400449c394b06c25552eef7420190dc5 SHA512 5d03af9b060a60cb5610378b6a7539462093b957ca01072bb2f451c1f2131686780da09af966955cb60636bef71474c4c6f2685a1ca2b45c4dac3710eabf725c
-EBUILD llvm-common-9.0.1_rc3.ebuild 604 BLAKE2B af30f6a0ba31d0d1accbaf2fe0ccdf670523ffaf3df6d882ce95b13f563e78ad8758fd7325ae6576b0dc9cfd1ee9da25400449c394b06c25552eef7420190dc5 SHA512 5d03af9b060a60cb5610378b6a7539462093b957ca01072bb2f451c1f2131686780da09af966955cb60636bef71474c4c6f2685a1ca2b45c4dac3710eabf725c
+EBUILD llvm-common-9.0.1.ebuild 604 BLAKE2B af30f6a0ba31d0d1accbaf2fe0ccdf670523ffaf3df6d882ce95b13f563e78ad8758fd7325ae6576b0dc9cfd1ee9da25400449c394b06c25552eef7420190dc5 SHA512 5d03af9b060a60cb5610378b6a7539462093b957ca01072bb2f451c1f2131686780da09af966955cb60636bef71474c4c6f2685a1ca2b45c4dac3710eabf725c
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild b/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild
deleted file mode 100644
index ba2ffc76a706..000000000000
--- a/sys-devel/llvm-common/llvm-common-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-9.0.0.ebuild b/sys-devel/llvm-common/llvm-common-9.0.1.ebuild
index a81f8f505994..a81f8f505994 100644
--- a/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-9.0.1.ebuild
diff --git a/sys-devel/llvm-common/llvm-common-9.0.1_rc2.ebuild b/sys-devel/llvm-common/llvm-common-9.0.1_rc2.ebuild
deleted file mode 100644
index a81f8f505994..000000000000
--- a/sys-devel/llvm-common/llvm-common-9.0.1_rc2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-9.0.1_rc3.ebuild b/sys-devel/llvm-common/llvm-common-9.0.1_rc3.ebuild
deleted file mode 100644
index a81f8f505994..000000000000
--- a/sys-devel/llvm-common/llvm-common-9.0.1_rc3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 1b5cf6d1eb54..490a5b264316 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -1,3 +1,4 @@
+AUX llvm-roc-3.0.0-add_libraries.patch 648 BLAKE2B a201718b8afdc1ba18ae5d7e85a73fde7ca2bb163eecabab33d37c5815ac6ab8c4f8d960ab40f95ad6df95da626a439fbda1d20c25abb9558a37bcdf64a77e64 SHA512 7a1892c8781146830aa5bf69db20bbe7329634f469aeef0946232b15138b55d332491092ed00a4cf698033f19d8f279f4a5b34f13168d5b9ff7eba4a229e82a0
 DIST clang-roc-2.10.0.tar.gz 19416958 BLAKE2B 2754326c21a7ddd77fc1b5fdd8cee9a16c226d6b23d0b14afc62e71d04b053bff94ab4326b13f837ce00267f889c1ba2f25daf036b12742af6b18fe7474398e0 SHA512 bbaad89d95f2fe261ffa4ff2941357dcd4954b111cec9a303a441295257d4090f69091ea5c31d4b605df500edd59bb058931b11b5a95a2af4fa2d48f18ea9ab4
 DIST clang-roc-2.6.0.tar.gz 18831605 BLAKE2B c54b811afc57d42b32e6c38ef219eb8a1bdba47f2a58505249bf5057708c6873b28387c1fa05a8a6c1bfb02cb71b4ca96e69a72d9f0cc03bb393fa1033d86a41 SHA512 41a3595961eb4b57ac8b2d7483f53628ffe5f064a40a7331fbfa1daad2f1491e1062a1189a15a00586341fdeb73978db67c058a23e00982d32b987cc41a63b43
 DIST clang-roc-2.7.0.tar.gz 19030674 BLAKE2B 10c1a3982382edd3515d1dc342d352af3ef0807c92ec2e51740c5e7053df56acc9c467a3e1efc587df4d17852d3e1a9f0d183a5bede54339c2a67ff894b106a2 SHA512 c32b716ef0ef7c8b775b8d1cc65bb4d1b2c9daf9da7dc6a587affa303411923fe955aa6d4355a5ed0adb2d347eb333cf009d02384b00dd4e329008f9a1ffd249
@@ -13,9 +14,11 @@ DIST llvm-roc-ocl-2.6.0.tar.gz 48417665 BLAKE2B 9b7ff7cc57d98b2076994d3a55855634
 DIST llvm-roc-ocl-2.7.0.tar.gz 50008043 BLAKE2B 7cbb6f0e268991bbeae6dd5f38f00ee35a3d04f563212a6a3c32676574668ca84e44ae5acc14d1a77ea6985e70b47a0faff86d86521fb3a7375aa58a043d65ec SHA512 ae1547d1547345be56f547c59a6ddd09e68bb1eaea1f3c8eb4911dee1f2616b43384a296a2e2754bf2a833ef4906da4463820e4fe734c3bcfd7a602ef3c2de17
 DIST llvm-roc-ocl-2.8.0.tar.gz 50245388 BLAKE2B 29aa4fdb08b5c3ca1ec41f8948b48d4655768632cd07b217e742e32fcfe0e306130697cd18d4c481aec440686464271b380b5a1a7f02bba84ee8cb98c13d2a7f SHA512 51eb98160d556aa0b60fdce95af54f57529e218899874df0a59e583dad5a8fbcad822c3d778668ce0ec4897b28ff3423cde4d55e18719cf4edfb56735cb3d80b
 DIST llvm-roc-ocl-2.9.0.tar.gz 50246154 BLAKE2B 5ed8faf4582a41dac3bdc71a9fc6e12e3f70652fe80d4659315589e5c6f6326bc03853cea1d3e7acf6b210dd4c83056bae27aded3e173756d6f7c2c5694ae386 SHA512 e29767bb92bf719b7f3b6d2853dc61d6cb968e3f0dc54714ee6a78ff5340139935ce0d1cf3124c5757d96f93af01e0f9927e72d29a35b84229e44e7a69e6d391
-EBUILD llvm-roc-2.10.0.ebuild 1425 BLAKE2B b01a8be612226b8529e6a6235ead8e4e1ec33247466040e8829f3fe8579cd52666f646be8a4989ba410e88b4782aff7db1e1d56a116951c6ba3935dbdcc7666d SHA512 275c66d4abd0f8d7173f037ce6f646492ba2b1b23ae5ba840843cb5317e37f8d1b3ae30d973d16ba71b16d1f75e16307d47aa277fb07b5e3ed76b226b4790dbc
-EBUILD llvm-roc-2.6.0-r1.ebuild 1397 BLAKE2B dfe3cfa05e3c6821bc11e0f84ab00cc99d92a7ddfe162127d96bbeaafe799eb802eb88c6598f3a6e1985848800100cd5f74d1f984607e784981545171cd81b67 SHA512 75fa6b120685a0a284a8e18403580aed74bd1597464c686623fb9bd3c0fdd0930eb11f4f0aac69790baf5038af368195adba3a7c4291b13b7d84b934b537e3e6
-EBUILD llvm-roc-2.7.0.ebuild 1425 BLAKE2B b01a8be612226b8529e6a6235ead8e4e1ec33247466040e8829f3fe8579cd52666f646be8a4989ba410e88b4782aff7db1e1d56a116951c6ba3935dbdcc7666d SHA512 275c66d4abd0f8d7173f037ce6f646492ba2b1b23ae5ba840843cb5317e37f8d1b3ae30d973d16ba71b16d1f75e16307d47aa277fb07b5e3ed76b226b4790dbc
-EBUILD llvm-roc-2.8.0.ebuild 1425 BLAKE2B b01a8be612226b8529e6a6235ead8e4e1ec33247466040e8829f3fe8579cd52666f646be8a4989ba410e88b4782aff7db1e1d56a116951c6ba3935dbdcc7666d SHA512 275c66d4abd0f8d7173f037ce6f646492ba2b1b23ae5ba840843cb5317e37f8d1b3ae30d973d16ba71b16d1f75e16307d47aa277fb07b5e3ed76b226b4790dbc
-EBUILD llvm-roc-2.9.0.ebuild 1425 BLAKE2B b01a8be612226b8529e6a6235ead8e4e1ec33247466040e8829f3fe8579cd52666f646be8a4989ba410e88b4782aff7db1e1d56a116951c6ba3935dbdcc7666d SHA512 275c66d4abd0f8d7173f037ce6f646492ba2b1b23ae5ba840843cb5317e37f8d1b3ae30d973d16ba71b16d1f75e16307d47aa277fb07b5e3ed76b226b4790dbc
+DIST llvm-roc-ocl-3.0.0.tar.gz 117363122 BLAKE2B a85e456e715629fbb3349e13e50a62aee7c82c6479127d7e46ff2de13f0eab108dd0332136aa736c30ed46c1563207b7ab22df0f7f53404315d51f0a172b5e86 SHA512 7d1281fc1628e4e88ddd740ccf03107cdccf86178046dfe79efd6b503193b3be4e23a67363f24f1d6250a156da86fe0d93933d9c67510b755d1e454e7bbedb68
+EBUILD llvm-roc-2.10.0.ebuild 1407 BLAKE2B d6e1f375d305f78d3f801cfd0c89e36984961862f192bb5c96959c61ee650e9a03a1e227be088179a080ef563eaf1f2c2bc083d2a70682d356d4694c29c48def SHA512 f2db9783222a46439bad5d3f202725c7e9b2d55af052d1159c74b25ccdd8bf14d8ad7e7c0bfd3aed03082601d02f8eef925d91028f64322df38dc75e0765ecbd
+EBUILD llvm-roc-2.6.0-r1.ebuild 1379 BLAKE2B d55eaaf322f4ab1a5d3456873f7d4b4624dddb3354ba332c5dd92912cfa94fd6b9d5b5440d86d9b523c7439d6cd2ad5175c849acc6511920ab9a217f2e097e4e SHA512 847a2f9476292c9c34a96ce0c25a0efd81618fe3c9455ecd839e5e5ac9890bd37b83470e82289cd21402c58f79024f093b7d26d6f931aeb8d12946e2c1216303
+EBUILD llvm-roc-2.7.0.ebuild 1407 BLAKE2B d6e1f375d305f78d3f801cfd0c89e36984961862f192bb5c96959c61ee650e9a03a1e227be088179a080ef563eaf1f2c2bc083d2a70682d356d4694c29c48def SHA512 f2db9783222a46439bad5d3f202725c7e9b2d55af052d1159c74b25ccdd8bf14d8ad7e7c0bfd3aed03082601d02f8eef925d91028f64322df38dc75e0765ecbd
+EBUILD llvm-roc-2.8.0.ebuild 1407 BLAKE2B d6e1f375d305f78d3f801cfd0c89e36984961862f192bb5c96959c61ee650e9a03a1e227be088179a080ef563eaf1f2c2bc083d2a70682d356d4694c29c48def SHA512 f2db9783222a46439bad5d3f202725c7e9b2d55af052d1159c74b25ccdd8bf14d8ad7e7c0bfd3aed03082601d02f8eef925d91028f64322df38dc75e0765ecbd
+EBUILD llvm-roc-2.9.0.ebuild 1407 BLAKE2B d6e1f375d305f78d3f801cfd0c89e36984961862f192bb5c96959c61ee650e9a03a1e227be088179a080ef563eaf1f2c2bc083d2a70682d356d4694c29c48def SHA512 f2db9783222a46439bad5d3f202725c7e9b2d55af052d1159c74b25ccdd8bf14d8ad7e7c0bfd3aed03082601d02f8eef925d91028f64322df38dc75e0765ecbd
+EBUILD llvm-roc-3.0.0.ebuild 1278 BLAKE2B 62bf433493c7cfbcfcb85b397519c56e34a272d8c067f76aa7704f8f7337c238ea2e95c77e04e18b92fac85eff897870b66c30d22d3c3866b678f7d330c598ca SHA512 9ab879d1f1af743e63b6c7268cb7c6c01f4ef2be096ed67ae6a7e3c28a822c27370b9be22772e73af4902b1937b9c2c05eb9262b63a5bed76b80e624ebbeccfe
 MISC metadata.xml 469 BLAKE2B f2b3af990bf9b130ed1be4ad2c4da5a97f6eae74d5feb43d81b4dc90ca1c5dcf896b293ad60d1c932d0c64773c203c52ccca8a6e0e5dd1d614f97b53113146db SHA512 e3783dde65d914cc272478c2d1823de27a2daaf8fa3aa2d281b98b0ed707c758bce1d52326dda577baed5b127293fca435211cfee17cc43553b9be424a4e2348
diff --git a/sys-devel/llvm-roc/files/llvm-roc-3.0.0-add_libraries.patch b/sys-devel/llvm-roc/files/llvm-roc-3.0.0-add_libraries.patch
new file mode 100644
index 000000000000..120ab819f5b4
--- /dev/null
+++ b/sys-devel/llvm-roc/files/llvm-roc-3.0.0-add_libraries.patch
@@ -0,0 +1,20 @@
+diff -Naur a/clang/lib/Basic/CMakeLists.txt b/clang/lib/Basic/CMakeLists.txt
+--- a/clang/lib/Basic/CMakeLists.txt	2019-12-28 07:42:49.119055933 +0100
++++ b/clang/lib/Basic/CMakeLists.txt	2019-12-28 07:42:13.265056070 +0100
+@@ -2,6 +2,7 @@
+   Core
+   MC
+   Support
++  Option
+   )
+ 
+ find_first_existing_vc_file("${LLVM_MAIN_SRC_DIR}" llvm_vc)
+diff -Naur a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
+--- a/clang/lib/Driver/CMakeLists.txt	2019-12-28 07:41:39.521056199 +0100
++++ b/clang/lib/Driver/CMakeLists.txt	2019-12-28 07:40:23.998056487 +0100
+@@ -79,4 +79,5 @@
+   LINK_LIBS
+   clangBasic
+   ${system_libs}
++  pthread
+   )
diff --git a/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
index 7cc195bf6554..897a08ce4f73 100644
--- a/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
+++ b/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
@@ -42,10 +42,10 @@ src_configure() {
 		-DLLVM_VERSION_SUFFIX=roc
 		-DOCAMLFIND=NO
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	cat > "99${PN}" <<-EOF
 		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
 	EOF
diff --git a/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild b/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
index 45b3c2928a03..a0104d873d24 100644
--- a/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
+++ b/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
@@ -41,10 +41,10 @@ src_configure() {
 		-DLLVM_INSTALL_UTILS=ON
 		-DOCAMLFIND=NO
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	cat > "99${PN}" <<-EOF
 		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
 	EOF
diff --git a/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
index 7cc195bf6554..897a08ce4f73 100644
--- a/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
+++ b/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
@@ -42,10 +42,10 @@ src_configure() {
 		-DLLVM_VERSION_SUFFIX=roc
 		-DOCAMLFIND=NO
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	cat > "99${PN}" <<-EOF
 		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
 	EOF
diff --git a/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild
index 7cc195bf6554..897a08ce4f73 100644
--- a/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild
+++ b/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
@@ -42,10 +42,10 @@ src_configure() {
 		-DLLVM_VERSION_SUFFIX=roc
 		-DOCAMLFIND=NO
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	cat > "99${PN}" <<-EOF
 		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
 	EOF
diff --git a/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
index 7cc195bf6554..897a08ce4f73 100644
--- a/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
+++ b/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
@@ -42,10 +42,10 @@ src_configure() {
 		-DLLVM_VERSION_SUFFIX=roc
 		-DOCAMLFIND=NO
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	cat > "99${PN}" <<-EOF
 		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
 	EOF
diff --git a/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild
new file mode 100644
index 000000000000..b4f3afd0bebd
--- /dev/null
+++ b/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Radeon Open Compute llvm,lld,clang"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
+SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/roc-ocl-${PV}.tar.gz -> llvm-roc-ocl-${PV}.tar.gz"
+
+LICENSE="UoI-NCSA rc BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="virtual/cblas
+	 dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/llvm-project-roc-ocl-${PV}/llvm"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cd "${WORKDIR}/llvm-project-roc-ocl-${PV}"
+	eapply "${FILESDIR}/${P}-add_libraries.patch"
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
+		-DLLVM_ENABLE_PROJECTS="clang;lld"
+		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
+		-DLLVM_BUILD_DOCS=NO
+		-DLLVM_ENABLE_OCAMLDOC=OFF
+		-DLLVM_ENABLE_SPHINX=NO
+		-DLLVM_ENABLE_DOXYGEN=OFF
+		-DLLVM_INSTALL_UTILS=ON
+		-DLLVM_VERSION_SUFFIX=roc
+		-DOCAMLFIND=NO
+	)
+
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	cmake_src_configure
+}
+
+src_install(){
+	cmake_src_install
+	cat > "99${PN}" <<-EOF
+		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
+	EOF
+	doenvd "99${PN}"
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 680177b7b45f..8b5c5d7c1e38 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -6,14 +6,9 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
 DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073
 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
-DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
-DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
-EBUILD llvm-10.0.0.9999.ebuild 12372 BLAKE2B 144b7dfe17c52bc79163d6f496d1162673fa47471820e32f6c6fd6b9e1438b2df4a6368245550c913601a43beb172aea5f1b01d7ad07594929217be96f369bb7 SHA512 d86c7499a210ba070967e7669ed5ab4a042fb80136fd5e130c627012f7b63811899d2107584b9194e4485eda91b70d46db275574b1a4dbb98c1b5a0504c08493
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+EBUILD llvm-10.0.0.9999.ebuild 12396 BLAKE2B b220114585955d14f0500656d86a840d9f6c7e1d57aaf23814162480ec64135c01291101374afd6ddb3c522ef5e2a22321d2be169d9f3a14d2d3005f2a0264d7 SHA512 0fa60d055791c64d2086eb37be3cbb35026c7a2aedc8666d246075bcb1104e5f9b2b9938d3ac3fffbd6b690300fc1a1eec51b81035016ca2c333a5429480a43d
 EBUILD llvm-7.1.0.ebuild 7719 BLAKE2B 92010c4973fe889c609246842fb3d3563e167026f7c2218a234d0ec50e57c99b9362db53dc5adef4641f12db4c0b295a328fa6994c57c041a03e3a17d6bf8649 SHA512 4c93d414270a03be5a808b73b977d24c1c2189625912aa2fde4121ff02ac8ffcf53c26e0d6c91a50b5015359d86ed6f97d0e7fb4579dc72c279d87cc01e0e610
 EBUILD llvm-8.0.1.ebuild 8528 BLAKE2B cdccf081c4c87ffb50b38b13b279ccb43ac444df3707cce96d2a5b7112a559f0f62fecd894e099fdeae178dd7c76fe97ccd13c3709b3d281184b3f86541fe750 SHA512 8f79795e3d30d099535a5a3142016cffcd9bc95f2cf1e478b480e39c216bcbe598cfbc0d6fbf0e96ce9eee2c030733d12c656b2bb5454cf809e97109353f7544
-EBUILD llvm-9.0.0.ebuild 8531 BLAKE2B d83bc192382fa1cae56e705ae7a75d3a467865f43ab039418371e8efaa86fdca024321d1aa0763eda5a986bfa2b4bb83a93c0d19332f8343233799f5ebcb6dcc SHA512 e0a36e982f17ac29262fdcdc6aa3f6de7e5549ba459c02fcd9322bf8350ee846f859826dc2d87029aaa0ea6bb1adb55637668d9a8263112433194bd969192983
-EBUILD llvm-9.0.1.9999.ebuild 7998 BLAKE2B 7830e405e2f2b06e1bc478c221afef586c2035f8cd8b56d3ac054d9e9982fb9ccea29bc17dece3cca81a09948de6607c310783d4c1b09de9831fc28c34eba673 SHA512 0257108f796345389008b2cde775753f52940ea885be8632cb8f42842fb6b4f15b5bf40d4e0a6151c17d08330d50d514f2545cf1cbf1d514c9dd49bd492582bb
-EBUILD llvm-9.0.1_rc2.ebuild 8074 BLAKE2B f5cb179660ca66b622a43f66f4a427eaea97c7dd39fda3dffa941278fe46c237fc45143bee1ae9b144d993e275cb0b92f40bd7d8f71220001434bced1d5d2b31 SHA512 4c89bbe538eba1d3bb15f229e46b4ab05ae4ab11febf01acbf809d3bdd9a39a58b9d6a1ab082380b998ca1adbd2422b81ecba86e6e603e7d5d393cda8c91daa1
-EBUILD llvm-9.0.1_rc3.ebuild 8074 BLAKE2B f5cb179660ca66b622a43f66f4a427eaea97c7dd39fda3dffa941278fe46c237fc45143bee1ae9b144d993e275cb0b92f40bd7d8f71220001434bced1d5d2b31 SHA512 4c89bbe538eba1d3bb15f229e46b4ab05ae4ab11febf01acbf809d3bdd9a39a58b9d6a1ab082380b998ca1adbd2422b81ecba86e6e603e7d5d393cda8c91daa1
+EBUILD llvm-9.0.1.ebuild 8570 BLAKE2B 66679845f228e4b63401b67e2c4003dfaac388a646eebddc9fc2ba0a719f28940c4d6131663c7d7414aefaf326a5a578df5b78a1c3b3f224753908702e143f54 SHA512 ec656f652a5de4a6b2cab65c5168795dedc2d0d127cc00cb6e206254f9d529434dabaad69ffb773f825c6cdac604be928b884c75c54cd2ec262e9d9257e1d061
 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 c41b6f527c9e..db347b40d25b 100644
--- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
@@ -262,6 +262,7 @@ get_distribution_components() {
 			llvm-exegesis
 			llvm-extract
 			llvm-ifs
+			llvm-install-name-tool
 			llvm-jitlink
 			llvm-lib
 			llvm-link
diff --git a/sys-devel/llvm/llvm-9.0.1.9999.ebuild b/sys-devel/llvm/llvm-9.0.1.9999.ebuild
deleted file mode 100644
index 9322ed86fcb6..000000000000
--- a/sys-devel/llvm/llvm-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils llvm.org multilib-minimal multiprocessing \
-	pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	exegesis? ( dev-libs/libpfm:= )
-	gold? (
-		|| (
-			>=sys-devel/binutils-2.31.1-r4:*[plugins]
-			<sys-devel/binutils-2.31.1-r4:*[cxx]
-		)
-	)
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	gold? ( sys-libs/binutils-libs )"
-BDEPEND="
-	dev-lang/perl
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	kernel_Darwin? (
-		<sys-libs/libcxx-$(ver_cut 1-3).9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="${RDEPEND}
-	!sys-devel/llvm:0"
-PDEPEND="sys-devel/llvm-common
-	gold? ( >=sys-devel/llvmgold-${SLOT} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	use doc || return 0
-
-	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# User patches + QA
-	cmake-utils_src_prepare
-}
-
-# Is LLVM being linked against libc++?
-is_libcxx_linked() {
-	local code='#include <ciso646>
-#if defined(_LIBCPP_VERSION)
-	HAVE_LIBCXX
-#endif
-'
-	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
-
-	[[ ${out} == *HAVE_LIBCXX* ]]
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	if is_libcxx_linked; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		mycmakeargs+=(
-			-DLLVM_VERSION_SUFFIX="libcxx"
-		)
-	fi
-
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use doc && mycmakeargs+=(
-			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-		use gold && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
-		[[ -x "${tblgen}" ]] \
-			|| die "${tblgen} not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DLLVM_TABLEGEN="${tblgen}"
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
-	newenvd - "10llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-9.0.0.ebuild b/sys-devel/llvm/llvm-9.0.1.ebuild
index 36fe1ebed13a..d8c55d8f41b9 100644
--- a/sys-devel/llvm/llvm-9.0.0.ebuild
+++ b/sys-devel/llvm/llvm-9.0.1.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
+# no changes in 9.0.1
+MANPAGE_P=llvm-9.0.0-manpages
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
 SRC_URI="
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
+	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${MANPAGE_P}.tar.bz2 )"
 LLVM_COMPONENTS=( llvm )
 llvm.org_set_globals
 
@@ -86,9 +88,9 @@ src_unpack() {
 	llvm.org_src_unpack
 
 	if ! use doc; then
-		ebegin "Unpacking llvm-${PV}-manpages.tar.bz2"
-		tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
-		eend
+		ebegin "Unpacking ${MANPAGE_P}.tar.bz2"
+		tar -xf "${DISTDIR}/${MANPAGE_P}.tar.bz2" || die
+		eend ${?}
 	fi
 }
 
@@ -282,7 +284,7 @@ multilib_src_install_all() {
 	if ! use doc; then
 		# (doman does not support custom paths)
 		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-		doins "${WORKDIR}/${P}-manpages/llvm"/*.1
+		doins "${WORKDIR}/${MANPAGE_P}/llvm"/*.1
 	fi
 
 	docompress "/usr/lib/llvm/${SLOT}/share/man"
diff --git a/sys-devel/llvm/llvm-9.0.1_rc2.ebuild b/sys-devel/llvm/llvm-9.0.1_rc2.ebuild
deleted file mode 100644
index 656ecf1927e8..000000000000
--- a/sys-devel/llvm/llvm-9.0.1_rc2.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils llvm.org multilib-minimal multiprocessing \
-	pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	exegesis? ( dev-libs/libpfm:= )
-	gold? (
-		|| (
-			>=sys-devel/binutils-2.31.1-r4:*[plugins]
-			<sys-devel/binutils-2.31.1-r4:*[cxx]
-		)
-	)
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	gold? ( sys-libs/binutils-libs )"
-BDEPEND="
-	dev-lang/perl
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	kernel_Darwin? (
-		<sys-libs/libcxx-$(ver_cut 1-3).9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="${RDEPEND}
-	!sys-devel/llvm:0"
-PDEPEND="sys-devel/llvm-common
-	gold? ( >=sys-devel/llvmgold-${SLOT} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	use doc || return 0
-
-	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# User patches + QA
-	cmake-utils_src_prepare
-}
-
-# Is LLVM being linked against libc++?
-is_libcxx_linked() {
-	local code='#include <ciso646>
-#if defined(_LIBCPP_VERSION)
-	HAVE_LIBCXX
-#endif
-'
-	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
-
-	[[ ${out} == *HAVE_LIBCXX* ]]
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	if is_libcxx_linked; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		mycmakeargs+=(
-			-DLLVM_VERSION_SUFFIX="libcxx"
-		)
-	fi
-
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use doc && mycmakeargs+=(
-			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-		use gold && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
-		[[ -x "${tblgen}" ]] \
-			|| die "${tblgen} not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DLLVM_TABLEGEN="${tblgen}"
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
-	newenvd - "10llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-9.0.1_rc3.ebuild b/sys-devel/llvm/llvm-9.0.1_rc3.ebuild
deleted file mode 100644
index 656ecf1927e8..000000000000
--- a/sys-devel/llvm/llvm-9.0.1_rc3.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-utils llvm.org multilib-minimal multiprocessing \
-	pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	exegesis? ( dev-libs/libpfm:= )
-	gold? (
-		|| (
-			>=sys-devel/binutils-2.31.1-r4:*[plugins]
-			<sys-devel/binutils-2.31.1-r4:*[cxx]
-		)
-	)
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	gold? ( sys-libs/binutils-libs )"
-BDEPEND="
-	dev-lang/perl
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	kernel_Darwin? (
-		<sys-libs/libcxx-$(ver_cut 1-3).9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-	${PYTHON_DEPS}"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="${RDEPEND}
-	!sys-devel/llvm:0"
-PDEPEND="sys-devel/llvm-common
-	gold? ( >=sys-devel/llvmgold-${SLOT} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	use doc || return 0
-
-	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# User patches + QA
-	cmake-utils_src_prepare
-}
-
-# Is LLVM being linked against libc++?
-is_libcxx_linked() {
-	local code='#include <ciso646>
-#if defined(_LIBCPP_VERSION)
-	HAVE_LIBCXX
-#endif
-'
-	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
-
-	[[ ${out} == *HAVE_LIBCXX* ]]
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	if is_libcxx_linked; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		mycmakeargs+=(
-			-DLLVM_VERSION_SUFFIX="libcxx"
-		)
-	fi
-
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use doc && mycmakeargs+=(
-			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-		use gold && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
-		[[ -x "${tblgen}" ]] \
-			|| die "${tblgen} not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DLLVM_TABLEGEN="${tblgen}"
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
-	newenvd - "10llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/multilib-gcc-wrapper/Manifest b/sys-devel/multilib-gcc-wrapper/Manifest
index 8825d4001c9c..031bf9380fe1 100644
--- a/sys-devel/multilib-gcc-wrapper/Manifest
+++ b/sys-devel/multilib-gcc-wrapper/Manifest
@@ -1,2 +1,2 @@
-EBUILD multilib-gcc-wrapper-0-r2.ebuild 1626 BLAKE2B ab4bd4350d728560c72f58f136d38e69760299509ac090c3b25256f8aab94dbf2aac1932ae1904e4ed20177e109371c51d1413c1e0d92e6ed3034c6b6f1e683b SHA512 196c0d1205f49cdbb38ffc808856786b815b27aaeefe450266ae9bb0e3b388bca70c3d3fa35f93e6e3ba599e347f947673db80253bc6733d68003657623cd0b1
+EBUILD multilib-gcc-wrapper-0-r2.ebuild 1641 BLAKE2B 286c1fd2a017aca555cfca438a9e5e8bebf594feee84dafaf4b540e5f221d2259d6c5f068706505b118aca08b43d860c3fd6fb734fb6e097de6459efe22b8341 SHA512 4a5c1185aec72424f2474d380d18cc2a49e006b0377cd63f83918d1eb5959d3a3bbbdb144efbd6559e10c1b36d873c1c3c3ef984349c6525ce6afd48386650b5
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild
index 369fcd4b8bd8..c12a4c8cfac9 100644
--- a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild
+++ b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,9 @@ EAPI=7
 inherit multilib
 
 DESCRIPTION="Wrappers for gcc tools to be used on non-native CHOSTs"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
+S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
@@ -16,8 +17,6 @@ IUSE=""
 
 RDEPEND="sys-devel/gcc:="
 
-S=${WORKDIR}
-
 src_install() {
 	local host_prefix=${CHOST}
 	# stolen from sys-devel/gcc-config
@@ -26,7 +25,7 @@ src_install() {
 		cpp cc gcc c++ g++ f77 g77 gcj gcjh gdc gdmd gfortran gccgo
 	)
 
-	cd "${EROOT%/}"/usr/bin || die
+	cd "${ESYSROOT}"/usr/bin || die
 	shopt -s nullglob
 
 	# same as toolchain.eclass