gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /sys-devel
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
45 files changed, 1413 insertions, 1091 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8c36be43a4ff..22e364496cc2 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index c6ab05e38a2b..717f4a04f595 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -8,11 +8,6 @@ AUX automake-1.14-gzip-fix.patch 2689 BLAKE2B 589f5261936f1d54f1345dccc284381373
 AUX automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch 3015 BLAKE2B a0a7afb76c8cd8a5dce60bcb0a7a59a7957bcfe2b70f541889d5677005f4c9a295cf0459eaf4626314ce75031716028fe0a91db00f416e2aef8d17d8e31009d0 SHA512 34a061b72993290ac9fbf7957da89d0ed0ded70f304db0983ffff557887434dba01f5ca40cfd13dccfc648af7ade9b94d45895bac33dd560d550e3f1b24b6a55
 AUX automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch 3672 BLAKE2B e967579e81e3da85c9a5026a829be9dae93fd7d452c67bf94383787a7e7b46b62ba605112f3aaa5b4ee38d06727320ab8df017fc0b3a957e8fe0ba8e91883d52 SHA512 cfb9a11d82641b4f5b8e43d6a97fc20d012ce9ba6c4ab5fa3bae8c33da980867e3bad35229fbd5f2d811cfd849b275e83ecd0b80d25cff78695f700ebfc92cdc
 AUX automake-1.15-perl-escape-curly-bracket.patch 1129 BLAKE2B deb9f842d4d0fd8735e7da0a8344a8c48521097db06cf8c37705046dfdeedc913fcc8fe9c462a7f0dc9089f2548fdfb86a26e19edeb966d3d769a396faca3fae SHA512 d6c2078e7eebd4e5104e7c9d9b5623cab322689b520e28b788a0e6fc52d795ef24e246f72ada9be6aae7d4904e34e4a6f2b6dc94abb3ed70b338d89985ed2164
-AUX automake-1.16.1-py3-compile-test.patch 561 BLAKE2B 7ba3bc95d4077b4bd92ccb7e4e98cacf54e485c593bdc496472491e41512191ec9eeb8c3a515f9e1473554bc8738e5635d24a0d689bf7cc128e0c7d768c651b3 SHA512 3d2fb3dc642203d05e0b0b6ae997e8912cda667063d8c79641d0d1a32e4d8feba1611c176087800fec07f6d9898e5981823568fff22d3d38b60b7313c4ea10d3
-AUX automake-1.16.1-py3-compile.patch 2043 BLAKE2B a7bee250f6dfb9281ca6b448b2f9774db724f7bb4eaa24dfac1950ba26cc0ed9ca9fa596fc64fa90b6cabd71ff16d131ebaf0a5c1b622edc10de623bd28485c6 SHA512 52fee603a6c825f7deb1d0759d2ce5a8e45d8d9c73de74beca84e10fb3af6873e4e66670831ed13cfe1c202e7bbe7154d00777e3582bab47cfb22acd6f26145e
-AUX automake-1.16.1-py3-no-pyo-files.patch 6197 BLAKE2B 4de9f40d7bcf77602678ffe72a7c58d41bb0b82e142d2d289f3336623360e2d2565cffffc8f5b344821385fc11094f4a5bd873e3b0194393bcf6a2c8c67e613f SHA512 93a04a654cf3b036b40df72dbf47270b022ca2638a0b9dd8ada7b5f853fcb4f4ff4a22fd34d2d8e4c13c80cb3983813f52a5770de99b9da17a4837059cc56a5a
-AUX automake-1.16.1-py3-pep3147-cmdline.patch 599 BLAKE2B 0bdd6885e8856905b1389facf2792f6e4752a2c16e3b478e05ad897ce9e58f0ff61b160065dcc18bad28c13cd1e8d42948681f600ae9e68ff7e8c9d5b2f8f6b8 SHA512 eea764c559e03a6d5788745e33a5aa153664107451a3ec1164621a2cb69ddcf30bf81de76b9b8f40896f8a0d5406a02fe638d4d47aeb68226c5599a7ca87147c
-AUX automake-1.16.1-py3-pep3147.patch 1565 BLAKE2B d1de92c94bd37b439e09003f27729c892c6ed7d807c70d6774f9bb0379a771059c1816c4a4fea3e88717223fdec557d20df914211e62e9e2d009339344c39df8 SHA512 f8a22e014123dffb442786a1f18f0623ed3b4fcb6b90649607c2ceb7f8ce0423181a83f9f15a575cc8e1408f812349ea3c33e89028c0e5714a152cfbdbdd742a
 AUX automake-1.16.2-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de981e56c633b6993db5bc7fc1c84f9be002018d4dd25c13bbc36ef7378940680b3c73a559100134e2356e7d626cdc24d91497e644e8e27268a1 SHA512 41d0d797cf25f2e080a57f57bee041cc02ea9e0a7f1ee8aa55af112f43e02c58b867d778b79d82b909d13c55ac0326718f1716947c9022e035e4631d7dbe85a0
 AUX automake-1.16.2-fix-py-compile-basedir.sh-test.patch 985 BLAKE2B 9a07629d107316ed765990ef2e1356a16dfb6231829315bab704dc7fdb4716dce9320eef4baaef3ab76db2908b9071c4cb35c6607be8b984896b2cfbcdb8b474 SHA512 22c1db04dcb71a6d1519c0d54e18c40f0ad5d4ada82edf606c8c0da6a3fb6dadcd7ec5289da2373b17c063211cb1ef6c85b5a6a7e355f906ca660bc402ce184b
 AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19fc8acd47ee0ba01882d1ff18c1a15592ef68b9c3debb61df78a31f238938a93ca4dc281b358b588727864673b09b11167131 SHA512 3bb9769d37b02e89373612752f127c582f948347a6f54e8b24dba262e14ca860e8fa507d96c0d51f0d64587371b9da17eb270dd5b7695091181731e35e5b9c2d
@@ -48,7 +43,6 @@ DIST automake-1.12.6.tar.xz 1400336 BLAKE2B b1d9befdda70f9caab881c1159921ea883a7
 DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02 SHA512 c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3
 DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69
 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
-DIST automake-1.16.1.tar.xz 1534936 BLAKE2B 0a3b42375361ff3c07e861eb2974fa094f8e76e4c6fcad02d6413402d201506b1cd660a187ffa1d2b29d8955ef60088f7b07d96405d803895b593b35b78f443a SHA512 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3
 DIST automake-1.16.2.tar.xz 1545912 BLAKE2B 88e12fc7792c1a3a9c3b9095760145c2ebf3799602320efe5885a0cac16ced2cfb95865abf0a96b6969aa4652eb2b3d2ac8dae550d721392be45fc10c2458b67 SHA512 a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b
 DIST automake-1.16.3.tar.xz 1590708 BLAKE2B ab6001a1b09e171ec83bac07155a77ab0fc29f5185116616aa3080b27e8bbf759472cd0dfb75630b26f7ad8d0741e668662d00b370ef79cf5ef6c62e945c94da SHA512 7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa
 DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e
@@ -63,8 +57,6 @@ EBUILD automake-1.12.6-r2.ebuild 2420 BLAKE2B 0f8f42975c78c92fb942c3c446608854fd
 EBUILD automake-1.13.4-r2.ebuild 2642 BLAKE2B f986fc77516d8aeafc93a897769c3e0a72a6b88e6f7b871dd8aaf647393888087157d040ffe76c6b9436f824ae23a9a05e602506f4e8aa531722510d2e47d08a SHA512 2225b6dce8dda4e27ffdd386afd7c599f11aeaa345f6b44b67a8fc25f53cbeccb00564679df20b4543262475e391a8f41a88645179a7245242e928324c0cd1db
 EBUILD automake-1.14.1-r2.ebuild 3021 BLAKE2B 6a02c815643edde1d0aec03aea5e1b7005585c0a0bee7734b434c09a27efcb231ae72c885d8c38d023e8a00975cde796d95c4520e5333ffc63b43558384349b1 SHA512 3fad414923f4808aca91d51704b128ba2fffda5482b3a579dfeaa90cb2795fe238d3e1a4168732581481eb09074e01ba3e9ec7a79fae16c2ca901e3ac2bf386f
 EBUILD automake-1.15.1-r2.ebuild 3191 BLAKE2B eb8fec381047cc9de2c56d40f7c80d9bedb06649de82b5231a926ae3361c7d2537ec16e6f79fcc8194de4943c2f445a2cc23afe36c3780608ee82f249c9750ba SHA512 905cf0ec6ee9f411d4bf8ca262c8002e04b346c4b2a241005d9eecfb0b38e3050add4d5cb678ab7d332bd39e46881cfd5f695c998dc465346b2d13380b6d3566
-EBUILD automake-1.16.1-r1.ebuild 2909 BLAKE2B f4b9697d3523305d82bfb49b2d6127c1747b6888e3d40e7b8c56e5b1d578dbe717a7efbfa8233a44341fef69302a97b0e175d3f7bfe74cc50e8b49fe5e82a6c7 SHA512 170cc166b4b916dd2fccc8c79fcf02b7089bedfae9ef9eeee6b2b5d31a12518237bb69ffa118b0816531f74b91e2e1ffda68b25db191517e41f9eb8e376dd17d
-EBUILD automake-1.16.1-r2.ebuild 3599 BLAKE2B 6285f60341e38267cf0e95149c9be2b8d7f09b076b65b8a8a99edb17245e2dab59358f291857494eb8904cfec946a8f0de884a29452e152c525cc97cd856d830 SHA512 f5b8cb4fb6e6b45206858b4a957cce7f6e4ac28e000a491152ba1f17e90e5fac4ce142da55cc73272d6e9e9315641f8bdce6c090e65d9e98b84b897b235a5449
 EBUILD automake-1.16.2-r1.ebuild 3537 BLAKE2B 8d3e14fa06291bb5de7216d00620a94dbec7981d01fa3a3fb726ed2d7fab41c53a94d7d85b2d6df34b296da74d59e326a5dc7999389fc23731e7664129125e9d SHA512 bad0df18cfe350ef0e90b797b847d52ac7f97a37fadfe3f11a5793c2dba61f349ceb878a6ed424fec8389025b56c9a3fff332de74d7ec9d7f1b131131479f8e6
 EBUILD automake-1.16.3-r1.ebuild 3474 BLAKE2B e8913e0a640a1bb8b41a926ea0fa7b790c054356f6b3d3c29fc6dfbc350ea030c3cb6fc4b605a4f9a8238847936da19c2c7c3ba1464f66bc91b2860712c8a041 SHA512 24ec3e2cfa2f35243aae8a55c9c485748610691f003df2dee0a2f1140696f4a58f8612e2f3bb12a7d94574af9ccd7574bb240e954b82e8a724e0a4879ca5383a
 EBUILD automake-1.4_p6-r2.ebuild 2469 BLAKE2B f631fc0d87edf6cef1a8a07f0417fd72df8229fdaeca66f2f85944cb00fa3f6dfba73cd20df88ab2fe6fbe268473d8dffd6ac203980d4e241988ad3084ce9271 SHA512 ff05eabeb5baf5d8415b3e8c87e462e1c3f5b3a46a4910f9c0216746e6794739947c98515251b722dfbce51cb12868f4dcc247deac924371bf504a7b35fb4c96
diff --git a/sys-devel/automake/automake-1.16.1-r1.ebuild b/sys-devel/automake/automake-1.16.1-r1.ebuild
deleted file mode 100644
index cd16023c5dca..000000000000
--- a/sys-devel/automake/automake-1.16.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	if [[ ${PV/_beta} == ${PV} ]]; then
-		MY_P=${P}
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	else
-		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
-		MY_P="${PN}-${MY_PV}"
-
-		# Alpha/beta releases are not distributed on the usual mirrors.
-		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	fi
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-11
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
-	sys-apps/help2man"
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	# Don't try wrapping the autotools this thing runs as it tends
-	# to be a bit esoteric, and the script does `set -e` itself.
-	./bootstrap || die
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-
-	# Bug 628912
-	if ! has_version sys-apps/texinfo ; then
-		touch doc/{stamp-vti,version.texi,automake.info} || die
-	fi
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || die
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-}
diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
deleted file mode 100644
index 563dd100f04b..000000000000
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit python-any-r1
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	if [[ ${PV/_beta} == ${PV} ]]; then
-		MY_P="${P}"
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	else
-		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
-		MY_P="${PN}-${MY_PV}"
-
-		# Alpha/beta releases are not distributed on the usual mirrors.
-		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	fi
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/perl
-	>=sys-devel/automake-wrapper-11
-	>=sys-devel/autoconf-2.69:*
-	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/gzip
-	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=(
-	"${FILESDIR}"/automake-1.16.1-py3-compile.patch
-	"${FILESDIR}"/automake-1.16.1-py3-no-pyo-files.patch
-	"${FILESDIR}"/automake-1.16.1-py3-pep3147.patch
-	"${FILESDIR}"/automake-1.16.1-py3-pep3147-cmdline.patch
-	"${FILESDIR}"/automake-1.16.1-py3-compile-test.patch
-)
-# All patches have been submitted upstream.
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	export WANT_AUTOCONF=2.5
-	# Don't try wrapping the autotools this thing runs as it tends
-	# to be a bit esoteric, and the script does `set -e` itself.
-	./bootstrap || die
-	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
-
-	# Bug 628912
-	if ! has_version sys-apps/texinfo ; then
-		touch doc/{stamp-vti,version.texi,automake.info} || die
-	fi
-}
-
-# slot the info pages.  do this w/out munging the source so we don't have
-# to depend on texinfo to regen things.  #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
-}
-
-src_install() {
-	default
-
-	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
-	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
-
-	# remove all config.guess and config.sub files replacing them
-	# w/a symlink to a specific gnuconfig version
-	local x
-	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} \
-			/usr/share/${PN}-${SLOT}/config.${x}
-	done
-
-	# Avoid QA message about pre-compressed file in docs
-	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
-	if [[ -f "${tarfile}" ]] ; then
-		gunzip "${tarfile}" || die
-	fi
-}
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch b/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch
deleted file mode 100644
index bd5a6759c292..000000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN automake-1.16.1.orig/t/py-compile-basedir.sh automake-1.16.1/t/py-compile-basedir.sh
---- automake-1.16.1.orig/t/py-compile-basedir.sh	2020-01-20 05:07:12.915260159 +0100
-+++ automake-1.16.1/t/py-compile-basedir.sh	2020-01-20 05:07:45.827074984 +0100
-@@ -42,7 +42,7 @@
-   py_installed "$d2/$f.pyc"
-   py_installed "$d2/sub/$f.pyc"
-   files=$(find "$d2" | grep '\.py[co]$')
--  test $(echo "$files" | wc -l) -eq 4
-+  test $(echo "$files" | wc -l) -eq 4 -o $(echo "$files" | wc -l) -eq 6
-   case $d2 in
-     .|..) rm -f $files;;
-        *) rm -rf "$d2";;
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch b/sys-devel/automake/files/automake-1.16.1-py3-compile.patch
deleted file mode 100644
index bbb08454763e..000000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d3edb7e0f3a5553b1ed919e566ec8c41022251a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 3 Nov 2019 11:51:19 +0100
-Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- lib/py-compile | 27 +++++++++++++++++++++++++--
- 1 file changed, 25 insertions(+), 2 deletions(-)
-
-diff --git a/lib/py-compile b/lib/py-compile
-index 1a3f4d644..44be97fc4 100755
---- a/lib/py-compile
-+++ b/lib/py-compile
-@@ -140,7 +140,7 @@ $PYTHON -O -c "
- import sys, os, py_compile, imp
- 
- # pypy does not use .pyo optimization
--if hasattr(sys, 'pypy_translation_info'):
-+if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000:
-     sys.exit(0)
- 
- files = '''$files'''
-@@ -154,7 +154,30 @@ for file in files.split():
-     sys.stdout.write(file)
-     sys.stdout.flush()
-     if hasattr(imp, 'get_tag'):
--        py_compile.compile(filepath, imp.cache_from_source(filepath, False), path)
-+        py_compile.compile(filepath, imp.cache_from_source(filepath), path)
-+    else:
-+        py_compile.compile(filepath, filepath + 'o', path)
-+sys.stdout.write('\n')" 2>/dev/null || :
-+
-+$PYTHON -OO -c "
-+import sys, os, py_compile, imp
-+
-+# python<3.5 does not have split files for -O and -OO
-+if sys.hexversion < 0x03050000:
-+    sys.exit(0)
-+
-+files = '''$files'''
-+sys.stdout.write('Byte-compiling python modules (-OO versions) ...\n')
-+for file in files.split():
-+    $pathtrans
-+    $filetrans
-+    if not os.path.exists(filepath) or not (len(filepath) >= 3
-+                                            and filepath[-3:] == '.py'):
-+	    continue
-+    sys.stdout.write(file)
-+    sys.stdout.flush()
-+    if hasattr(imp, 'get_tag'):
-+        py_compile.compile(filepath, imp.cache_from_source(filepath), path)
-     else:
-         py_compile.compile(filepath, filepath + 'o', path)
- sys.stdout.write('\n')" 2>/dev/null || :
--- 
-2.23.0
-
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch b/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch
deleted file mode 100644
index 0d2ff91b620e..000000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From: Lukas Fleischer
-Subject: python tests: Do not require .pyo files
-Date: Sun, 20 May 2018 17:28:52 +0200
-
-As of Python 3.5, but unoptimized and optimized bytecode are stored
-within .pyc files; .pyo files are no longer generated. Update the Python
-tests such that the test do not fail if .pyo files are missing.
-
-Source: https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00002.html
-Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-
-* t/py-compile-basedir.sh: Remove all .pyo checks.
-* t/py-compile-basic.sh: Likewise.
-* t/py-compile-destdir.sh: Likewise.
-* t/py-compile-option-terminate.sh: Likewise.
-* t/python-virtualenv.sh: Likewise.
-* t/python10.sh: Likewise.
-* t/python12.sh: Likewise.
-* t/python3.sh: Likewise.
----
- t/py-compile-basedir.sh          |  2 --
- t/py-compile-basic.sh            |  3 ---
- t/py-compile-destdir.sh          | 12 +++++-------
- t/py-compile-option-terminate.sh |  5 -----
- t/python-virtualenv.sh           |  4 ----
- t/python10.sh                    |  6 ------
- t/python12.sh                    |  3 +--
- t/python3.sh                     |  1 -
- 8 files changed, 6 insertions(+), 30 deletions(-)
-
-diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
-index 6921d16d5..9f927d066 100644
---- a/t/py-compile-basedir.sh
-+++ b/t/py-compile-basedir.sh
-@@ -40,9 +40,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do
-   ./py-compile --basedir "$d" "$f.py" "sub/$f.py"
-   find "$d2" # For debugging.
-   py_installed "$d2/$f.pyc"
--  py_installed "$d2/$f.pyo"
-   py_installed "$d2/sub/$f.pyc"
--  py_installed "$d2/sub/$f.pyo"
-   files=$(find "$d2" | grep '\.py[co]$')
-   test $(echo "$files" | wc -l) -eq 4
-   case $d2 in
-diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
-index 24df600cb..4c5cf57aa 100644
---- a/t/py-compile-basic.sh
-+++ b/t/py-compile-basic.sh
-@@ -61,10 +61,7 @@ mkdir -p 1/_/2/_/3/_
- 
- ./py-compile foo.py sub/bar.py 1/_/2/_/3/_/0.py
- py_installed foo.pyc
--py_installed foo.pyo
- py_installed sub/bar.pyc
--py_installed sub/bar.pyo
- py_installed 1/_/2/_/3/_/0.pyc
--py_installed 1/_/2/_/3/_/0.pyo
- 
- :
-diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
-index 07aa1f44f..d2ccafee5 100644
---- a/t/py-compile-destdir.sh
-+++ b/t/py-compile-destdir.sh
-@@ -34,13 +34,11 @@ echo 'def bar (): return "bar"' > $destdir/sub/bar.py
- 
- find $destdir # For debugging.
- st=0
--for x in c o; do
--  for b in foo sub/bar; do
--    f=$(pyc_location -p "$destdir/$b.py$x")
--    test -f "$f"
--    strings "$f" || : # For debugging.
--    $FGREP $destdir $f && { echo BAD: $f; st=1; }
--  done
-+for b in foo sub/bar; do
-+  f=$(pyc_location -p "$destdir/$b.pyc")
-+  test -f "$f"
-+  strings "$f" || : # For debugging.
-+  $FGREP $destdir $f && { echo BAD: $f; st=1; }
- done
- exit $st
- 
-diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh
-index 1aaeec21b..80ae55a88 100644
---- a/t/py-compile-option-terminate.sh
-+++ b/t/py-compile-option-terminate.sh
-@@ -27,17 +27,12 @@ cp "$am_scriptdir/py-compile" . \
- : > ./--foo.py
- ./py-compile -- -o.py --foo.py
- py_installed ./-o.pyc
--py_installed ./-o.pyo
- py_installed ./--foo.pyc
--py_installed ./--foo.pyo
- rm -f ./-*.py[co]
- : > x.py
- ./py-compile x.py -o.py --foo.py
- py_installed ./x.pyc
--py_installed ./x.pyo
- py_installed ./-o.pyc
--py_installed ./-o.pyo
- py_installed ./--foo.pyc
--py_installed ./--foo.pyo
- 
- :
-diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
-index 3bcd6ec76..7f9708866 100644
---- a/t/python-virtualenv.sh
-+++ b/t/python-virtualenv.sh
-@@ -124,10 +124,8 @@ check_install ()
- 
-   test -f      "$py_site"/am_foo.py
-   py_installed "$py_site"/am_foo.pyc
--  py_installed "$py_site"/am_foo.pyo
-   py_installed "$py_site"/am_virtenv/__init__.py
-   py_installed "$py_site"/am_virtenv/__init__.pyc
--  py_installed "$py_site"/am_virtenv/__init__.pyo
-   test -f      "$py_site"/libquux.a
-   test -f      "$py_site"/am_virtenv/libzardoz.a
- }
-@@ -138,10 +136,8 @@ check_uninstall ()
- 
-   test ! -e          "$py_site"/am_foo.py
-   py_installed --not "$py_site"/am_foo.pyc
--  py_installed --not "$py_site"/am_foo.pyo
-   test ! -e          "$py_site"/am_virtenv/__init__.py
-   py_installed --not "$py_site"/am_virtenv/__init__.pyc
--  py_installed --not "$py_site"/am_virtenv/__init__.pyo
-   test ! -e          "$py_site"/libquux.a
-   test ! -e          "$py_site"/am_virtenv/libzardoz.a
- }
-diff --git a/t/python10.sh b/t/python10.sh
-index 4def103ff..9c7a46175 100644
---- a/t/python10.sh
-+++ b/t/python10.sh
-@@ -60,27 +60,21 @@ cwd=$(pwd) || fatal_ "getting current working directory"
- $MAKE install
- test -f            "$inst/your/two.py"
- py_installed       "$inst/your/two.pyc"
--py_installed       "$inst/your/two.pyo"
- py_installed --not "$inst/my/one.py"
- py_installed --not "$inst/my/one.pyc"
--py_installed --not "$inst/my/one.pyo"
- $MAKE uninstall
- py_installed --not "$inst/your/two.py"
- py_installed --not "$inst/your/two.pyc"
--py_installed --not "$inst/your/two.pyo"
- 
- ../configure --prefix=$cwd/"$inst" one=1
- $MAKE install
- py_installed --not "$inst/your/two.py"
- py_installed --not "$inst/your/two.pyc"
--py_installed --not "$inst/your/two.pyo"
- test -f            "$inst/my/one.py"
- py_installed       "$inst/my/one.pyc"
--py_installed       "$inst/my/one.pyo"
- $MAKE uninstall
- py_installed --not "$inst/my/one.py"
- py_installed --not "$inst/my/one.pyc"
--py_installed --not "$inst/my/one.pyo"
- 
- $MAKE disttest
- 
-diff --git a/t/python12.sh b/t/python12.sh
-index d998ae8ad..cca057e6d 100644
---- a/t/python12.sh
-+++ b/t/python12.sh
-@@ -44,11 +44,10 @@ $MAKE install DESTDIR=$destdir
- 
- # Perfunctory test that the files were created.
- test -f "$destdir/usr/share/my/my.py"
--pyo=$(pyc_location -p "$destdir/usr/share/my/my.pyo")
- pyc=$(pyc_location -p "$destdir/usr/share/my/my.pyc")
- 
- # If DESTDIR has made it into the byte compiled files, fail the test.
--st=0; $FGREP "$destdir" "$pyc" "$pyo" || st=$?
-+st=0; $FGREP "$destdir" "$pyc" || st=$?
- test $st -eq 1
- 
- :
-diff --git a/t/python3.sh b/t/python3.sh
-index 0008eadd7..131aeb48d 100644
---- a/t/python3.sh
-+++ b/t/python3.sh
-@@ -42,6 +42,5 @@ cd build
- $MAKE install
- py_installed inst/my/one.py
- py_installed inst/my/one.pyc
--py_installed inst/my/one.pyo
- 
- :
--- 
-2.17.0
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch b/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch
deleted file mode 100644
index 7ece18ebc300..000000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN automake-1.16.1.orig/t/instmany-python.sh automake-1.16.1/t/instmany-python.sh
---- automake-1.16.1.orig/t/instmany-python.sh	2018-02-26 21:38:28.000000000 +0100
-+++ automake-1.16.1/t/instmany-python.sh	2020-01-20 02:44:37.192352310 +0100
-@@ -21,7 +21,11 @@
- required='python'
- . test-init.sh
- 
--limit=2500
-+limit=3200
-+# Let's increase the number here a bit, otherwise the __pycache__ dirs
-+# make the test fail. I know this is a hack, but does anything conform
-+# to the POSIX limit of 4096 still anyway?
-+
- subdir=long_subdir_name_with_many_characters
- nfiles=81
- list=$(seq_ 1 $nfiles)
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch b/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch
deleted file mode 100644
index 545544d89feb..000000000000
--- a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Lukas Fleischer
-Subject: python: Properly uninstall __pycache__ in subdirectories
-Date: Sun, 20 May 2018 17:28:51 +0200
-
-When uninstalling __pycache__ files in a subdirectory "sub", the
-Makefile incorrectly removed the files from __pycache__/sub/ instead of
-sub/__pycache__/.
-
-* lib/am/python.am (uninstall-%DIR%PYTHON): Use the correct path when
-uninstalling byte-compiled files installed in '__pycache__'
-subdirectories.
-
-Source: https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00000.html
-Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org>
----
- lib/am/python.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff -ruN automake-1.16.1.orig/lib/am/python.am automake-1.16.1/lib/am/python.am
---- automake-1.16.1.orig/lib/am/python.am	2018-02-26 21:38:27.000000000 +0100
-+++ automake-1.16.1/lib/am/python.am	2020-01-19 05:35:01.212177206 +0100
-@@ -97,7 +97,7 @@
- if %?INSTALL%
- 
- ?FIRST?am__pep3147_tweak = \
--?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|'
-+?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc\n__pycache__/&.*.pyo|'
- 
- .PHONY uninstall-am: uninstall-%DIR%PYTHON
- uninstall-%DIR%PYTHON:
-@@ -116,7 +116,7 @@
- 	done; \
- ## This is somewhat tricky, because for newer pythons we have to take PEP-3147
- ## into account.  Avoid exceeding the command-line length limit.
--	dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \
-+	dir='$(DESTDIR)$(%NDIR%dir)'; \
- 	echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \
- 	  while read files; do \
- 	    $(am__uninstall_files_from_dir) || st=$$?; \
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 6582c8b8c0ed..98c115c5df99 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -7,7 +7,6 @@ DIST binutils-apple-patches-8.2-r1.tar.bz2 10830 BLAKE2B 345db8619873e9e91b79c3f
 DIST cctools-795.tar.gz 1993795 BLAKE2B dc0915f8647eecba5352e34dfc5752b679df39ead9a4734c49955a824d2cc127308eed46a614665dfe08a9d3036eb37f587e1b765a7df727facc42a33befacb0 SHA512 5a34a73dc71d3574a357f6b0f26a48a99dd0995d62695b309cdfe85c4960934b410455b1ba6bdbc9a4e32106bb45b35555604975d2a80ad1be21f5d4eac69254
 DIST cctools-895.tar.gz 1716126 BLAKE2B 9706a6b243518693888e5e21dfe8d83b217380b47db621a7f1b35105eb72fb8997353ff85133224b0856f6b6ec710f54a4fe79076d9e228f89c98b6f517de309 SHA512 4ef9db870385cc2c4263bcbe42ff0de80386771f5acbc7082a1818ecd6b8d7bb1bfa02a7fcfecd3e7281481aeaaac4c331359aca3564bfe7a4c7dea1e0d06126
 DIST cctools-949.0.1.tar.gz 1968671 BLAKE2B b38fbae5d2ec011a94c2e4ec299c1ecd173f2c2516664cf925b06aaa078e234b59068158ea29dfcbf763ca98c73bc1806a507fbbe49a8d4d0a2fd4e602f401ce SHA512 13c493a48852c980d2829d28616c18640ad5ebfe6acd55143c4c948665e0b65377a459560667074fdac5e69bb6360fea13d988303c49fd3dd4a58e9b5c54ebcb
-DIST darwin-xtools-8.2.1-r100.tar.gz 2934997 BLAKE2B d0324d47d3aa0afd0007fbbd16c74e046c643c645744cc7ef0535eeed275c2d61763a1c6708b3a0a796f0fc83e62b5e5fe907c62553b439bea750353cfac2f73 SHA512 7000bca61b1dc63d1d08a9bcf104dace4376c2656af0faddc28a7d6c3718dbe54713da96136091a2024a644eaf90758714d1e4eb3cfeec2df0e412d847f59c30
 DIST darwin-xtools-8.2.1-r101.tar.gz 3105898 BLAKE2B 3516cd252d4880b1e80c76365efef6f96830578bb5512befe33f86decdeb026fbad17fd3b27e9c3cf20d100897002e86ec08822041baa0291bb53e0b0ecf4d10 SHA512 f84cbde0853c14f03af40a124133d71d3e1710da021a593336eb4351c60edbca5753af0780f269ed4716cd194973f5437d428c5ff9615d9ce025dba3b7daef77
 DIST dyld-132.13.tar.gz 342690 BLAKE2B 011418ba5b91a28bb7c5f8188af2fac5478bad53581396b7c1c4623a854a8f0d5ecb92d023246157830ed2db83bbf28e23225a255188e2d07eeb6c933814bda6 SHA512 2c9d50fc32868b696d88730eb6ea6afa9bb9f56883cc2ea4f1d41f370f311b7487a29ce0eff6761e1eeb086a18e2513953989d8d5d3ef1043bb662e86baadd3f
 DIST dyld-421.2.tar.gz 625173 BLAKE2B 8f8325314861ae2ea10fbe78c74c7199b547973ac61a8e9cb76fb874a0e53395ea31c04e489f85ac7cfdb5715ae5051679453de75eb195e313113e7bbbc70340 SHA512 75f2fb840da980d44649aa3e045f50c4e37d4403fbdb1e2e5f1a85bf6d8859e1130053c3806f7ef992fdfc6573f7f18146263c690144bdd3df31452c6bdd8bd8
@@ -19,6 +18,5 @@ DIST libunwind-30.tar.gz 82811 BLAKE2B 26993d6afa6930931c01b579326964a66832ed7a6
 EBUILD binutils-apple-11.3.1-r1.ebuild 12061 BLAKE2B 8ab50ea0ebec56f3fa9aa6ef3a2b550b870119054d0533a283faaf8acc34bdf50cf36538ce73e99ec799688f084a671ebeb893548f97061c9f5a08151535d705 SHA512 e55d96d015321a987b3825a0cc500c4a639dd9d540e4e7158c9767ee1e8428c4bf49dc62c752e787de4a04b53d7cccce0a1242a3e4bc46b15b6fe3ade2499bc1
 EBUILD binutils-apple-3.2.6.ebuild 6926 BLAKE2B f21d41b62afb49a2aca002388c503797d61b3b92387098c8879982ef7eec9f77834ecdd99ff6e30c0fb9b2faad04edc67d484f5943d712f59578324e98334ed5 SHA512 048e828128b4436cdfe1df71ed01c686b5837327696533b455e38c28eab73cb395a1c40810e6d9c58e3224f6787275cbb32e569d13aa616be33833fda8124a9e
 EBUILD binutils-apple-8.2.1-r1.ebuild 11356 BLAKE2B b643a55991068539cc7f2f90095418efcb24a15fd07697044582c8726e08eb123daa867b689d23ed4be4c96a28ad09b6b362628c8a3d9b1012ba4705c874dd26 SHA512 1dabd8e789c0b6537c66680ce1b7df278aeae7d92164395f9b02706f842ac584e418c0ffa89dd24bf4809dc976a9be1fb51e18b9a9c8799145efedeb115d5153
-EBUILD binutils-apple-8.2.1-r100.ebuild 2537 BLAKE2B 8a9e04314b1142cc7ae234fc97a6a52a5a3b5afdecbf9438508ed6d46007491d67fb386152083e25ac24803618d86cdac4d55503b8ed3384a8a2b859d16fae8e SHA512 0dcb06454ff8e608e2009f66786fef30d31dfedaccf386071b208082566660f617c7f6ada73df627d5930979a8e50d7747177d39f03f8b99605d50c77537f977
 EBUILD binutils-apple-8.2.1-r101.ebuild 3339 BLAKE2B d96d586837d22920ef55bdd1a3041da0d93f3333ecc6ddcf2e7d5f64ecd7059d6e4c4498a4dfa7ed32597e7fd03f3eeea28d282cb33f916c2bfa5e56fe46c7a0 SHA512 d8823924681aa645f8976dec196cb1b5bb0a5336ae9edffc1807b7af9ba0efaa5618316f6ab27e9a4f922d926bdac317dd040bebc8ed2e48b961b74f29af5e04
 MISC metadata.xml 501 BLAKE2B 98bd13a9501faa366c3a7dd9eacea30192cd55429102d920df8722e2565eac472f2d814f09c5be5c437b86a5d404af797d521f0fc1fb4dba374e23af31fccf6a SHA512 026c997212e2bec4698613ad9f5517c5a4427d6da1cd8a8afe3d2f549edbe80f3a17d0c345961a9dbbdc730e8b6b33fdee97f66b3309095803ced0fb9202b899
diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
deleted file mode 100644
index 97ee1d43e54e..000000000000
--- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r100.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR=emake  # keep dependencies down
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="Darwin Xtools matching Xcode Tools ${PN}"
-HOMEPAGE="https://github.com/iains/darwin-xtools"
-SRC_URI="https://github.com/grobian/darwin-xtools/archive/gentoo-${PVR}.tar.gz -> darwin-xtools-${PVR}.tar.gz"
-
-LICENSE="APSL-2"
-SLOT="8"
-KEYWORDS="~ppc-macos ~x64-macos"
-IUSE="tapi"
-
-DEPEND="sys-devel/binutils-config
-	app-arch/xar
-	tapi? ( sys-libs/tapi )"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/darwin-xtools-gentoo-${PVR}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# make prunetrie a static archive, because the dynamic libs aren't
-	# installed, for there really are no consumers
-	# fixed for next release
-	sed -i -e '/add_library/s/prunetrie/& STATIC/' \
-		ld64/src/CMakeLists.txt || die
-}
-
-src_configure() {
-	CTARGET=${CTARGET:-${CHOST}}
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		if [[ ${CATEGORY} == cross-* ]] ; then
-			export CTARGET=${CATEGORY#cross-}
-		fi
-	fi
-
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/xtools-${PV}
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/xtools-${PV}
-	if [[ ${CHOST} != ${CTARGET} ]] ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/xtools-${PV}
-	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/xtools-${PV}
-	fi
-
-	is-host-64bit() {
-		case ${CTARGET} in
-			x86_64-*|powerpc64*)   echo YES   ;;
-			*)                     echo NO    ;;
-		esac
-	}
-
-	local mycmakeargs=(
-		-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}
-		-DPACKAGE_VERSION="Gentoo ${PN}-${PVR}"
-		-DCMAKE_INSTALL_PREFIX=${EPREFIX}${BINPATH%/*}  # cmake insists on /bin
-		-DCCTOOLS_LD_CLASSIC=NO  # fails to link, and is useless anyway
-		-DXTOOLS_LTO_SUPPORT=NO
-		-DXTOOLS_HAS_LIBPRUNETRIE=YES
-		-DXTOOLS_TAPI_SUPPORT=$(use tapi && echo ON || echo OFF)
-		-DXTOOLS_HOST_IS_64B=$(is-host-64bit)
-		-DXTOOLS_BUGURL="https://bugs.gentoo.org/"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# cmake insists on installing in /bin, so move bins to the place we
-	# want them
-	mv "${ED}${BINPATH%/*}/bin" "${ED}${BINPATH}" || die
-
-	keepdir "${LIBPATH}"
-
-	doman ld64/doc/man/man*/* cctools/man/*.[135]
-	dodir "${DATAPATH}"
-	mv "${ED}"/usr/share/man "${ED}/${DATAPATH}/" || die
-
-	cd "${S}"
-	insinto /etc/env.d/binutils
-	cat <<-EOF > env.d
-		TARGET="${CHOST}"
-		VER="xtools-${PV}"
-		FAKE_TARGETS="${CHOST}"
-	EOF
-	newins env.d ${CHOST}-xtools-${PV}
-}
-
-pkg_postinst() {
-	binutils-config ${CHOST}-xtools-${PV}
-}
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 19756270cef9..3e31469b43e6 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,8 +1,11 @@
 AUX bmake-20181221-fix-gcc10-fno-common.patch 575 BLAKE2B f8e767c442683332b258cb4df3cad965cc2cb2903ce404e6f0f923c6ff1135e3e51d28e3b1855fe0ac27e5db839ae117236ead9cf8fed3bef6706dff9754e56f SHA512 d6986497844239b7c67e721b76387c391a7bf71a7122dfa54aadbada6add5bf3d810aea0f8f119d47c76445266f90a2cc39bef23b398cb3ee396de6cefa0020b
 AUX bmake-20201117-tests.patch 425 BLAKE2B 55f487ddf626698b0b5de6fc37cb06ba90f1fdca6a43d63fc74429615ef27ab3ac74d0e073f7741cbc6b92f328e0a7b1b70c97a3e34d870525a1e8810b36d87f SHA512 7a6521e6a94cb71d8afdf231ca25958737ccc8daa8b3ec9e12cb4032804c7aeaecea9d4abbcd1289e477de349780da818fb862c4d13d324f0b0cd066916b47f2
+AUX bmake-20201222-tests.patch 670 BLAKE2B 869d70085b20d2a8f9eb2f28401b22beb4af3833fba85dab842efb57e4189f826f224fb10b8a70975eb5402bb2200418eed56daf537633d51be06db7a5b7a8ae SHA512 33f7caa47fc0401f3d3ce9546b3745728a8d59c2e09f2fadaef4a9a2ab881896f291b79cd13e5662743a1a2d93bfcd7a525f4d3b050312d000d11ead2fc674f5
 DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507
 DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588
+DIST bmake-20201222.tar.gz 727973 BLAKE2B cd093418c646e6b15e47f08c3c8e6a5daa5db2c9a1f76b4e8d639e0a50444ad518836585af7381bb2952309dd82716046a85e42121180133c9ccd546963a7748 SHA512 ddf1152adf99b350ae1ff1dd473319cd7c277c696f29b3ccba9080ecb9da0013f334b183c46a6e0a34708071a8f4f89d813264436e1946ebdc1923e6fe7440d9
 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
 EBUILD bmake-20200318.ebuild 1137 BLAKE2B 5ceb9e88fec798df6afebae8dd6534a95ee5a977369a52bd9dde1525c471a0fd838cd667e3c5c1d7ce3a29f6e9fc449c1cf011fe75cdbfd5a397410f99cf3860 SHA512 aab466bfc237621ba3f5f5840b93c4fef6b42464f0c302380dad7d3caee053ec7b6510136188ffed382a8017cb44f41e36155637e1d6d51c1ba0bd15faaaaccf
 EBUILD bmake-20201117.ebuild 1152 BLAKE2B 643222e719b1bc152f930c85c026a19077645e767d1b1256d72882beb1b271348c944d54e5433aa96f3364fd6204e341d2854f2b93dc0f6ed40d487cd588b475 SHA512 b06d919e2d9adff7d7a39498fd1a8e2fd231af83dcac3a358e751cdda1e47e247957465e785245ffd56d0cf1ddc5015c9e23a5be28d5d5a4855d8bb8b713f49f
+EBUILD bmake-20201222.ebuild 1153 BLAKE2B 1cb5132e060ae65c0afe2a4b14740172ae2f43be23d1ca93b60001fcd0901d227ad8170d5f11cd593bbcaa80f90375f79fdab656b89876bb5d3370add35b7fea SHA512 6d1eef0c8c9371350ccb28b95c11518f0413c9224e993bd94eb6bf1fa97a51da9662e85acaa353134ddb898d37710910a12a93b1223a2b5268d31f3fb241b20e
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-devel/bmake/bmake-20201222.ebuild b/sys-devel/bmake/bmake-20201222.ebuild
new file mode 100644
index 000000000000..547f81f91f68
--- /dev/null
+++ b/sys-devel/bmake/bmake-20201222.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MK_VER=20191111
+
+DESCRIPTION="NetBSD's portable make"
+HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
+SRC_URI="
+	http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
+	http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${PN}"
+
+# Skip failing test (sandbox and csh)
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_configure() {
+	econf \
+		--with-mksrc=../mk \
+		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
+		--with-machine_arch=${ARCH}
+}
+
+src_compile() {
+	sh make-bootstrap.sh || die "bootstrap failed"
+}
+
+src_test() {
+	cd unit-tests || die
+
+	# the 'ternary' test uses ${A} internally, which
+	# conflicts with Gentoo's ${A}, hence unset it for
+	# the tests temporarily.
+	env -u A MAKEFLAGS= \
+		"${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	FORCE_BSD_MK=1 SYS_MK_DIR=. \
+		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
+		|| die "failed to install mk files"
+}
diff --git a/sys-devel/bmake/files/bmake-20201222-tests.patch b/sys-devel/bmake/files/bmake-20201222-tests.patch
new file mode 100644
index 000000000000..9a5efb79246e
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20201222-tests.patch
@@ -0,0 +1,26 @@
+--- a/unit-tests/Makefile
++++ b/unit-tests/Makefile
+@@ -183,7 +183,6 @@ TESTS+=		dotwait
+ TESTS+=		envfirst
+ TESTS+=		error
+ TESTS+=		# escape	# broken by reverting POSIX changes
+-TESTS+=		export
+ TESTS+=		export-all
+ TESTS+=		export-env
+ TESTS+=		export-variants
+@@ -280,7 +279,6 @@ TESTS+=		sh-leading-plus
+ TESTS+=		sh-meta-chars
+ TESTS+=		sh-multi-line
+ TESTS+=		sh-single-line
+-TESTS+=		shell-csh
+ TESTS+=		shell-custom
+ .if exists(/bin/ksh)
+ TESTS+=		shell-ksh
+@@ -316,7 +314,6 @@ TESTS+=		var-op-append
+ TESTS+=		var-op-assign
+ TESTS+=		var-op-default
+ TESTS+=		var-op-expand
+-TESTS+=		var-op-shell
+ TESTS+=		var-op-sunsh
+ TESTS+=		var-recursive
+ TESTS+=		varcmd
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 36a41663417a..79777a998c3c 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,10 +1,12 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-common-10.0.1.ebuild 573 BLAKE2B a2e0ed9b70b470ade3c22d56ea097befd935702369dcb21b367f3baa95635e1edea1f62760ffe3b678a72410b8b20091167bc5c38d75350004f52b24d7497cae SHA512 da407fe94951d7b6edfe8a237d761bda0114a8e34fd3fe59933c4605851b6a414f9278204e6b7f83d3f6ac9334f80660a7733484b64291ad58c84364015585a4
 EBUILD clang-common-11.0.0.ebuild 580 BLAKE2B 3affe14fc54fa11d15701312b51cce47b18aee3dba3ac84004be1d6bb7c70229c6e606ba3c051e038d058d94b9da00ec2710597f945d9bd4eb5cca7c1fb6ee57 SHA512 22d04fb19dd7dc0e7469f920c8ae477680eede237b1e69664c5e1f5f649e4b0d214b38f07e7e3794828c6fd54fe6da8b604d4e64aea6e4e95ed79c6943ea58b3
 EBUILD clang-common-11.0.1.ebuild 586 BLAKE2B 695ae16044b48bb9718d7d2afd9e77b2da305599cd8138b0100ded12496a7a1ff49c038ed020582340ec16d309e52688698150f8a97553eaeda0c115c578a30b SHA512 aef092bacfe504ec8a081c5ea25c2c96ba8efaf0074afe2089a83f4f3091644694d62bcf6c92ec61d9533f5706d949927f20bdd45ef7f3faca086bfbb5cb440b
+EBUILD clang-common-11.1.0_rc1.ebuild 514 BLAKE2B 7b27ed67c1ec7fdaee393ebe4685597f1a982232ca452e4ecb54f5e6078ea44bd2c8a56d061bace32bfc81e7506edd3f12aa6e54bad4d9f80a8bad4165cbe6f8 SHA512 302824c98bc818f78992db66c1e3bc3881fd9466fef0b14ce165e13575a0b4643b7f868b4d8914f5ac40bddd6963f17f15b2f9488667882238dd4a10c2d0c2bb
 EBUILD clang-common-12.0.0.9999.ebuild 514 BLAKE2B fdd7858dc5690225fc806afe2f2c85f212546c443a5ee725df19b460507855392ec5639cf304d3fa00db199f9f141b841e198c9c853076332c55bfae6b9d9ae2 SHA512 7dac5188645661066ccab55b360e61cba561fc4ece7ab2974e31c4b41d2c110a6a75295f7ec6be9902e9e74fcb210e70c29c4baf0e8ee1c0fb6250084f465d2a
 EBUILD clang-common-9.0.1.ebuild 573 BLAKE2B a2e0ed9b70b470ade3c22d56ea097befd935702369dcb21b367f3baa95635e1edea1f62760ffe3b678a72410b8b20091167bc5c38d75350004f52b24d7497cae SHA512 da407fe94951d7b6edfe8a237d761bda0114a8e34fd3fe59933c4605851b6a414f9278204e6b7f83d3f6ac9334f80660a7733484b64291ad58c84364015585a4
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-11.1.0_rc1.ebuild b/sys-devel/clang-common/clang-common-11.1.0_rc1.ebuild
new file mode 100644
index 000000000000..03e4441b91b9
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-11.1.0_rc1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 27ac0b1c36e5..c978009ad268 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,6 +1,7 @@
 EBUILD clang-runtime-10.0.1.ebuild 685 BLAKE2B 175c35a6d7960eb40f49cfe3ecf42cd7c52aceb60591b83a81ef494b52ca08739cf06397fdd45fb0e782ae07dd506277826c816643a6f885a8d59d0b97c63123 SHA512 51e03c55059ada3ed7b7b26217c8184045aab8397bbb7172e0a5d9fe6c90b0369fdc91429a485bfda2fef08701a2ea8d9ba15b349438fd53470e37c28789ee23
 EBUILD clang-runtime-11.0.0.ebuild 692 BLAKE2B 5703e482af3e2983d4c7a5c6345fb33d2ec0e7bc68ec67b3a9346aa022819f1c324f766639f49828da6fe4e254a4986bdd60276766b8558a488ed9aecb9d75dd SHA512 ae9e43cf8f97366d8248f8587cec068c775f57d3daeaccd09f24ea337ed98dd7808507e8a6024225d8508301abd35f63a6723cdc83593176fc3affddd74fdf11
 EBUILD clang-runtime-11.0.1.ebuild 697 BLAKE2B 63a0a06a94e6166e01da2fddcee1e0d627a6fa43fe4ec80cae9cafa96cdbae99522e74eefc781e9cf9441752352b13e9d7e8963e1e556847001f6f715c06e726 SHA512 dc8c30f3ce306c18005609017ab693a41081198ce8f2759276c1e49b4ea4538a719e52c921cdc5dd6298c0159fbc19e4a83247bc5a75263654d31f2ef3873ce4
+EBUILD clang-runtime-11.1.0_rc1.ebuild 625 BLAKE2B a45dbed81c7f2414802077e5185c9015c85b02715d03ce6320f307855287ee90ef317760340b95770667f4ad5adcc55e9b8e37a80a1d93baf23304097c209c18 SHA512 949151ce8e3244fe4293c162deb918ee6bc41b98fceb977c53e68399c12c0f31e022c0b6d203f616313ff01c314a1ce57aef602a875fb999fdb7c9d512ec9ee8
 EBUILD clang-runtime-12.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-9.0.1.ebuild 685 BLAKE2B 175c35a6d7960eb40f49cfe3ecf42cd7c52aceb60591b83a81ef494b52ca08739cf06397fdd45fb0e782ae07dd506277826c816643a6f885a8d59d0b97c63123 SHA512 51e03c55059ada3ed7b7b26217c8184045aab8397bbb7172e0a5d9fe6c90b0369fdc91429a485bfda2fef08701a2ea8d9ba15b349438fd53470e37c28789ee23
 MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a
diff --git a/sys-devel/clang-runtime/clang-runtime-11.1.0_rc1.ebuild b/sys-devel/clang-runtime/clang-runtime-11.1.0_rc1.ebuild
new file mode 100644
index 000000000000..b83335d9b8c8
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-11.1.0_rc1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 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 )"
+
+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 e52fa9dc9f8c..68ac65da115a 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -9,10 +9,12 @@ DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-10.0.1.ebuild 11828 BLAKE2B e6ee6571b0be8983ea5d23acb899e562758a1cc6f28acc1e82d0b4d8cf5854262fb5f059abf0154e523c075f49ef804255a1ae106982276a1276fd9106d39da3 SHA512 c076072d0c3a1dc91b50dc58af34a0d274217f2d3b138c5fcdeda5e0d669511c1cc5dc3ef2b2332e9bc5b6d8660520def5f03dfb8890c1d7a4701e2915b122ab
 EBUILD clang-11.0.0.ebuild 11810 BLAKE2B 2afbd9ccc9e2c444105f5cf2e490fcefcbbed19a12a4eed72bc46e1ac314fc7197c92e3abb1d570e0ab9684e3f8872dbe5741102bdd9a6f03db0821a4737498c SHA512 5e2884a6518c0b40691e495bcb0fe6beefdfabb08ba9cd946e3a4b220c7bee5539910a818940c41dff823297fa847b08f58251f615cbed78f825d5a2a1cde67a
-EBUILD clang-11.0.1.ebuild 11848 BLAKE2B de9b1ea670f71b3aa3cb2ff1f42c86f0587c1a5def505cdd05af121530ab85733a0d9a0ea65b59e8e4624b3346fefed8145b59c8ee62b7af8e5528b63d75eb81 SHA512 1c40d8d85d744f96a1feabd54213037a64aa0e47a9e344a8e03a7cd3a194144b758f47c615c5af1749b0e13907790f4dd7a0b55b604bb92b492fad210fb197c1
-EBUILD clang-12.0.0.9999.ebuild 11715 BLAKE2B 75971e9e6be8c56992c5acf528ce12f5de88bee8444995c91c3d322bc4b1d4346130639c265017520198640bd8d8be1f89ee0c61cbaae2ac4461cb4ca4ad8df1 SHA512 320ded433b9ec7081c3d52a50f418217548f4736285ae89cbf083d1a15240a21f514f55cec2893b42efd66a3f5905aabaa8c9cd1c06fe77725a0a1ff67f6d997
+EBUILD clang-11.0.1.ebuild 11816 BLAKE2B c4379d10895759b37a4ca67904e1e1308ec0c18260742f7c69eefdf33a1e6674db7e1597812c6494757d0c608b71e7d8bbf2efd417d3637239c2a6cf68262436 SHA512 13644fd2158b0562704486ef1410b3ddffc7c7270169ca5ca2820b3d530508a94c9a9eb49163543f7305518a6a19189f1db9f979147df01988c383160c4375a1
+EBUILD clang-11.1.0_rc1.ebuild 11748 BLAKE2B 44f40ceac2062412e612e9fe1b6fd188c222e3574230dbef89010a8d597a6bbb3ba7b77ce0cb8996b4324e11d7923394153eb28f170c05c3d1decf641ff86b81 SHA512 d8b01b51eb3136918cc25dda73b7382583da7856a2aaf515a4d25b8d2b2b2224c3a623a23e7b249c604a000e4b4627069b83ad3580ee153dcfb48188f6f2ddb8
+EBUILD clang-12.0.0.9999.ebuild 11683 BLAKE2B e0e15552782b787b60aa6e73ea9dd852223b66a82fbd86d780123912d64ebb629726f47ab01c2b0e18f6000989c6916faf446ba710378b98d7899af17770626e SHA512 baf0bf3c97f0658e9b36b6e7e50fe8714c8c9e351e5a94976919261ec70de8b933b71650467a6182afc16f3b448092a4b3ec2d444d18114cd1b4cef8f743136c
 EBUILD clang-9.0.1.ebuild 9020 BLAKE2B 7c5f8d85d4c6c4d1541c14ff36f2b93ebd553b3ff11e1c9d90dc6eb406b9a7f4072ec08d508cad4efebdfc0d622750a0cba8b24a21b8a053ccabac99bfa750e5 SHA512 6eb0b5558982ad0c43b9478f4ca25c4aadc7a7ed0e4cabd0b918b75613e7d3fac88c0cd09d1616fa88618b7b5b5783b35d3a5b9b9a3b2f7366863aac738e2743
 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-11.0.1.ebuild b/sys-devel/clang/clang-11.0.1.ebuild
index 888329bcd7f4..37692daa7397 100644
--- a/sys-devel/clang/clang-11.0.1.ebuild
+++ b/sys-devel/clang/clang-11.0.1.ebuild
@@ -40,8 +40,7 @@ for x in "${ALL_LLVM_TARGETS[@]}"; do
 done
 unset x
 
-DEPEND="${RDEPEND}
-	test? ( sys-libs/compiler-rt )"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-3.16
 	doc? ( dev-python/sphinx )
diff --git a/sys-devel/clang/clang-11.1.0_rc1.ebuild b/sys-devel/clang/clang-11.1.0_rc1.ebuild
new file mode 100644
index 000000000000..2062b13c19e6
--- /dev/null
+++ b/sys-devel/clang/clang-11.1.0_rc1.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+	RDEPEND+="
+		${x}? ( ~sys-devel/llvm-${PV}:${SLOT}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )"
+
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_MANPAGES=build
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+PATCHES=(
+	"${FILESDIR}"/9999/prefix-dirs.patch
+)
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	mv ../clang-tools-extra tools/extra || die
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Frontend/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# headers for clang-tidy static library
+					clang-tidy-headers)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-clang-man
+				docs-clang-tools-man
+			)
+		fi
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			# normally copied from LLVM_INCLUDE_DOCS but the latter
+			# is lacking value in stand-alone builds
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/clang/clang-12.0.0.9999.ebuild b/sys-devel/clang/clang-12.0.0.9999.ebuild
index 8ebb9ceea5ec..8825b6aafaab 100644
--- a/sys-devel/clang/clang-12.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-12.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,8 +40,7 @@ for x in "${ALL_LLVM_TARGETS[@]}"; do
 done
 unset x
 
-DEPEND="${RDEPEND}
-	test? ( sys-libs/compiler-rt )"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-util/cmake-3.16
 	doc? ( dev-python/sphinx )
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 27aa7fc21e60..306703d89176 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -35,7 +35,7 @@ EBUILD gcc-11.0.0_pre9999.ebuild 511 BLAKE2B c439da4d9eaf4512ac7ad516a2ce726e08a
 EBUILD gcc-6.5.0-r3.ebuild 436 BLAKE2B 8b219613160b1d152efeebae97d56e1110473c31949b6c09b9f721afc36c765a8a499fe1ab43ec5e115197f4b9ec3f73cd6cff2d7716993a93353b8556bb5115 SHA512 b83c39a6a99971a0bc4f3ab57b5bc8c5477a1da8fb82a6b56a0dec1e0225761dbdd080606e6abf4b06d56a9b39e766ebac8b347ae56c535f7bf2a381212530ba
 EBUILD gcc-7.5.0-r1.ebuild 447 BLAKE2B b7465ed897cd3f2c0716e7fc1fe384dd93de4f29a090948857af9cbb04af1acee54557a2185e08852efb63ece42f72bf0c6289ac63f059d31bf32936bcb3dead SHA512 73b7cd1af8c1a45e0303085b95f8fa25831af50ad9999d7268847c970af9ece183dd68334bb0b57a153c8e4ed4ca3baa93c61a4ee6376bbaa944dfd529dd9bdd
 EBUILD gcc-8.4.0-r1.ebuild 443 BLAKE2B 7263728f3a730bcba73bb779ab11b4951f1171be0a0c0f2dc0efa3299e33cb0880c33d53672d369c2266816aa8f165b0d0295fa66c7fd92779ab80846428640a SHA512 2ea31641f37460d7951767780868c7e4b582531f7e0a0a732f5ce4d981a559b3f0750dd51c8dfc91154da9e4205114353ad883df35b9910d361bccaceaeb5711
-EBUILD gcc-8.4.0-r2.ebuild 452 BLAKE2B a08af9f8f55166a07894145a6d53a4c6988b9a419e95386e28f6875d6a81a6a02db25a051506c981e17c68846056a919697cad6f5ee3461b4f3167777974921d SHA512 1991ba970e5e56eda9a8e1391514de8028ed6741b379375d23ae3e13f267203cdd29ac0aee9f8faf8dc6a42c0291095521257886c77bea64159665f0ebb00c1a
+EBUILD gcc-8.4.0-r2.ebuild 451 BLAKE2B 60cfc227c950d02feec23f57b7eae142484fd5fe6f2a8eb18b4d7e0dd925bd87497eddcfd902e00bcd86877b8e7b0fe9e6ba6ab4da4ad091f03260621e7b5d08 SHA512 61da3282a50732e724ba5a75103dfa31374b8203a5c58ab469d2de4fa14befc5e5ae845c5d4794ec30b2adfe5fba86abebe30532ecd3469160c6da26b2979e6c
 EBUILD gcc-9.3.0-r1.ebuild 443 BLAKE2B 0f43c582049ee55a5627d2a05e6dec513b4078d57e322fcadcc917056e840db4bd58dab264f068135569c0f06baf75e95d43302e89b2caf4bf4dac420e052872 SHA512 4efda3a2cbf371a688bfecb74369e7215dec1d5e8b72612f13a50644a884e738842f8ea25aa6800931c39bf0571c8f494972f413cc187b967f9b7a533a4237ad
 EBUILD gcc-9.3.0-r2.ebuild 447 BLAKE2B 21486596a97d2b46ac76e3f669927fc6ab936fd1ef7ba90b6eeae67880ea68f9fecb19b6fdf8c1e8f8fbcfd7df7c8a6f7e3c353ec3160bbdbcec48cdcf2406e2 SHA512 edc497faaa3e5793e7a90b2e3561b56dd9f60bd5bf742d36154b374755db45667b42e000d37cb62df792bd1586ed309fe42197bb43b2a48043d654ccfa635e99
 MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df
diff --git a/sys-devel/gcc/gcc-8.4.0-r2.ebuild b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
index 576f5446974d..7de031d31f4a 100644
--- a/sys-devel/gcc/gcc-8.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 6c58719d49d5..01e75c39c9c3 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,9 +1,5 @@
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
-AUX gdb-9.1-ia64.patch 305 BLAKE2B 06201f81db7b3b8059e818bf263fd1090927b3d23bda3d00891c751c62abe0faedc8a21acd4d97a6bcb0e397f31287b343e01627552c4e3df7fd8635e6b8d39b SHA512 e8219d0dccd192b47daab7de6ec8010ec39192225f29df0443bf54969dd6c39b59889a539a5a9ec0519c512377242a4311f3f3ba4dbbd9d8685ca5e617056ef8
-AUX gdb-9.2-sim-ppc-fno-common.patch 2581 BLAKE2B 56115a341ffefada00997bdba890dcf065b315c50e4ccf8f5cd8ccca5fd496b64ce0049819f6fd2bace42bb6391b4a9e1e9578ff233286a09704b67d5bb960d8 SHA512 ae2610ed3ce7c55526979fa9157aff7a46b008bf66b1a304e37c4ce20be74bc762de44a464238c37e0652e7c4bb5915f62c355d1a522d71b22a5819c13ce6e3d
 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
-DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274
 EBUILD gdb-10.1.ebuild 7469 BLAKE2B 63e5171252340a76a3981b9eb33acec060b1adc3774848b131b8b04ba3ead8317dfc7e7a1efd2a286bb7a41355d9a326b05774966cb81984ddad126eb8e77991 SHA512 c239e036e77044c50881181f176b2c243a28cfba92e3e0235c85385ae3d125a258a8ae029208b8db47048ba63ee7da485750598c6f6fac8556d8857858377e8b
-EBUILD gdb-9.2.ebuild 7450 BLAKE2B b8221d0500d8449f154e6d7a721984a81027344cc0a1fac5da00edd62120f1df1502833241c2f7bf0a67d4af554ca37ee579eb2d935d54a985a09363a3ed2583 SHA512 9bccab2de9081ad42ad2ffb05b67ebb8c09f43e5d86d9946eb194689fe5c81f3e2b97211fede00e9d22cd6640eff1bf56f43e26584de98634df8ce2e4cae5c84
 EBUILD gdb-9999.ebuild 7477 BLAKE2B bdf5877a262946d8e98f573e6477b3c1610203c001a582ccad3e91df02f198c673a2cd2626bf21a5d78755dd0422ced81bccaa0f2d6ae7af97776e4e3a793269 SHA512 24107459db353cd31ef54e8b1f77786f56beb07c51dd9f712dd79d16a3fae471933aa55850d5533bb6ec93c8aa8201c076a0220ae6b81df570090f45649bd0cb
 MISC metadata.xml 1185 BLAKE2B 524a340429b56430dcebf53fb141336f5c7b785865a9b2f407c548a79b0babb60b7771687a41a048d2877ced1d81ce2ab0e602bc8745abe01cce4d3baff48ea7 SHA512 cbd91ca72a0284fdb5b848af05f05f7e6895f68a35ecabe841c0b3d32aade02cc46f2bcc13c6a6a991097500487666410fff51959b38e278e1adc21d5691b01f
diff --git a/sys-devel/gdb/files/gdb-9.1-ia64.patch b/sys-devel/gdb/files/gdb-9.1-ia64.patch
deleted file mode 100644
index 49a21e4cdd29..000000000000
--- a/sys-devel/gdb/files/gdb-9.1-ia64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://sourceware.org/pipermail/gdb-patches/2020-May/168808.html
-
---- a/gdb/ia64-linux-nat.c
-+++ b/gdb/ia64-linux-nat.c
-@@ -21,6 +21,7 @@
- #include "defs.h"
- #include "inferior.h"
- #include "target.h"
-+#include "gdbarch.h"
- #include "gdbcore.h"
- #include "regcache.h"
- #include "ia64-tdep.h"
--- 
-2.26.2
-
diff --git a/sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch b/sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch
deleted file mode 100644
index 76b29649ad2e..000000000000
--- a/sys-devel/gdb/files/gdb-9.2-sim-ppc-fno-common.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-https://bugs.gentoo.org/738272
-https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0
-
-From ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 Mon Sep 17 00:00:00 2001
-From: Sebastian Huber <sebastian.huber@embedded-brains.de>
-Date: Wed, 1 Jul 2020 19:29:55 +0200
-Subject: [PATCH] sim/ppc: Fix linker error with -fno-common
-
-GCC 10 enables -fno-common by default.  This resulted in a multiple
-definition linker error since global variables were declared and defined
-in a header file:
-
-  ld: ld-insn.o:sim/ppc/ld-insn.h:221: multiple definition of
-  `max_model_fields_len'; igen.o:sim/ppc/ld-insn.h:221: first defined here
-
-sim/ppc
-
-	* ld-insn.h (last_model, last_model_data, last_model_function,
-	last_model_internal, last_model_macro, last_model_static):
-	Delete.
-	(max_model_fields_len, model_data, model_functions,
-	model_internal, model_macros, model_static, models): Declare, but do not
-	define.
-	* ld-insn.c (last_model, last_model_data, last_model_function,
-	last_model_internal, last_model_macro, last_model_static,
-	max_model_fields_len, model_data, model_functions,
-	model_internal, model_macros, model_static, models): Define.
----
- sim/ppc/ld-insn.c | 18 ++++++++++++++++++
- sim/ppc/ld-insn.h | 24 +++++++-----------------
- 3 files changed, 38 insertions(+), 17 deletions(-)
-
---- a/sim/ppc/ld-insn.c
-+++ b/sim/ppc/ld-insn.c
-@@ -28,6 +28,24 @@
- 
- #include "igen.h"
- 
-+static model *last_model;
-+
-+static insn *last_model_macro;
-+static insn *last_model_function;
-+static insn *last_model_internal;
-+static insn *last_model_static;
-+static insn *last_model_data;
-+
-+model *models;
-+
-+insn *model_macros;
-+insn *model_functions;
-+insn *model_internal;
-+insn *model_static;
-+insn *model_data;
-+
-+int max_model_fields_len;
-+
- static void
- update_depth(insn_table *entry,
- 	     lf *file,
---- a/sim/ppc/ld-insn.h
-+++ b/sim/ppc/ld-insn.h
-@@ -200,25 +200,15 @@ extern insn_table *load_insn_table
-  table_include *includes,
-  cache_table **cache_rules);
- 
--model *models;
--model *last_model;
-+extern model *models;
- 
--insn *model_macros;
--insn *last_model_macro;
-+extern insn *model_macros;
-+extern insn *model_functions;
-+extern insn *model_internal;
-+extern insn *model_static;
-+extern insn *model_data;
- 
--insn *model_functions;
--insn *last_model_function;
--
--insn *model_internal;
--insn *last_model_internal;
--
--insn *model_static;
--insn *last_model_static;
--
--insn *model_data;
--insn *last_model_data;
--
--int max_model_fields_len;
-+extern int max_model_fields_len;
- 
- extern void insn_table_insert_insn
- (insn_table *table,
--- 
-2.28.0
-
diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild
deleted file mode 100644
index 78740b7e1b64..000000000000
--- a/sys-devel/gdb/gdb-9.2.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-case ${PV} in
-9999*)
-	# live git tree
-	EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-	inherit git-r3
-	SRC_URI=""
-	;;
-*.*.50.2???????)
-	# weekly snapshots
-	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
-	;;
-*)
-	# Normal upstream release
-	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
-		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
-	;;
-esac
-
-PATCH_VER=""
-PATCH_DEV=""
-DESCRIPTION="GNU debugger"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
-"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	|| ( client server )
-"
-
-# ia64 kernel crashes when gdb testsuite is running
-# hppa kernel crashes when gdb testsuite is running
-RESTRICT="
-	hppa? ( test )
-	ia64? ( test )
-
-	!test? ( test )
-"
-
-RDEPEND="
-	client? (
-		dev-libs/mpfr:0=
-		>=sys-libs/ncurses-5.2-r2:0=
-		>=sys-libs/readline-7:0=
-		lzma? ( app-arch/xz-utils )
-		python? ( ${PYTHON_DEPS} )
-		xml? ( dev-libs/expat )
-		sys-libs/zlib
-	)
-	source-highlight? (
-		dev-util/source-highlight
-	)
-	xxhash? (
-		dev-libs/xxhash
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	client? (
-		virtual/yacc
-		test? ( dev-util/dejagnu )
-		nls? ( sys-devel/gettext )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${PN}-9.1-ia64.patch
-	"${FILESDIR}"/${P}-sim-ppc-fno-common.patch
-)
-
-GDB_BUILD_DIR="${WORKDIR}"/${P}-build
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	strip-linguas -u bfd/po opcodes/po
-}
-
-gdb_branding() {
-	printf "Gentoo ${PV} "
-	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
-		printf "p${PATCH_VER}"
-	else
-		printf "vanilla"
-	fi
-	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
-}
-
-src_configure() {
-	strip-unsupported-flags
-
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# gnulib's or gdb's configure.
-		--disable-dependency-tracking
-
-		--with-pkgversion="$(gdb_branding)"
-		--with-bugurl='https://bugs.gentoo.org/'
-		--disable-werror
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{binutils,etc,gas,gold,gprof,ld}
-	)
-	local sysroot="${EPREFIX}/usr/${CTARGET}"
-	is_cross && myconf+=(
-		--with-sysroot="${sysroot}"
-		--includedir="${sysroot}/usr/include"
-		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
-	)
-
-	if use server && ! use client ; then
-		# just configure+build in the gdbserver subdir to speed things up
-		cd gdb/gdbserver
-		myconf+=( --program-transform-name='' )
-	else
-		# gdbserver only works for native targets (CHOST==CTARGET).
-		# it also doesn't support all targets, so rather than duplicate
-		# the target list (which changes between versions), use the
-		# "auto" value when things are turned on.
-		is_cross \
-			&& myconf+=( --disable-gdbserver ) \
-			|| myconf+=( $(use_enable server gdbserver auto) )
-	fi
-
-	if ! ( use server && ! use client ) ; then
-		# if we are configuring in the top level, then use all
-		# the additional global options
-		myconf+=(
-			--enable-64-bit-bfd
-			--disable-install-libbfd
-			--disable-install-libiberty
-			# Disable guile for now as it requires guile-2.x #562902
-			--without-guile
-			# This only disables building in the readline subdir.
-			# For gdb itself, it'll use the system version.
-			--disable-readline
-			--with-system-readline
-			# This only disables building in the zlib subdir.
-			# For gdb itself, it'll use the system version.
-			--without-zlib
-			--with-system-zlib
-			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
-			$(use_with xml expat)
-			$(use_with lzma)
-			$(use_enable nls)
-			$(use_enable source-highlight)
-			$(use multitarget && echo --enable-targets=all)
-			$(use_with python python "${EPYTHON}")
-			$(use_with xxhash)
-		)
-	fi
-	if use sparc-solaris || use x86-solaris ; then
-		# disable largefile support
-		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
-		myconf+=( --disable-largefile )
-	fi
-
-	# source-highlight is detected with pkg-config: bug #716558
-	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
-
-	mkdir "${GDB_BUILD_DIR}" || die
-	pushd "${GDB_BUILD_DIR}" || die
-		ECONF_SOURCE=${S}
-		econf "${myconf[@]}"
-	popd
-}
-
-src_compile() {
-	emake -C "${GDB_BUILD_DIR}"
-}
-
-src_test() {
-	emake -C "${GDB_BUILD_DIR}" check
-}
-
-src_install() {
-	if use server && ! use client; then
-		emake -C "${GDB_BUILD_DIR}"/gdb/gdbserver DESTDIR="${D}" install
-	else
-		emake -C "${GDB_BUILD_DIR}" DESTDIR="${D}" install
-	fi
-
-	if use client; then
-		find "${ED}"/usr -name libiberty.a -delete || die
-	fi
-
-	# Delete translations that conflict with binutils-libs. #528088
-	# Note: Should figure out how to store these in an internal gdb dir.
-	if use nls ; then
-		find "${ED}" \
-			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
-			-delete || die
-	fi
-
-	# Don't install docs when building a cross-gdb
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
-		local f
-		for f in "${ED}"/usr/share/man/*/* ; do
-			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
-				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
-			fi
-		done
-		return 0
-	fi
-	# Install it by hand for now:
-	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
-	# Only install if it exists due to the twisted behavior (see
-	# notes in src_configure above).
-	[[ -e "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay ]] && dobin "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay
-
-	if use client ; then
-		docinto gdb
-		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
-			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
-	fi
-	docinto sim
-	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
-	if use server ; then
-		docinto gdbserver
-		dodoc gdb/gdbserver/{ChangeLog,README}
-	fi
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-
-	# gcore is part of ubin on freebsd
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		rm "${ED}"/usr/bin/gcore || die
-	fi
-
-	if use python; then
-		python_optimize "${ED}"/usr/share/gdb/python/gdb
-	fi
-}
-
-pkg_postinst() {
-	# portage sucks and doesnt unmerge files in /etc
-	rm -vf "${EROOT}"/etc/skel/.gdbinit
-
-	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
-		ewarn "gdb is unable to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 8e15e4098bf2..f3e903ea7eab 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,7 +1,7 @@
-AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1736 BLAKE2B 291ba73c850f1a53cbb0f64da20447d6c9adb9652d994d50eb2052b385253b8d4083277f5b5aa70f9fba75aadc517755d7ef0c880d62cbb87032bae84d9760f7 SHA512 851d52019749cc8fe2c34a53326cd68acae2269274e283a96a4a90b0e630552c8f13b8199f74a8b26c62afabee7631eeed5f56381a84ec99980d59f443270b28
-DIST gnuconfig-20190912.tar.bz2 58742 BLAKE2B 2d5eba2d966d8b6bb18ba9340031c3f3b96fddad7cb156103620bc8fff3d4824b3acf63e0f9046f389cbd9ce2b88348bdddd123134ca910ce18641001943e9e7 SHA512 346ab0e8938052b66b733b0251c5e1cb8d7a61e89630cebcf0039295c5a3652db0798e62b3ec44743c0ccee72d75270dc82fec43e97912c140ac0267a81f6115
+AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1756 BLAKE2B f53d7a968df0d995988f84364f669595beb06d9919d628f37b25b54ddf6757a76b9630e78a6ae89293a7de70e0bda70b6a677c0cec4849f884228c73f4af6ba8 SHA512 151c0c7c0bfca5c4e7d1dd3c39659e29c0ed1ae49d84e8782793201cb92626111637315393e0b6217bd2ccb2126cfdf9c0ac9e238e70c43f2068510aaa885f30
 DIST gnuconfig-20200621.tar.bz2 58729 BLAKE2B 8be2ff224620d0d93f676951ec8dcc7a4f1bfdfcb83e2e07371aa6fdf2f08a8d0e8503aecdd55954a0246f0d4119f31b24d60d461500db07757b061c89914df4 SHA512 25778100cb6b47a4ffa8a1875d3109a8b304bf3984549b53e2cbc1e31222aa9614ce01d34451cf6545af62b843378ab217d3396535ed4389ff3e8a7ddaa948ff
-EBUILD gnuconfig-20190912.ebuild 1517 BLAKE2B 82a7537439fbdeb3ace78fafc9e80bf560f53525eeac244a9f47e4c5e56f278ca3409af531d2c03888ef5d85f23d8941733ecc5091b6190868b2571e96837831 SHA512 e43e3e9a76283436feb0314345ceee5196f1270aa8f49acfc088c440757cc436e979ad860c229a7be481b363fc229d31afbad2643ed7d8ee17c5440204705d3b
+DIST gnuconfig-20210107.tar.xz 65944 BLAKE2B 209952ca349c9859b695df5a4f8b49df689cba47b439e715108cb66ccef7ec3742162113a2ee4948a85a96b44c45d4d553f9e41c15823403f451fea6ea61bd36 SHA512 e1485b7b719994441f49b18a88f922405f74aff2ba1df16050802a311fb5438e598d989fdb7fa008734e5ec0e567e7e90486f8bc6655787bc053ad8a89650213
 EBUILD gnuconfig-20200621.ebuild 1517 BLAKE2B 82a7537439fbdeb3ace78fafc9e80bf560f53525eeac244a9f47e4c5e56f278ca3409af531d2c03888ef5d85f23d8941733ecc5091b6190868b2571e96837831 SHA512 e43e3e9a76283436feb0314345ceee5196f1270aa8f49acfc088c440757cc436e979ad860c229a7be481b363fc229d31afbad2643ed7d8ee17c5440204705d3b
-EBUILD gnuconfig-99999999.ebuild 1526 BLAKE2B 36610a808e91e131eac0dd4e5d4f34e9c60abe98d1c926adcc7e33f227dcc5c328c0667f5a3e69cca16994522f1c2543dd389cda45d9f1baabfc22015c41e3df SHA512 1e299991e20a555d89c4b33a1f3c27376ea4a799a94dc6e1736c82baed638c4810da1cf7162bf2f018d43999a10dbc3de1dae7e881b172500f9ac2ba1d1f7d20
+EBUILD gnuconfig-20210107.ebuild 1553 BLAKE2B bc2f456a181c77614397facda57c6446f37f58d7409ce3d1257edaebba3c9349a29b7032baf982cbad20b65352374ab54c5829ee2e547b0d111c6e0ceed5d38d SHA512 08daacfbb59a08f982c5c23eeaa2dec936bb2156ac35ceb296d53b22c8f8bf551a1e35e950fa35a2d645dc2c9d87c9fb9d02a2ecb4d8760ffab2bee7688ba2c8
+EBUILD gnuconfig-99999999.ebuild 1547 BLAKE2B 44509931d0293e5fab7a2701f383078f722298225efd8134a84a5c7a8a39a4e32af9608f8c3ecef0c5c0f65064f04f270faafa945f584814e10fd0969bcdedb0 SHA512 b2e00604fa9dfd5259422a2c79de46ea498281648372d5ea1a048461140325c49bfcf14742f3da3b723f56eb7aef6379b5be9275b9f032e281b2404f1ba296a3
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch
index 83c259b2b1ef..a95e7ad3d5d8 100644
--- a/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch
+++ b/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch
@@ -1,4 +1,4 @@
-From d5899b457d3215db991761e57aa4e091e4b24f28 Mon Sep 17 00:00:00 2001
+From f1a763afa41654e25cbf73aae5ed56ca0909be63 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Thu, 9 Oct 2008 15:51:35 -0400
 Subject: [PATCH] add ps2 targets to config.sub
@@ -10,12 +10,12 @@ standing shortcut for the i386-ibm-aix target.
  1 file changed, 23 insertions(+), 2 deletions(-)
 
 diff --git a/config.sub b/config.sub
-index a318a4686850..837d23369163 100755
+index b0f8492..4d89efe 100755
 --- a/config.sub
 +++ b/config.sub
-@@ -810,6 +810,27 @@ case $basic_machine in
+@@ -813,6 +813,27 @@ case $basic_machine in
  		vendor=atari
- 		os=mint
+ 		basic_os=mint
  		;;
 +	mipsEE* | ee)
 +		cpu=mips64r5900el
@@ -41,7 +41,7 @@ index a318a4686850..837d23369163 100755
  	news-3600 | risc-news)
  		cpu=mips
  		vendor=sony
-@@ -1172,7 +1193,7 @@ case $cpu-$vendor in
+@@ -1174,7 +1195,7 @@ case $cpu-$vendor in
  			| bfin | bpf | bs2000 \
  			| c[123]* | c30 | [cjt]90 | c4x \
  			| c8051 | clipper | craynv | csky | cydra \
@@ -50,15 +50,15 @@ index a318a4686850..837d23369163 100755
  			| e2k | elxsi | epiphany \
  			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
  			| h8300 | h8500 \
-@@ -1359,7 +1380,7 @@ case $os in
+@@ -1715,7 +1736,7 @@ case $os in
  	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
  	     | interix* | uwin* | mks* | rhapsody* | darwin* \
  	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
 -	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
 +	     | storm-chaos* | tops10* | tenex* | tops20* | its* | irx* \
- 	     | os2* | vos* | palmos* | uclinux* | nucleus* \
- 	     | morphos* | superux* | rtmk* | windiss* \
+ 	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+ 	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
  	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
 -- 
-2.19.1
+2.30.0
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild b/sys-devel/gnuconfig/gnuconfig-20210107.ebuild
index d47b32a1ba7c..e95a3aeabb3e 100644
--- a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20210107.ebuild
@@ -8,8 +8,8 @@ if [[ ${PV} == "99999999" ]] ; then
 
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
 
@@ -23,13 +23,14 @@ IUSE=""
 maint_pkg_create() {
 	cd "${S}"
 
+	make ChangeLog || die
 	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
 	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
 
 	cp "${FILESDIR}"/${PV}/*.patch . || die
 
-	local tar="${T}/gnuconfig-${ver}.tar.bz2"
-	tar -jcf "${tar}" ./* || die "creating tar failed"
+	local tar="${T}/gnuconfig-${ver}.tar.xz"
+	tar -Jcf "${tar}" ./* || die "creating tar failed"
 	einfo "Packaged tar now available:"
 	einfo "$(du -b "${tar}")"
 }
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index 0e97c0cc521c..1032fedf8e00 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
 
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
@@ -23,13 +23,14 @@ IUSE=""
 maint_pkg_create() {
 	cd "${S}"
 
+	make ChangeLog || die
 	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
 	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
 
 	cp "${FILESDIR}"/${PV}/*.patch . || die
 
-	local tar="${T}/gnuconfig-${ver}.tar.bz2"
-	tar -jcf "${tar}" ./* || die "creating tar failed"
+	local tar="${T}/gnuconfig-${ver}.tar.xz"
+	tar -Jcf "${tar}" ./* || die "creating tar failed"
 	einfo "Packaged tar now available:"
 	einfo "$(du -b "${tar}")"
 }
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 46bf2bcb3b4d..c75720d624af 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,10 +1,12 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B 1c55c1e99e5e8bedbc1e3ab1b8159ee04e9128f7ddecc2fcb1800e12c62c1543cf16f9fc016eada3773c263f7a86c5199ead1f75d28db9126c6df3de6a9f0fba SHA512 9d22766d1b5915fade4ed73e1a5ba1eeb276d1cca640ba13d76502cf58025e03a96c4c162bbdfa328a29bc612d954771249300fe4724614b910b97f5313693c3
 EBUILD lld-11.0.0.ebuild 1396 BLAKE2B f57f7373326fee82fd0816e61ac0c4c45a2efac0cd4261b545c751d023f9986bd36be88e3afda9bee7a8d7b226577e0494fd11236a6683ea9ea2bad7f457efbf SHA512 57c50fd9b83a26dfdfb1732867a74264905241f77d31acf1a82e7b3ef09c4867105ec0ce99dc45b3373bd45285c043858f9befc167c44a8d0f25fa3cd89bce29
 EBUILD lld-11.0.1.ebuild 1404 BLAKE2B 0823eb53ad364ab1ac920a9dad28c2bcbd5acf8e0f8b04f6684b5133144e0dc86849c35ff8f56b72f3158f129443509772ba752b80f06517d2f3a5b7dea9a8ec SHA512 7f5c3b5a2c508af7c3f499c9afc525fe860f4e1b0438ce21717db5fccb051cc5e2502fc14739d48ba83c9188a2beb2a655459dbf8242172488fe3d4a12adb7a6
+EBUILD lld-11.1.0_rc1.ebuild 1367 BLAKE2B c43f70f1ca73cc07ef53dd7968f55c3b33888fa17d06286245decb3f9d2c67405fdac17a8c62511b2061118ab38e07affa9653c0090dfbb26ecc86947d20fb0a SHA512 470fa0b3b1dedc2f4d1065d2c313d893a9c0c1305844333cc6e413dcca6a3f77559d5e9b1befddcf6f030966e78052f56b1058f048e75b78be0846c2b028c498
 EBUILD lld-12.0.0.9999.ebuild 1777 BLAKE2B 69690e21b7c4a63f24b873ae13ab37f57f7b7a4c564be295ed185657508e5ca0fcf108a4f114506cdf793dfb3986f65bedfa3886a0d548827de172217718af01 SHA512 3aa55f77f6c966f6bdce54cade8c957b8ad6a5d3152c6cf1d104c145ea35536dc8ec577c81f476577028a7828eb6401323fe6deb5fcddbac2865f165f81294c3
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-11.1.0_rc1.ebuild b/sys-devel/lld/lld-11.1.0_rc1.ebuild
new file mode 100644
index 000000000000..d136465d213d
--- /dev/null
+++ b/sys-devel/lld/lld-11.1.0_rc1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)"
+
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
+
+src_install() {
+	cmake_src_install
+	# LLD has no shared libraries, so strip it all for the time being
+	rm -r "${ED}"/usr/{include,lib*} || die
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index c4b3be3be474..50e6b45e99e8 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,10 +1,12 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-common-10.0.1.ebuild 588 BLAKE2B cd416d913d8ef3f7abc35f4d4db088cb116ba1881b6ce10760ad6a7302b91cc128c560ddf9b7d4ba0acbbbf9c88f2fdc57ddb15e117254d4feec03a601a7fb24 SHA512 c0e63e8e0b26e33133aa0982b21fef306e3d07ad07a9d9e6046e5dbe782162ec8ec701064d0db1aa741d61b6146854cd1de2a352938e6b579be22a21dde753fe
 EBUILD llvm-common-11.0.0.ebuild 595 BLAKE2B 4c0f992968a6e624cbcd73b430b37fd0ff5c108e6af88b2edda0b94d1370b2857dec11140e14e6b949e6353412e9d50eac610f79ae80ac9a917e6db4754eb36f SHA512 56563e4388614da0e7b9efd0022a1da789db772dd593a3101d4d639677fa0217dc822aa602dce719b0ff547be8f102c1a42e1c05c2fee612f9cece2eec27d7a7
 EBUILD llvm-common-11.0.1.ebuild 601 BLAKE2B 570f3217864c54be4846d406b88c16ea8f8f7f8b11fccdd6dd81760cf7fe216cdd991cc5d090a59336bbb4d4eac448b15a809b14c7a248faaebede90cd42145b SHA512 8f85ddbabc6319c75f7e57f3a41d302db2cbcd215919682340d8a421f3117af509fb3c605d0bf79c57a76d226bab34f4ef392550dbe6dd5dd819294db6a7a23f
+EBUILD llvm-common-11.1.0_rc1.ebuild 529 BLAKE2B 1fb911ccad47efb5abf020ffb55999c598e2f3e3184f2aedf4083d99fd7b6c87370362f1bddfce76b3ed94da5bfa6df1bbc38161104dbd49892e0e5fe7f42169 SHA512 bbbde7b5ea8352ec4cb6953417b3f85374a0ad338aecb0794ff4557f9c58bc1974fbc1defb3c7be80adaca7184271b17a11bfc711dce269f4cee74b7a2c19ad7
 EBUILD llvm-common-12.0.0.9999.ebuild 529 BLAKE2B 07f65b41962ce9384c029cdd72ffaa7aa18afaf1d347a83b4cfc40442cc8e235720a423311ae0b8a208dc461288eb86f8962ea392c9e599dadd1902b12842bbe SHA512 68072c0ef398aac4b06e57c1b72fdb939fb055a4fbf18f702e2ab1e322e400d706582a42addad5dc307e955f1c010ab951c0a8cc4eaa74b4657290bc968a9723
 EBUILD llvm-common-9.0.1.ebuild 588 BLAKE2B cd416d913d8ef3f7abc35f4d4db088cb116ba1881b6ce10760ad6a7302b91cc128c560ddf9b7d4ba0acbbbf9c88f2fdc57ddb15e117254d4feec03a601a7fb24 SHA512 c0e63e8e0b26e33133aa0982b21fef306e3d07ad07a9d9e6046e5dbe782162ec8ec701064d0db1aa741d61b6146854cd1de2a352938e6b579be22a21dde753fe
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-11.1.0_rc1.ebuild b/sys-devel/llvm-common/llvm-common-11.1.0_rc1.ebuild
new file mode 100644
index 000000000000..53511a0a20e3
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-11.1.0_rc1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 91d974138f33..670b5eaf1bd3 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -1,6 +1,8 @@
 AUX llvm-roc-3.0.0-add_libraries.patch 648 BLAKE2B a201718b8afdc1ba18ae5d7e85a73fde7ca2bb163eecabab33d37c5815ac6ab8c4f8d960ab40f95ad6df95da626a439fbda1d20c25abb9558a37bcdf64a77e64 SHA512 7a1892c8781146830aa5bf69db20bbe7329634f469aeef0946232b15138b55d332491092ed00a4cf698033f19d8f279f4a5b34f13168d5b9ff7eba4a229e82a0
 AUX llvm-roc-3.7.0-current_pos.patch 1292 BLAKE2B 8481497e3f9c46c142034ae4c5455f94e79d9c10cc806945af64252043d46c558a3ba08078239a673937705edfd21ba85f618d1d3a5bff652d45efe4e1e70877 SHA512 6cd41988e4eb654b7040c238bef8fc10d8f5922bac9c0ba112c5ba1b57c769472d0b9deaea6822f2d6bbbfda0a27bed2c1df2bba93a79cb4bf08f24185843981
 AUX llvm-roc-3.9.0-tensorflow.patch 1901 BLAKE2B 2fc2d2d77987e8a85c14e1190645f0453f431a6d606336696549e518cf216a15818bc4117bec7c270161ef86f0e6770c63c9fda84e12f3c3334c9dd04fa5ffbf SHA512 151b2f0fc9fd7193fc0af0c088d70b2e36fda484228f3c911dbf1a6c6e836107a8e156a98585dd2ffb6faea0953a05d769e986d72def0f2f530bc3da5c5521d7
+AUX llvm-roc-4.0.0-hip-location.patch 1850 BLAKE2B 718472b6bf81c3727746bb6dfc166e3492f8f0f45f68f8b26e9f70711b20e64f0feef0e531aed9efbd4a36a2d63dc1b65668080541f842a499942e48edba2ad6 SHA512 61f2d9eebdb22bf693ce8d287f0d44393b9395a6fecf482cf30cb96d8612be679860453f07e045a689a45d7edc3cdcd5c0712fb700e67639b7e0e869ee64ed4d
+AUX llvm-roc-4.0.0-remove-isystem-usr-include.patch 1187 BLAKE2B ec9043f7358373822c3f6ce53d267192470dfbf03cf649a0964bd93b8b843db8e0a794fee8bbf292f882a6a908d0fa26a1303e4b13d92233d60b6b41c461ce9f SHA512 c3e9f96cb393f702cebe4da8a18495b492ae7cab7877576f3f2a4e6555f77c499dff6eded623305c6939ccd2cd00307e1b5ee28f2c34c9fd3128568dbe88c887
 DIST llvm-rocm-ocl-3.10.0.tar.gz 123600166 BLAKE2B 9b69dab6c7d1a8dfe0d90c76b54446ec7f8ef6e59c74ad328208ac07dbf8836ae412dc5c32fdcbfc926a2488e81cd8afef71c3ebca6cd8ff745205028ab380d8 SHA512 3bb7dac13d89cadfb61a231564155f49021437b7c35eae8735b88ceae4a23b7950643f17e3bfebb0868621297202a04d41120d50ea52b6ad8980dabe9bc75509
 DIST llvm-rocm-ocl-3.7.0.tar.gz 116973132 BLAKE2B c1cc8a3b95292d726626d3cb59ec1b96549682bfcbec16030e47cf1318c6ea01bc76f3349f012ce4f1e4d8b9fe192c51a025c2d08cf593622c61fe7c61969ba6 SHA512 0626075bedb3898c96c0bb0be7a2aba4662050a1c738115f661bedc03d744ace7a4581b55c6325060740c13a0e50e72e09272bb02c1186c2c4a40fc9b961dcbe
 DIST llvm-rocm-ocl-3.8.0.tar.gz 117004300 BLAKE2B 13c3213f0fb951fb9d574e8f6d76bb6c632fecadfe93dbe68a9720baa22e35aa3269deef8b533c5a5ff50a2c1ee3dd7a1ea0fae4b8ab8573ec5bfc5ca5d04f4f SHA512 4eca387a132c9d1237ebec7c80319e99c80088766209d05a697d09890f4a82c56ba5f48a5c8c8749bb051c177bb5eab67e00405b04d3191681d0ac7cf1ae868c
@@ -10,5 +12,6 @@ EBUILD llvm-roc-3.10.0.ebuild 1536 BLAKE2B 60a1d393a5df2291d971e67f9bbd2675611f9
 EBUILD llvm-roc-3.7.0-r1.ebuild 1397 BLAKE2B 08aec56b8ab26093f28a9118ca043adb35dcb84ae5899da5890cbeecb5d10f8d6b08e767a490272a5f35d1b3a5ee8d912a52b448ee57582cda9f99fce57ec8ec SHA512 745f2a9fa18bc3b9d76a324beb1e5165f9be8f720ef133b35e1509c08c08e48872ec4c7402e52d29a3b493e27729a43081fd0e90afe90d30b64d6da3f046e824
 EBUILD llvm-roc-3.8.0.ebuild 1492 BLAKE2B 73fd9fd2c47a18b5de44222b84fead548f85b4e67c18838050c52917b6836debee77bc83db6aa0a378516b48a56e5daaac53dde84bdbe1dbefd02494b06498d8 SHA512 d45f0e60c2f12e9b98425310fe370aeeb5d29cd24bfa83b1b908bcbc25866a49e6e1fc7facb04e699bd897f1960a394f2e3a4c5a8308ad9af6177f735dc40631
 EBUILD llvm-roc-3.9.0.ebuild 1529 BLAKE2B 07aac1728864214e61ed45cee3ca718c7830835502fe9e6c1e5ba5d6fc8303f3b644b0bb3476f8a1adcaabf09e961b3b55bfce34312b953e8ba855b7f36cdecb SHA512 5b9755c9c06ed465b58d8ca7c677211c04cb05eafaffee1e558b26d3d3bc033a1b8d6b1b3e69732441edd9f14cbf608da919f4eac3e283f5f4226dc332ffb68c
-EBUILD llvm-roc-4.0.0.ebuild 2211 BLAKE2B 85b023669ea3c5ca0f8838983a6ecc75abcf3031bdae2cb21674db3facbdf44319b10009cc5b63f4b772e4417cbd31ca8b624efff544761b9dba5852e711c5cf SHA512 0560eaa5858c2e94a88e59eb0ec3de8cdabe9f8e3e10fc76bba5f6e9110bad366df6c83623ce704fe7737191190426253be147310c6547a4f0e9e942d027f320
+EBUILD llvm-roc-4.0.0-r1.ebuild 2374 BLAKE2B 3944380f53d89d30e8d93314f37a191c37359095dc10c23ce9ad85cc8e9b25eaf86907fa48cd9bf2ae0adc2348d57733bc56b134fa106104e84cae34b2f6432d SHA512 2204600e6e06c08baab1fa655e1d818e0b8b8bbb057b5d8cd838e7206f47ad0af1302f38d4bbf1420c566d5d2bc1023727a695244bc7e0fccf56ec592ddbe5f9
+EBUILD llvm-roc-4.0.0.ebuild 2209 BLAKE2B 69cb35d21ea261977032b7ba780bee60d1feda3a3246e81bb16b33f21b5b08fb094fbe34b117aa68e00d1cd42551a44fb53dd64bb40a74254bf02ba872f4cc32 SHA512 34a7d3f9cfd920adad596fe7532a15c347f56ccbd3cc9f66eb02fa77efa7b512ef3ba119c5377a059471cd6e256424c4ae34fac49dd08620674e0b22375d8268
 MISC metadata.xml 461 BLAKE2B 5a060c417f0bb9bf1fba8375292e7bff20b2c50c3a2ab490bd436f81a954dbd370d61ba59b305b8bdaad9887e9c6a872eb30fea31c566dc6d74d3493b40d0a26 SHA512 a82c2186fc0642dab37608155dcf0aafd20701cb7e2769c6eb3aae88d4df6690743769a75f47efdb36fd8a3d6771f0feecd3efd01c98460fe195394c16d95660
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-hip-location.patch b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-hip-location.patch
new file mode 100644
index 000000000000..8342299f1139
--- /dev/null
+++ b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-hip-location.patch
@@ -0,0 +1,47 @@
+replace hardcoded hip finder with Gentoo paths.
+
+Author: Benda Xu <heroxbd@gentoo.org>
+
+Index: llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
+===================================================================
+--- llvm-project-rocm-4.0.0.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
++++ llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
+@@ -116,37 +116,8 @@ RocmInstallationDetector::getInstallatio
+     return Candidates;
+   }
+ 
+-  // Try to find relative to the compiler binary.
+-  const char *InstallDir = D.getInstalledDir();
++  Candidates.emplace_back(D.SysRoot + "/usr/lib/hip", /*StrictChecking=*/true);
+ 
+-  // Check both a normal Unix prefix position of the clang binary, as well as
+-  // the Windows-esque layout the ROCm packages use with the host architecture
+-  // subdirectory of bin.
+-
+-  // Strip off directory (usually bin)
+-  StringRef ParentDir = llvm::sys::path::parent_path(InstallDir);
+-  StringRef ParentName = llvm::sys::path::filename(ParentDir);
+-
+-  // Some builds use bin/{host arch}, so go up again.
+-  if (ParentName == "bin") {
+-    ParentDir = llvm::sys::path::parent_path(ParentDir);
+-    ParentName = llvm::sys::path::filename(ParentDir);
+-  }
+-
+-  // Some versions of the rocm llvm package install to /opt/rocm/llvm/bin
+-  if (ParentName == "llvm")
+-    ParentDir = llvm::sys::path::parent_path(ParentDir);
+-
+-  Candidates.emplace_back(ParentDir.str(), /*StrictChecking=*/true);
+-
+-  // Device library may be installed in clang resource directory.
+-  Candidates.emplace_back(D.ResourceDir, /*StrictChecking=*/true);
+-
+-  Candidates.emplace_back(D.SysRoot + "/opt/rocm", /*StrictChecking=*/true);
+-  if (ParentName.startswith("aomp")) {
+-    // Some versions of the aomp package install to /opt/rocm/aomp/bin
+-    Candidates.emplace_back(ParentDir.str());
+-  }
+   return Candidates;
+ }
+ 
diff --git a/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
new file mode 100644
index 000000000000..f14ec4ac0db2
--- /dev/null
+++ b/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
@@ -0,0 +1,29 @@
+Author: Wilfried (justxi) Holzke
+
+Adopted from https://github.com/justxi/rocm/blob/master/sys-devel/llvm-roc/files/llvm-roc-4.0.0-remove-isystem-usr-include.patch
+
+Index: llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
+===================================================================
+--- llvm-project-rocm-4.0.0.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp
++++ llvm-project-rocm-4.0.0/clang/lib/Driver/ToolChains/AMDGPU.cpp
+@@ -326,11 +326,6 @@ void RocmInstallationDetector::AddHIPInc
+     //
+     // ROCm 3.5 does not fully support the wrapper headers. Therefore it needs
+     // a workaround.
+-    SmallString<128> P(D.ResourceDir);
+-    if (UsesRuntimeWrapper)
+-      llvm::sys::path::append(P, "include", "cuda_wrappers");
+-    CC1Args.push_back("-internal-isystem");
+-    CC1Args.push_back(DriverArgs.MakeArgString(P));
+   }
+ 
+   if (DriverArgs.hasArg(options::OPT_nogpuinc))
+@@ -341,8 +336,6 @@ void RocmInstallationDetector::AddHIPInc
+     return;
+   }
+ 
+-  CC1Args.push_back("-internal-isystem");
+-  CC1Args.push_back(DriverArgs.MakeArgString(getIncludePath()));
+   if (UsesRuntimeWrapper)
+     CC1Args.append({"-include", "__clang_hip_runtime_wrapper.h"});
+ }
diff --git a/sys-devel/llvm-roc/llvm-roc-4.0.0-r1.ebuild b/sys-devel/llvm-roc/llvm-roc-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..5714ae9b7198
--- /dev/null
+++ b/sys-devel/llvm-roc/llvm-roc-4.0.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Radeon Open Compute llvm,lld,clang"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
+SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
+
+LICENSE="UoI-NCSA rc BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug +runtime"
+
+RDEPEND="virtual/cblas
+	dev-libs/libxml2
+	sys-libs/zlib
+	sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+PDEPEND="dev-libs/rocr-runtime"
+
+S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
+	"${FILESDIR}/${PN}-3.9.0-tensorflow.patch"
+)
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
+	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
+	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
+	eapply "${FILESDIR}/${PN}-4.0.0-hip-location.patch"
+
+	if [[ -n ${EPREFIX} ]]; then
+		pushd "${S}"/../clang >/dev/null || die
+		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt
+		eend $?
+		ebegin "Use ${EPREFIX} as default sysroot"
+		cd lib/Driver/ToolChains >/dev/null || die
+		ebegin "Use dynamic linker from ${EPREFIX}"
+		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp
+		eend $?
+
+		ebegin "Remove --sysroot call on ld for native toolchain"
+		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
+		eend $?
+		popd >/dev/null || die
+	fi
+
+	# handled by sysroot, don't prefixify here.
+	sed -e 's:/opt/rocm:/usr/lib/hip:' \
+		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	PROJECTS="clang;lld"
+
+	if usex runtime; then
+		PROJECTS+=";compiler-rt"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
+		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
+		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
+		-DLLVM_BUILD_DOCS=NO
+		-DLLVM_ENABLE_OCAMLDOC=OFF
+		-DLLVM_ENABLE_SPHINX=NO
+		-DLLVM_ENABLE_DOXYGEN=OFF
+		-DLLVM_INSTALL_UTILS=ON
+		-DLLVM_VERSION_SUFFIX=roc
+		-DOCAMLFIND=NO
+	)
+
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	cat > "99${PN}" <<-EOF
+		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
+	EOF
+	doenvd "99${PN}"
+}
diff --git a/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild b/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
index 64b2abf582b3..046488f4cf2a 100644
--- a/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
+++ b/sys-devel/llvm-roc/llvm-roc-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ src_prepare() {
 		ebegin "Use ${EPREFIX} as default sysroot"
 		cd lib/Driver/ToolChains >/dev/null || die
 		ebegin "Use dynamic linker from ${EPREFIX}"
-		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX%/}/\"@" Linux.cpp
+		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp
 		eend $?
 
 		ebegin "Remove --sysroot call on ld for native toolchain"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 8409a09bf527..e74f25e8ff9b 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -10,10 +10,12 @@ DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-10.0.1.ebuild 11889 BLAKE2B e5c81e014cfa7b66d784085f8f2c47d8b604a0e18d95294b6f37739d945ec66ee527a36b417fa633e46fe26daa65bc75a276e95e2734578003294d655e110f2f SHA512 7a88759263f653b2573c085ac43372ad6753c25c3c443f1bdcc59b136b5f5758b815c74c7a2312353f5906fce51c0e05e48d17e44c7e07a63986faf00da5240f
 EBUILD llvm-11.0.0.ebuild 12872 BLAKE2B d4c8f01e25c682599419585ae23b498b6ad28e11e93fe35c7a4d7d0a67f45c92fa9289a0606f9b56e5e43162a780bad84bb0ce70f1540cea1358143b685f8d80 SHA512 ef461574bd311482f07e550b0ab18eb3535be9ead64065ced49fa12d7d4e78eb35437ee016910f9d7d1b14ba07231002947fd3a01e88cf1f21185061a1d0cffd
 EBUILD llvm-11.0.1.ebuild 12681 BLAKE2B 5ee9376b3cb8ea5ff1537456f6ea3e998af01a6cc43d1f3d4adb465b67de16e870b6351f08a79e1f3c3b5e8032d0bb814b975da696b459c40776760affcabb23 SHA512 a2ebc8020ca2680021e03de2da8ee94ca4cc221e2eff579230fc6b4fad559a62045e493e868c59077f22f78887edf666d4315c6b41f285bce09435986b6b3a57
+EBUILD llvm-11.1.0_rc1.ebuild 12602 BLAKE2B d1efac06b7f292a69d10d01d10ab800574054b947a677a2fbedcc9f3eb57af1ad7802b68f68cc634ea7b66736a91aa7310451f73aa296976f7f947788375d44b SHA512 f24943bda4da2ba200634a19c331720af0dda6a24c119bad104ce050844bfbe4a4be326ff0be61ec8987ae9c3f64d0491811f305df1343315dc13b6f1789bbe0
 EBUILD llvm-12.0.0.9999.ebuild 12691 BLAKE2B b63824a7f09b43cbd44e700170ab980780a6f3e99040bc9a19a7229ea2ae3a55d3062b6d00f43f7ed46f5799bd8daa277c06bcd0492ef515fe8ade3f906942c5 SHA512 e1712430643f8f44d9069329e6706461ad1a708435dbf44528efe70c0cf277d2b46e6b7edad18ba97356d71e81ca9c183843ddb7c71e1c4893cb815ad2cabbca
 EBUILD llvm-9.0.1.ebuild 8388 BLAKE2B 502ae7150a7d03c53f181fe4f69ea0f2a37dc94fc5920fab72f65207472c3754db8f9b1449b390121719a611588a46a099b75e8b7956a234ad7bfcff76732bd4 SHA512 d066d32c267ff95eccd39a24e588b6ac526259e5e7ca166a30f6a5a68d544ee433c44d7bfa981129043acd63d761745647ed19569f83ca995c1643ef3ba0fa64
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-11.1.0_rc1.ebuild b/sys-devel/llvm/llvm-11.1.0_rc1.ebuild
new file mode 100644
index 000000000000..40ecd173e2da
--- /dev/null
+++ b/sys-devel/llvm/llvm-11.1.0_rc1.ebuild
@@ -0,0 +1,516 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	gold? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+LLVM_COMPONENTS=( llvm )
+LLVM_MANPAGES=build
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+	# reorder
+	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
+		eqawarn "ALL_LLVM_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
+		eqawarn "Expected: ${all_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-elfabi
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-lib
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-pdbutil
+			llvm-profdata
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-undname
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest
index 1199996e2ae8..e7f3e4942fb9 100644
--- a/sys-devel/slibtool/Manifest
+++ b/sys-devel/slibtool/Manifest
@@ -2,4 +2,5 @@ DIST slibtool-0.5.28.tar.xz 61124 BLAKE2B 86333684b6572a09fdc258146f245815a5febb
 DIST slibtool-0.5.31.tar.xz 70008 BLAKE2B aa46b2bfe02e22dabb3dc56b2de9521ef8fd3b54774561bcccca15763c8ee88154a03bb6defd4f6b828eaadb040e66725d18b788aac0a4d0170ce02cb044e9eb SHA512 658ea3244c6d1e9bd389ea5c222c29df6ba7acc5d6f2ada7a94dd3ac29ffbb681f377d8887a99861ab2ab484a7d3551e020bac2b92bdb07ad0e9ee96facfc6bd
 EBUILD slibtool-0.5.28.ebuild 426 BLAKE2B c2dc699691870320b1f1368846b599277b101a7a6721ff9e0a2a3039b1ce9e6c25330ac2494a5e735be0b39bf6960d01339c0e6e2397c426bb5cb28501184116 SHA512 e81d7fe8ae95b6076000b45050a2490cef2f4c39e06b6374578cdbcd07b7259ce1cb9b7ac8fa1e21600f32219d9b4c665041f5984376f0fb54a7d599bee01616
 EBUILD slibtool-0.5.31.ebuild 481 BLAKE2B 8ada2b664076fc2570991c47357e05d6bb227151881cdee8a5593dc1e32a1ff9e42a86f2789087609070cc9afc346359c9daf9c86146fbf118787411c4ad0583 SHA512 d14e5365748e0b9da1ea2d643cd9e40afe2143fadd6cbdfa38654e2d591904d7190f6723e93806d5253a4bfb7b97840787bf2af221f971d3b03e8c46529f2cbc
+EBUILD slibtool-9999.ebuild 589 BLAKE2B 4bb8cd55849eac2d236bf10b7eb312f9dd4bb5a41125c1147cbee15c4bdc573b5837c7c9669f8ec133741e5d33a8ca1cb1cb8e22211652d66301aa389a4b4e26 SHA512 515fd7bde0127cf1cf86007b1f870adc878d0f4abb90d938ba985d83bfed5e9b224b79f4070b6f3c33ac91709eb127180ee74af6ec66c5676bdf12b3a0cdfd26
 MISC metadata.xml 365 BLAKE2B 9fe6afdbd6ccfb6b2bb5283a69ee95db93a6de6f487718be7b190a19204cb9e6426bbb8f2f1536fd6512c819955b5214c70c151344668ebf2c58827cbdcd24bb SHA512 f87d93b660215d0d7271ecb980798e1c5bef9ab24a4773ea2e60748cfa4dd57644567820d5862e33520b7a71f4ef07bac60265f0e656a26aad5360c74b7611fd
diff --git a/sys-devel/slibtool/slibtool-9999.ebuild b/sys-devel/slibtool/slibtool-9999.ebuild
new file mode 100644
index 000000000000..b0b74aa5e382
--- /dev/null
+++ b/sys-devel/slibtool/slibtool-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A skinny libtool implementation, written in C"
+HOMEPAGE="https://git.midipix.org/cgit.cgi/slibtool"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.midipix.org/slibtool"
+else
+	SRC_URI="https://git.midipix.org/cgit.cgi/${PN}/snapshot/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm"
+fi
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	# custom configure script (not generated by autoconf)
+	./configure --host=${CHOST} --prefix="${EPREFIX}"/usr || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /sys-devel
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)