gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /sys-devel
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
80 files changed, 2077 insertions, 1664 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9d3a11a24e57..d6f6ae3b7617 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 3ff4ee89e4d4..94bf71321f70 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -2,9 +2,6 @@ AUX autogen-5.18.16-make-4.3.patch 814 BLAKE2B 53c823c59d4c896881593190fa27242bc
 AUX autogen-5.18.16-no-werror.patch 738 BLAKE2B f6228e7eb39cbdffae794d62e352ee0b3bee7a60f46ef31585838fc24ac85a8dac813aa698670f0d94fc1767add8b083c646dd89c56527c2e3765fac0d61f51c SHA512 ecf7f910957bface75eb2b828c5ba90b49c205183ea9242c2f47907fbf6bfd1154b4dc1d2ed0fef8bbf3c8f01d05bfa1450ecdef73786ff0292bbfdd904bd193
 AUX autogen-5.18.16-respect-TMPDIR.patch 824 BLAKE2B de70fb423955fc006ef10765ab5d534a02ff4e0d47bb29ab47706edf0e00cad241e8e51fd60aef2168181fce7b2af2623c4c1f163f8ef98ad09efa3c6488edd7 SHA512 9a37cb7c6703ffc24bd5f839f9d466db0fa92ce830d136f34594000863a1ade0d124d7aa4ef47baf411b0473ede65a8dd1f82d0e7fd7bb2713e003dfbf9437de
 AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a0426b757572217bdfaefe8b3fc308e7c3b29d41a6dd4db77677c208702cd836ac58a463814624bc965b71c8b5613935b SHA512 3279567863152a2874d64be1cae8129dfaa9d67612e6f2d3c0de408914ea5b2d19e037ade460393fd942d897776906fe5df483a69255c4f279c13893a6cec1fd
-AUX autogen-5.18.4-tmp-log.patch 500 BLAKE2B 131982c73b5fe2a0bf3515fcd8ead7df4149af7b9ab4f899dea0966f927319ee156d3748151b359c9be6e1a6f50b0a64a4330bbf3af985f048228024a1ececf2 SHA512 7467f09109b16aef1ce72e294e627a16bf46d861ecbbf467c3a7317e440a18cdea100d32f3fdbd37ef6140dd65b1b57523983b08b25c331e229ddd132e3b3824
-AUX autogen-5.18.4_fix_format.test_for_dash.patch 777 BLAKE2B 22621c5c825c47b94a8d28e6f471f3abc522761ce31a535bf357236eea1f71c546d9e025a879bf05719283147a4b3be83b8ee889f9aceda4597ee86f08c27a23 SHA512 4ac158532ad3e65219d0f8476acf05678d552b9fd13c3299e703a6979723e10fef2b87051983ae280609a6497ba2829e6197a97b18b54b2446ad106c6b9f1ae1
-AUX autogen-guile-2.2.patch 1033 BLAKE2B a18e884010f48b43b17bb5c78a4676a364503943f5144991ad2ab6acb8a9ba6f08044bd613f0763b5c863b380ecbcc7207df6cd29d08da3d034f07a386204bde SHA512 19c25fff1ca0427ff18627a14dab223b92da8670487351808df892fff77a8e33895e2ecc51acd8b03f3a89a5e19813fa12fb93c0aa54e47796812e99fd4ac7bf
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
 EBUILD autogen-5.18.16-r1.ebuild 1928 BLAKE2B 0ebeb5529ba766673b297dc8d084593255fe6505cf9bcf83e66b883be8f78f721be6ef7156bc14e911b1c3aae27314bac33315abb06cdb63fe82712c45dbddd1 SHA512 1cb2e9d9baa0b1265a750089a4bef2649088b3b188aba40493231bc7da31207fc04b2051cd4397507496ddf78413043103d03f285a16790fdbaace7f5588bf3b
diff --git a/sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch b/sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch
deleted file mode 100644
index 89e0277ab0ff..000000000000
--- a/sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/563352
-https://sourceforge.net/p/autogen/bugs/172/
-
-this is fixed upstream in commit f303a1d5d8d8e002974eb64818f74041325f2433
-
---- a/pkg/libopts/mklibsrc.sh
-+++ b/pkg/libopts/mklibsrc.sh
-@@ -18,8 +18,7 @@
- ##  You should have received a copy of the GNU General Public License along
- ##  with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
--set -ex
--exec 2> /tmp/mklibsrc-log.tx
-+set -e
- 
- top_builddir=`cd $top_builddir ; pwd`
- top_srcdir=`cd $top_srcdir ; pwd`
diff --git a/sys-devel/autogen/files/autogen-5.18.4_fix_format.test_for_dash.patch b/sys-devel/autogen/files/autogen-5.18.4_fix_format.test_for_dash.patch
deleted file mode 100644
index 644df648f59a..000000000000
--- a/sys-devel/autogen/files/autogen-5.18.4_fix_format.test_for_dash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-agen5/test/format.test: export AUTOGEN_DNE_DATE explicitly. DASH does
-not export when the assignment is on the same line as a shell function
-invocation.
-
-This is a backport of part of upstreams' commit 89f12c15.
-
-See: https://bugs.gentoo.org/show_bug.cgi?id=576674
-
---- a/agen5/test/format.test
-+++ b/agen5/test/format.test
-@@ -79,12 +79,12 @@
- </script>
- _EOF_
- 
--AUTOGEN_DNE_DATE=false \
-+export AUTOGEN_DNE_DATE=false
-     run_ag x ${testname}.def || failure autogen failed
- cmp -s ${testname}.base ${testname}.test || \
-    failure "`diff ${testname}.base ${testname}.test`"
- 
--AUTOGEN_DNE_DATE=true \
-+AUTOGEN_DNE_DATE=true
-     run_ag x ${testname}.def || failure autogen failed
- dte=`sed -n 's/.*It has been AutoGen-ed *//p' ${testname}.test`
- test "X${dte}" = "X" && \
diff --git a/sys-devel/autogen/files/autogen-guile-2.2.patch b/sys-devel/autogen/files/autogen-guile-2.2.patch
deleted file mode 100644
index 8ef904adb029..000000000000
--- a/sys-devel/autogen/files/autogen-guile-2.2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://raw.githubusercontent.com/Homebrew/formula-patches/master/autogen/allow-guile-2.2.diff
-
---- a/agen5/guile-iface.h
-+++ b/agen5/guile-iface.h
-@@ -9,7 +9,7 @@
- # error AutoGen does not work with this version of Guile
-   choke me.
- 
--#elif GUILE_VERSION < 201000
-+#else
- # define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
- # define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
- # define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
-@@ -24,9 +24,6 @@
- # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
- # define AG_SCM_VEC_P(_v)             scm_is_vector(_v)
- 
--#else
--# error unknown GUILE_VERSION
--  choke me.
- #endif
- 
- #endif /* MUTATING_GUILE_IFACE_H_GUARD */
---- a/configure
-+++ b/configure
-@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; }
- 		PKG_CONFIG=""
- 	fi
- fi
--  _guile_versions_to_search="2.0 1.8"
-+  _guile_versions_to_search="2.2 2.0 1.8"
-   if test -n "$GUILE_EFFECTIVE_VERSION"; then
-     _guile_tmp=""
-     for v in $_guile_versions_to_search; do
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 88fd78637a3f..e5fd3331f468 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,7 +1,8 @@
-AUX binutils-config-5 12580 BLAKE2B d802830a52b76433152a073d5acb29afa606dcac6f41de03c138fb2178ea8118af6f7c8dfe22ee1b54b9d7c630d9661719ace12925f62fb033851a80c91fd0d9 SHA512 2909a98c1f4a49f952665b307121d3f263a2fb4b40b97d0393dc008b0a91f2b547b1cc104d78615f4d42a5e0b8e3b0fa20358e414999a2b14c468c0c69c2dee9
-AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d58df5bf45eaa78a01e73c45e17cfa845aadcf65828f2ff7b149a01e9188ae85e3f56c8c83170078211cd69 SHA512 79cd64c734650d76e47e4e6a84aab408ca39d04b57fbd6ecbe953089f246e52c05a6d3d1dd69ff8864e71246c8b6f53f4b89902963ae4f6b7194b949cb0f724c
 AUX binutils-config-5.2 11716 BLAKE2B cff36d78c6d872c329cd63a9cb5c03e4c30a2dde8ae148b0392aba0157313daf9cf1772edc5a56a6ac633bdb9d677339fa6c3ad828b57902f5af27e7dd30eada SHA512 083352834377abac7cecd412f89ead22f132244241ec643272c14c74f458b5db0ddf5fd539024df29fe32b3e654058044158cb497290a77d5cc4a20c1a9bc2cc
 AUX binutils-config.8 2422 BLAKE2B 850b229c3c51c7687f303f723ed15f09d0d33730788aefefbb8840cee403dd287dae9380b3c60e22c0aa36ce519da8908f1d1b5e7bf4a79fc3c743a716086161 SHA512 d5f184c9a2178f94be216868afd79edf641fcc9c69a29ea2538ec93b03473199a2045edcf9f543c227de03ba986c48a61d86f0200b1a9d7defd393349ba79ad3
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
+DIST binutils-config-5.3.1.tar.xz 6688 BLAKE2B 3bc1b96a96b0c30e425f4ffd42f86a09e2a80cc3ad1dcf77d4b5d2d9eb3d6bc607f78dfff1ae888fe8abfe44405a1e4d1ab325aa92fc5889c18aa3187a506647 SHA512 c6d188b70935604a8a519c036dda210c20e5b6e916fab33e5026bd5c78adfff0a1aa85003759b751275576ff33471b25c920beb6b1c088115f28918389e09ce2
 EBUILD binutils-config-5.2.ebuild 1092 BLAKE2B 453ed9f4ce103a56c0880fe2d08594b1734081ec933415d8d54d2376a0015d4e32e8555f5dd63356bb99ee917ea982ebfb75e92e9c58dfadf9c545fdbf82e863 SHA512 74fc1bafd272f17f94a1e5b6b27bfaa5fabc1cd45bcc5886bbc0856e304396afaed8a4f942f6ab578dca782ad62eb98c8852a21f39f9c6379e3a1b43b9df52a7
-MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
+EBUILD binutils-config-5.3.1.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
+EBUILD binutils-config-9999.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
+MISC metadata.xml 416 BLAKE2B 5ea7d7b0b0ca3767c8393d3ff5c7c51d190503d6dfea9f2146b7f8bdf1f6a91237e918e6b6b178d07a3de8affc936fbde215825ec33c5b334d67d36f66c30566 SHA512 256a0c0ec2d57c3ba75a27e7a810ec70d06cecdefc20f2f58cfcbb1ddbd195c2115661c4960ab6316d88b6db21210416a4eb5855488ddd5918888365a3a9d00b
diff --git a/sys-devel/binutils-config/binutils-config-5.3.1.ebuild b/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
new file mode 100644
index 000000000000..5f9cd23da4a1
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/binutils-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+native-symlinks"
+
+# We also RDEPEND on sys-apps/findutils which is in base @system
+RDEPEND="sys-apps/gentoo-functions"
+
+src_compile() {
+	emake DESTDIR="${D}" PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PV="${PV}" install
+
+	use prefix && eprefixify "${ED}"/usr/bin/${PN}
+}
+
+pkg_postinst() {
+	# Re-register all targets. USE flags or new versions can change
+	# installed symlinks.
+	local x
+	for x in $(binutils-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		binutils-config ${x}
+	done
+}
diff --git a/sys-devel/binutils-config/binutils-config-9999.ebuild b/sys-devel/binutils-config/binutils-config-9999.ebuild
new file mode 100644
index 000000000000..5f9cd23da4a1
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/binutils-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+native-symlinks"
+
+# We also RDEPEND on sys-apps/findutils which is in base @system
+RDEPEND="sys-apps/gentoo-functions"
+
+src_compile() {
+	emake DESTDIR="${D}" PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PV="${PV}" install
+
+	use prefix && eprefixify "${ED}"/usr/bin/${PN}
+}
+
+pkg_postinst() {
+	# Re-register all targets. USE flags or new versions can change
+	# installed symlinks.
+	local x
+	for x in $(binutils-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		binutils-config ${x}
+	done
+}
diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5
deleted file mode 100644
index 297ea01518c4..000000000000
--- a/sys-devel/binutils-config/files/binutils-config-5
+++ /dev/null
@@ -1,490 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Format of /etc/env.d/binutils/:
-#  config-TARGET:	CURRENT=version for TARGET
-#  TARGET-VER:		has a TARGET and VER variable
-
-EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
-	EPREFIX=""
-fi
-
-: ${ROOT:=/}
-[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
-
-EROOT="${ROOT%/}${EPREFIX}/"
-
-cd "${EPREFIX}/"
-
-trap ":" INT QUIT TSTP
-
-argv0=${0##*/}
-FUNCTIONS_SH="${EPREFIX}/lib/gentoo/functions.sh"
-source ${FUNCTIONS_SH} || {
-	echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2
-	exit 1
-}
-esyslog() { :; }
-die() { eerror "${argv0}: $*"; exit 1; }
-umask 022
-
-usage() {
-cat << USAGE_END
-Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}[binutils profile]${NORMAL}
-
-${HILITE}General Options:${NORMAL}
-  ${GOOD}-c, --get-current-profile${NORMAL}  Print current profile
-  ${GOOD}-l, --list-profiles${NORMAL}        Print a list of available profiles
-  ${GOOD}-u, --uninstall${NORMAL}            Remove all signs of specified target
-  ${GOOD}-d, --debug${NORMAL}                Execute with debug output
-
-${HILITE}General Cruft:${NORMAL}
-  ${GOOD}--linker${NORMAL} <linker>          Switch to specified linker (if supported)
-
-Profile names are of the form:  ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
-For example:                    ${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
-
-For more info, please see ${HILITE}binutils-config${NORMAL}(8).
-USAGE_END
-
-	exit ${1:-1}
-}
-
-mv_if_diff() {
-	if cmp -s "$1" "$2" ; then
-		rm -f "$1"
-	else
-		mv -f "$1" "$2"
-	fi
-}
-atomic_ln() {
-	local target=$1 linkdir=$2 linkname=$3 linktmp linkfull
-	linktmp="${linkdir}/.binutils-config.tmp.${linkname}"
-	linkfull="${linkdir}/${linkname}"
-	if [[ -d ${linkfull} ]] ; then
-		# if linking to a dir, we need a little magic to
-		# make it atomic since `mv -T` is not portable
-		rm -rf "${linktmp}"
-		mkdir -p "${linktmp}"
-		ln -sf "${target}" "${linktmp}/${linkname}"
-		mv "${linktmp}/${linkname}" "${linktmp}/../"
-		rmdir "${linktmp}"
-	else
-		# `ln` will expand into unlink();symlink(); which
-		# is not atomic for a small amount of time, but
-		# `mv` is a single rename() call
-		ln -sf "${target}" "${linktmp}"
-		mv "${linktmp}" "${linkfull}"
-	fi
-}
-
-setup_env() {
-	unset TARGET VER LIBPATH
-	source "${ENV_D}/${PROFILE}"
-	if [[ -z ${TARGET} ]] ; then
-		eerror "${PROFILE} is invalid (no \$TARGET defined) :("
-		return 1
-	fi
-	if [[ -z ${VER} ]] ; then
-		eerror "${PROFILE} is invalid (no \$VER defined) :("
-		return 1
-	fi
-
-	#
-	# Generate binary symlinks
-	#
-	BINPATH=""
-	BINPATH_LINKS=""
-	if [[ ${TARGET} != ${HOST} ]] ; then
-		#
-		# Newer paths: /usr/${HOST}/${TARGET}/...
-		# Older paths: /usr/${TARGET}/...
-		#
-		if [[ -d "${EROOT}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then
-			BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER}
-			BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET}
-		fi
-	fi
-	if [[ -z ${BINPATH} ]] ; then
-		BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER}
-		BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin
-	fi
-}
-
-# Lists of headers that various versions have installed.
-HEADERS=(
-	ansidecl.h bfd.h bfdlink.h demangle.h dis-asm.h dyn-string.h
-	fibheap.h hashtab.h libiberty.h objalloc.h plugin-api.h
-	splay-tree.h symcat.h
-)
-
-switch_profile() {
-	local x
-
-	ebegin "Switching to ${PROFILE}"
-
-	setup_env || return 1
-
-	cd "${ROOT}/${BINPATH}" || exit 1
-	mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin"
-	for x in * ; do
-		atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}"
-		atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${TARGET}-${x}"
-		if [[ ${TARGET} == ${HOST} ]] ; then
-			atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}"
-		fi
-	done
-
-	#
-	# Generate library / ldscripts symlinks
-	#
-	: ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}}
-	cd "${ROOT}/${LIBPATH}" || exit 1
-	if [[ ${TARGET} == ${HOST} ]] ; then
-		dstlib=${EROOT}/usr/${HOST}/lib
-	else
-		dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
-	fi
-	# When upgrading, we need to clean up ldscripts and libs.
-	# Don't symlink back in the libs -- the binutils-lib package handles
-	# these now.
-	# TODO: Stop requiring even the ldscripts symlink.
-	mkdir -p "${dstlib}"
-	rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
-	atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"
-	find -L "${dstlib}" -xtype l -name 'lib*' -delete
-	# Detect older binutils w/broken rpaths. #562460
-	# We can hardcode the "/lib" part since that's what the binutils
-	# configure scripts have.  They did not include any other path.
-	if [[ $(scanelf -qF '%r#F' "${ROOT}/${BINPATH}/as") == */lib ]] ; then
-		ewarn "Old cross-binutils detected; please re-emerge to fix (see bug #562460)."
-		for x in lib* ; do
-			atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}"
-		done
-	fi
-
-	#
-	# Clean out old generated include symlinks
-	#
-	INCPATH=${LIBPATH}/include
-	if [[ -d ${ROOT}/${INCPATH} ]] ; then
-		cd "${ROOT}/${INCPATH}" || exit 1
-		if [[ ${HOST} == ${TARGET} ]] ; then
-			# The binutils-lib package handles these files now.
-			for x in libiberty "${HEADERS[@]}" ; do
-				x="${EROOT}/usr/include/${x}"
-				if [[ -L ${x} ]] ; then
-					rm "${x}"
-				fi
-			done
-		else
-			# Clean out old path -- cannot use '-exec {} +' syntax here
-			find . -type f -exec rm -f "${EROOT}/usr/${TARGET}/usr/include/{}" \;
-			rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null
-			rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null
-			rmdir "${EROOT}/usr/${TARGET}" >& /dev/null
-		fi
-	fi
-
-	#
-	# Make sure proper paths get updated
-	#
-	local env_update_flag="--no-ldconfig"
-	if [[ ${TARGET} == ${HOST} ]] ; then
-		# Delete old config now that binutils-libs installs these files.
-		# Note: This skips ldconfig update if env.d had LDPATH, but meh.
-		# Most people have upgraded to ld.so.conf.d, and someone else will
-		# eventually re-run ldconfig for us.
-		x="${EROOT}"/etc/ld.so.conf.d/05binutils.conf
-		if [[ -e ${x} ]]; then
-			rm -f "${x}"
-			env_update_flag=""
-		fi
-
-		DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER}
-		local e="${EROOT}"/etc/env.d/05binutils
-		local ee="${e}.tmp"
-		rm -f "${ee}"
-		[[ -d ${ROOT}/${DATAPATH}/man  ]] && echo "MANPATH=${DATAPATH}/man"   >> "${ee}"
-		[[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
-		mv_if_diff "${ee}" "${e}"
-	fi
-
-	local c="${ENV_D}/config-${TARGET}"
-	local cc="${c}.tmp"
-	echo "CURRENT=${VER}" > "${cc}"
-	mv_if_diff "${cc}" "${c}"
-
-	eend 0
-
-	#
-	# Regen env.d if need/can be
-	#
-	if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then
-		env-update ${env_update_flag}
-		echo
-		ewarn "Please remember to run:"
-		echo
-		ewarn "  # . ${EPREFIX}/etc/profile"
-		echo
-	fi
-
-	return 0
-}
-
-uninstall_target() {
-	: ${TARGET:=${UARG}}
-
-	if [[ ${TARGET} == ${HOST} ]] ; then
-		die "refusing to uninstall native binutils"
-	fi
-
-	shopt -s nullglob
-	PROFILE=""
-
-	for PROFILE in "${ENV_D}"/${TARGET}-* ; do
-		ewarn "Removing all signs of ${PROFILE##*/}"
-		rm -f "${ENV_D}"/${PROFILE}
-	done
-	if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
-		die "no profiles exist for '${TARGET}'"
-	fi
-
-	rm -f "${ENV_D}"/config-${TARGET}
-
-	local x
-	for x in \
-		addr2line ar as c++filt dwp elf2flt elfedit flthdr gprof \
-		ld ld.{bfd,gold,real} \
-		nm objcopy objdump ranlib readelf size strings strip
-	do
-		x=(
-			"${EROOT}"/usr/bin/${TARGET}-${x}
-			"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
-			"${EROOT}"/usr/libexec/gcc/${TARGET}/${x}
-		)
-		rm -f "${x[@]}"
-	done
-	for x in "${HEADERS[@]}" ; do
-		rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
-	done
-	for x in bfd iberty opcodes ; do
-		rm -f "${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
-	done
-	# Delete broken symlinks
-	local destdir="${EROOT}/usr/${HOST}/${TARGET}"
-	rm -f "${destdir}"/lib/ldscripts
-	find -L "${destdir}"/lib -type l -exec rm {} +
-	rmdir \
-		"${destdir}"/{bin,include,lib,usr} \
-		"${destdir}" \
-		"${EROOT}"/var/db/pkg/cross-${TARGET} \
-		"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \
-		"${EROOT}"/usr/libexec/gcc/${TARGET} \
-		2>/dev/null
-
-	rm -f "${ENV_D}"/${TARGET}-*
-}
-
-set_current_profile() {
-	if [[ ! -f ${ENV_D}/config-${TARGET} ]] ; then
-		eerror "${argv0}: unable to locate a profile for target: ${TARGET}"
-		return 1
-	fi
-
-	source "${ENV_D}/config-${TARGET}"
-
-	if [[ -z ${CURRENT} ]] ; then
-		eerror "${argv0}: no binutils profile is active!"
-		return 1
-	fi
-
-	echo "${TARGET}-${CURRENT}"
-
-	return 0
-}
-get_current_profile() { echo "${PROFILE}" ; }
-
-list_profiles() {
-	local x i target
-
-	if [[ ${ROOT} != / ]] ; then
-		echo "Using binutils-config info in ${ROOT}"
-	fi
-
-	set -- "${ENV_D}"/*
-	target=
-	i=1
-
-	for x ; do
-		# skip broken links and config files
-		[[ -f ${x} ]] || continue
-		[[ ${x} == */config-* ]] && continue
-
-		source "${x}"
-		if [[ ${target} != ${TARGET} ]] ; then
-			[[ -n ${target} ]] && echo
-			target=${TARGET}
-		fi
-
-		x=${x##*/}
-		if [[ -e ${ENV_D}/config-${TARGET} ]] ; then
-			source "${ENV_D}/config-${TARGET}"
-			if [[ ${VER} == ${CURRENT} ]] ; then
-				[[ ${TARGET} == ${HOST} ]] \
-					&& x="${x} ${GOOD}*${NORMAL}" \
-					|| x="${x} ${HILITE}*${NORMAL}"
-			fi
-		fi
-
-		# We would align the [...] field like so:
-		#printf ' [%*ss] %s\n' ${##} "${i}" "${x}"
-		# but this breaks simple scripting: `binutils -l | awk '{print $2}'`
-
-		# Or we could align the target col like so:
-		#printf ' [%s]%*s %s\n' "${i}" $(( ${##} - ${#i} )) "" "${x}"
-		# but i'm not sold that it looks better
-
-		# So keep it simple ... only makes a diff anyways for crazy people
-		# like me which have 100+ binutils packages installed ...
-		echo " [$i] ${x}"
-		((++i))
-	done
-}
-
-switch_linker() {
-	local bpath ld=$1
-
-	case ${ld} in
-	ld.*) ;;
-	*) die "not supported: linker must start with 'ld.'" ;;
-	esac
-
-	setup_env || return 1
-	bpath="${ROOT}/${BINPATH}"
-
-	# does this binutils even support the requested linker ?
-	if [[ ! -e ${bpath}/${ld} ]] ; then
-		die "sorry, but ${PROFILE} doesn't support the ${ld} linker"
-	fi
-
-	# switch it up
-	ebegin "Setting default linker to ${ld} for ${PROFILE}"
-	atomic_ln ${ld} "${bpath}" ld
-	eend $?
-}
-
-set_HOST() {
-	# Set HOST to CHOST if it isn't already set
-	: ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
-}
-
-ENV_D="${EROOT}etc/env.d/binutils"
-
-DEBUG="no"
-NEED_ACTION="yes"
-DOIT="switch_profile"
-PROFILE="current"
-HOST=""
-TARGET=""
-unset UARG
-
-select_action() {
-	if [[ ${NEED_ACTION} != "no" ]] ; then
-		NEED_ACTION="no"
-		DOIT=$1
-	else
-		die "one action at a time!"
-	fi
-}
-
-while [[ $# -gt 0 ]] ; do
-	x=$1
-	shift
-	case ${x} in
-		-c|--get-current-profile)  select_action get_current_profile ;;
-		-l|--list|--list-profiles) select_action list_profiles ;;
-		-u|--uninstall)            select_action uninstall_target ;;
-		--linker)                  select_action "switch_linker $1"; shift ;;
-		-d|--debug)                DEBUG="yes" ;;
-		-h|--help)                 usage 0 ;;
-		-V|--version)
-			ver="@PV@"
-			echo "binutils-config-${ver/@'PV'@/git}"
-			exit 0
-			;;
-		-*)
-			die "invalid switch!  Try '--help'."
-			;;
-		*)
-			if [[ ${UARG+set} == "set" ]] ; then
-				die "only one profile/target at a time please"
-			fi
-			NEED_ACTION="maybe"
-			UARG=${x}
-			;;
-	esac
-done
-
-[[ ${NEED_ACTION} == "yes" ]] && usage 1
-[[ ${DEBUG} == "yes" ]] && set -x
-
-# All operations need to know the current HOST to figure out
-# what is a native target and what is a cross target
-set_HOST
-
-# All operations need to know the profile the user wants
-case ${DOIT} in
-switch_profile|switch_linker_*)
-	# decode user's profile choice
-	x=${UARG:-$(TARGET=${HOST} set_current_profile)}
-	PROFILE=""
-	if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
-		# User gave us a # representing the profile
-		i=1
-		for y in "${ENV_D}"/* ; do
-			[[ ${y/config-} != ${y} ]] && continue
-
-			if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]] ; then
-				PROFILE=${y##*/}
-				break
-			fi
-			((++i))
-		done
-	fi
-
-	if [[ -z ${PROFILE} ]] ; then
-		# User gave us a full HOST-ver
-		x=${x##*/}
-		if [[ -f ${ENV_D}/${x} ]] ; then
-			# Valid HOST-ver yeah!
-			PROFILE=${x}
-		else
-			# Not a valid HOST-ver ...
-			if [[ ! -f ${ENV_D}/config-${x} ]] ; then
-				# Maybe they just gave us a ver ...
-				if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
-					x=${HOST}-${x}
-				else
-					die "could not locate '$x' in '${ENV_D}/'!"
-				fi
-				PROFILE=${x}
-			else
-				# Maybe they just gave us a target ... pick active profile
-				PROFILE=$(TARGET=${x} set_current_profile)
-			fi
-		fi
-	fi
-	;;
-*)
-	# lookup current profile as the user gave us a target
-	PROFILE=$(TARGET=${UARG:-${HOST}} set_current_profile) || exit 1
-	;;
-esac
-
-eval ${DOIT}
-
-# vim:ts=4
diff --git a/sys-devel/binutils-config/files/binutils-config-5.1 b/sys-devel/binutils-config/files/binutils-config-5.1
deleted file mode 100644
index 26ff278eece5..000000000000
--- a/sys-devel/binutils-config/files/binutils-config-5.1
+++ /dev/null
@@ -1,482 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Format of /etc/env.d/binutils/:
-#  config-TARGET:	CURRENT=version for TARGET
-#  TARGET-VER:		has a TARGET and VER variable
-
-EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
-	EPREFIX=""
-fi
-
-: ${ROOT:=/}
-[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}"
-
-EROOT="${ROOT%/}${EPREFIX}/"
-
-cd "${EPREFIX}/"
-
-trap ":" INT QUIT TSTP
-
-argv0=${0##*/}
-FUNCTIONS_SH="${EPREFIX}/lib/gentoo/functions.sh"
-source ${FUNCTIONS_SH} || {
-	echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2
-	exit 1
-}
-esyslog() { :; }
-die() { eerror "${argv0}: $*"; exit 1; }
-umask 022
-
-usage() {
-cat << USAGE_END
-Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}[binutils profile]${NORMAL}
-
-${HILITE}General Options:${NORMAL}
-  ${GOOD}-c, --get-current-profile${NORMAL}  Print current profile
-  ${GOOD}-l, --list-profiles${NORMAL}        Print a list of available profiles
-  ${GOOD}-u, --uninstall${NORMAL}            Remove all signs of specified target
-  ${GOOD}-d, --debug${NORMAL}                Execute with debug output
-
-${HILITE}General Cruft:${NORMAL}
-  ${GOOD}--linker${NORMAL} <linker>          Switch to specified linker (if supported)
-
-Profile names are of the form:  ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
-For example:                    ${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
-
-For more info, please see ${HILITE}binutils-config${NORMAL}(8).
-USAGE_END
-
-	exit ${1:-1}
-}
-
-mv_if_diff() {
-	if cmp -s "$1" "$2" ; then
-		rm -f "$1"
-	else
-		mv -f "$1" "$2"
-	fi
-}
-atomic_ln() {
-	local target=$1 linkdir=$2 linkname=$3 linktmp linkfull
-	linktmp="${linkdir}/.binutils-config.tmp.${linkname}"
-	linkfull="${linkdir}/${linkname}"
-	if [[ -d ${linkfull} ]] ; then
-		# if linking to a dir, we need a little magic to
-		# make it atomic since `mv -T` is not portable
-		rm -rf "${linktmp}"
-		mkdir -p "${linktmp}"
-		ln -sf "${target}" "${linktmp}/${linkname}"
-		mv "${linktmp}/${linkname}" "${linktmp}/../"
-		rmdir "${linktmp}"
-	else
-		# `ln` will expand into unlink();symlink(); which
-		# is not atomic for a small amount of time, but
-		# `mv` is a single rename() call
-		ln -sf "${target}" "${linktmp}"
-		mv "${linktmp}" "${linkfull}"
-	fi
-}
-
-setup_env() {
-	unset TARGET VER LIBPATH
-	source "${ENV_D}/${PROFILE}"
-	if [[ -z ${TARGET} ]] ; then
-		eerror "${PROFILE} is invalid (no \$TARGET defined) :("
-		return 1
-	fi
-	if [[ -z ${VER} ]] ; then
-		eerror "${PROFILE} is invalid (no \$VER defined) :("
-		return 1
-	fi
-
-	#
-	# Generate binary symlinks
-	#
-	BINPATH=""
-	BINPATH_LINKS=""
-	if [[ ${TARGET} != ${HOST} ]] ; then
-		#
-		# Newer paths: /usr/${HOST}/${TARGET}/...
-		# Older paths: /usr/${TARGET}/...
-		#
-		if [[ -d "${EROOT}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then
-			BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER}
-			BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET}
-		fi
-	fi
-	if [[ -z ${BINPATH} ]] ; then
-		BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER}
-		BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin
-	fi
-}
-
-# Lists of headers that various versions have installed.
-HEADERS=(
-	ansidecl.h bfd.h bfdlink.h demangle.h dis-asm.h dyn-string.h
-	fibheap.h hashtab.h libiberty.h objalloc.h plugin-api.h
-	splay-tree.h symcat.h
-)
-
-switch_profile() {
-	local x
-
-	ebegin "Switching to ${PROFILE}"
-
-	setup_env || return 1
-
-	cd "${ROOT}/${BINPATH}" || exit 1
-	mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin"
-	for x in * ; do
-		atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}"
-		atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${TARGET}-${x}"
-		if [[ ${TARGET} == ${HOST} ]] ; then
-			atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}"
-		fi
-	done
-
-	#
-	# Generate library / ldscripts symlinks
-	#
-	: ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}}
-	cd "${ROOT}/${LIBPATH}" || exit 1
-	if [[ ${TARGET} == ${HOST} ]] ; then
-		dstlib=${EROOT}/usr/${HOST}/lib
-	else
-		dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib
-	fi
-	# When upgrading, we need to clean up ldscripts and libs.
-	# Don't symlink back in the libs -- the binutils-lib package handles
-	# these now.
-	# TODO: Stop requiring even the ldscripts symlink.
-	mkdir -p "${dstlib}"
-	rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts
-	atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts"
-	find -L "${dstlib}" -xtype l -name 'lib*' -delete
-	# Detect older binutils w/broken rpaths. #562460
-	# We can hardcode the "/lib" part since that's what the binutils
-	# configure scripts have.  They did not include any other path.
-	if [[ $(scanelf -qF '%r#F' "${ROOT}/${BINPATH}/as") == */lib ]] ; then
-		ewarn "Old cross-binutils detected; please re-emerge to fix (see bug #562460)."
-		for x in lib* ; do
-			atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}"
-		done
-	fi
-
-	#
-	# Clean out old generated include symlinks
-	#
-	INCPATH=${LIBPATH}/include
-	if [[ -d ${ROOT}/${INCPATH} ]] ; then
-		cd "${ROOT}/${INCPATH}" || exit 1
-		if [[ ${HOST} != ${TARGET} ]] ; then
-			# Clean out old path -- cannot use '-exec {} +' syntax here
-			find . -type f -exec rm -f "${EROOT}/usr/${TARGET}/usr/include/{}" \;
-			rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null
-			rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null
-			rmdir "${EROOT}/usr/${TARGET}" >& /dev/null
-		fi
-	fi
-
-	#
-	# Make sure proper paths get updated
-	#
-	local env_update_flag="--no-ldconfig"
-	if [[ ${TARGET} == ${HOST} ]] ; then
-		# Delete old config now that binutils-libs installs these files.
-		# Note: This skips ldconfig update if env.d had LDPATH, but meh.
-		# Most people have upgraded to ld.so.conf.d, and someone else will
-		# eventually re-run ldconfig for us.
-		x="${EROOT}"/etc/ld.so.conf.d/05binutils.conf
-		if [[ -e ${x} ]]; then
-			rm -f "${x}"
-			env_update_flag=""
-		fi
-
-		DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER}
-		local e="${EROOT}"/etc/env.d/05binutils
-		local ee="${e}.tmp"
-		rm -f "${ee}"
-		[[ -d ${ROOT}/${DATAPATH}/man  ]] && echo "MANPATH=${DATAPATH}/man"   >> "${ee}"
-		[[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}"
-		mv_if_diff "${ee}" "${e}"
-	fi
-
-	local c="${ENV_D}/config-${TARGET}"
-	local cc="${c}.tmp"
-	echo "CURRENT=${VER}" > "${cc}"
-	mv_if_diff "${cc}" "${c}"
-
-	eend 0
-
-	#
-	# Regen env.d if need/can be
-	#
-	if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then
-		env-update ${env_update_flag}
-		echo
-		ewarn "Please remember to run:"
-		echo
-		ewarn "  # . ${EPREFIX}/etc/profile"
-		echo
-	fi
-
-	return 0
-}
-
-uninstall_target() {
-	: ${TARGET:=${UARG}}
-
-	if [[ ${TARGET} == ${HOST} ]] ; then
-		die "refusing to uninstall native binutils"
-	fi
-
-	shopt -s nullglob
-	PROFILE=""
-
-	for PROFILE in "${ENV_D}"/${TARGET}-* ; do
-		ewarn "Removing all signs of ${PROFILE##*/}"
-		rm -f "${ENV_D}"/${PROFILE}
-	done
-	if [[ -z ${PROFILE} ]] && [[ ! -e ${ENV_D}/config-${TARGET} ]] ; then
-		die "no profiles exist for '${TARGET}'"
-	fi
-
-	rm -f "${ENV_D}"/config-${TARGET}
-
-	local x
-	for x in \
-		addr2line ar as c++filt dwp elf2flt elfedit flthdr gprof \
-		ld ld.{bfd,gold,real} \
-		nm objcopy objdump ranlib readelf size strings strip
-	do
-		x=(
-			"${EROOT}"/usr/bin/${TARGET}-${x}
-			"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x}
-			"${EROOT}"/usr/libexec/gcc/${TARGET}/${x}
-		)
-		rm -f "${x[@]}"
-	done
-	for x in "${HEADERS[@]}" ; do
-		rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x}
-	done
-	for x in bfd iberty opcodes ; do
-		rm -f "${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
-	done
-	# Delete broken symlinks
-	local destdir="${EROOT}/usr/${HOST}/${TARGET}"
-	rm -f "${destdir}"/lib/ldscripts
-	find -L "${destdir}"/lib -type l -exec rm {} +
-	rmdir \
-		"${destdir}"/{bin,include,lib,usr} \
-		"${destdir}" \
-		"${EROOT}"/var/db/pkg/cross-${TARGET} \
-		"${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \
-		"${EROOT}"/usr/libexec/gcc/${TARGET} \
-		2>/dev/null
-
-	rm -f "${ENV_D}"/${TARGET}-*
-}
-
-set_current_profile() {
-	if [[ ! -f ${ENV_D}/config-${TARGET} ]] ; then
-		eerror "${argv0}: unable to locate a profile for target: ${TARGET}"
-		return 1
-	fi
-
-	source "${ENV_D}/config-${TARGET}"
-
-	if [[ -z ${CURRENT} ]] ; then
-		eerror "${argv0}: no binutils profile is active!"
-		return 1
-	fi
-
-	echo "${TARGET}-${CURRENT}"
-
-	return 0
-}
-get_current_profile() { echo "${PROFILE}" ; }
-
-list_profiles() {
-	local x i target
-
-	if [[ ${ROOT} != / ]] ; then
-		echo "Using binutils-config info in ${ROOT}"
-	fi
-
-	set -- "${ENV_D}"/*
-	target=
-	i=1
-
-	for x ; do
-		# skip broken links and config files
-		[[ -f ${x} ]] || continue
-		[[ ${x} == */config-* ]] && continue
-
-		source "${x}"
-		if [[ ${target} != ${TARGET} ]] ; then
-			[[ -n ${target} ]] && echo
-			target=${TARGET}
-		fi
-
-		x=${x##*/}
-		if [[ -e ${ENV_D}/config-${TARGET} ]] ; then
-			source "${ENV_D}/config-${TARGET}"
-			if [[ ${VER} == ${CURRENT} ]] ; then
-				[[ ${TARGET} == ${HOST} ]] \
-					&& x="${x} ${GOOD}*${NORMAL}" \
-					|| x="${x} ${HILITE}*${NORMAL}"
-			fi
-		fi
-
-		# We would align the [...] field like so:
-		#printf ' [%*ss] %s\n' ${##} "${i}" "${x}"
-		# but this breaks simple scripting: `binutils -l | awk '{print $2}'`
-
-		# Or we could align the target col like so:
-		#printf ' [%s]%*s %s\n' "${i}" $(( ${##} - ${#i} )) "" "${x}"
-		# but i'm not sold that it looks better
-
-		# So keep it simple ... only makes a diff anyways for crazy people
-		# like me which have 100+ binutils packages installed ...
-		echo " [$i] ${x}"
-		((++i))
-	done
-}
-
-switch_linker() {
-	local bpath ld=$1
-
-	case ${ld} in
-	ld.*) ;;
-	*) die "not supported: linker must start with 'ld.'" ;;
-	esac
-
-	setup_env || return 1
-	bpath="${ROOT}/${BINPATH}"
-
-	# does this binutils even support the requested linker ?
-	if [[ ! -e ${bpath}/${ld} ]] ; then
-		die "sorry, but ${PROFILE} doesn't support the ${ld} linker"
-	fi
-
-	# switch it up
-	ebegin "Setting default linker to ${ld} for ${PROFILE}"
-	atomic_ln ${ld} "${bpath}" ld
-	eend $?
-}
-
-set_HOST() {
-	# Set HOST to CHOST if it isn't already set
-	: ${HOST:=${CHOST:-$(portageq envvar CHOST)}}
-}
-
-ENV_D="${EROOT}etc/env.d/binutils"
-
-DEBUG="no"
-NEED_ACTION="yes"
-DOIT="switch_profile"
-PROFILE="current"
-HOST=""
-TARGET=""
-unset UARG
-
-select_action() {
-	if [[ ${NEED_ACTION} != "no" ]] ; then
-		NEED_ACTION="no"
-		DOIT=$1
-	else
-		die "one action at a time!"
-	fi
-}
-
-while [[ $# -gt 0 ]] ; do
-	x=$1
-	shift
-	case ${x} in
-		-c|--get-current-profile)  select_action get_current_profile ;;
-		-l|--list|--list-profiles) select_action list_profiles ;;
-		-u|--uninstall)            select_action uninstall_target ;;
-		--linker)                  select_action "switch_linker $1"; shift ;;
-		-d|--debug)                DEBUG="yes" ;;
-		-h|--help)                 usage 0 ;;
-		-V|--version)
-			ver="@PV@"
-			echo "binutils-config-${ver/@'PV'@/git}"
-			exit 0
-			;;
-		-*)
-			die "invalid switch!  Try '--help'."
-			;;
-		*)
-			if [[ ${UARG+set} == "set" ]] ; then
-				die "only one profile/target at a time please"
-			fi
-			NEED_ACTION="maybe"
-			UARG=${x}
-			;;
-	esac
-done
-
-[[ ${NEED_ACTION} == "yes" ]] && usage 1
-[[ ${DEBUG} == "yes" ]] && set -x
-
-# All operations need to know the current HOST to figure out
-# what is a native target and what is a cross target
-set_HOST
-
-# All operations need to know the profile the user wants
-case ${DOIT} in
-switch_profile|switch_linker_*)
-	# decode user's profile choice
-	x=${UARG:-$(TARGET=${HOST} set_current_profile)}
-	PROFILE=""
-	if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
-		# User gave us a # representing the profile
-		i=1
-		for y in "${ENV_D}"/* ; do
-			[[ ${y/config-} != ${y} ]] && continue
-
-			if [[ -f ${y} ]] && [[ ${x} -eq ${i} ]] ; then
-				PROFILE=${y##*/}
-				break
-			fi
-			((++i))
-		done
-	fi
-
-	if [[ -z ${PROFILE} ]] ; then
-		# User gave us a full HOST-ver
-		x=${x##*/}
-		if [[ -f ${ENV_D}/${x} ]] ; then
-			# Valid HOST-ver yeah!
-			PROFILE=${x}
-		else
-			# Not a valid HOST-ver ...
-			if [[ ! -f ${ENV_D}/config-${x} ]] ; then
-				# Maybe they just gave us a ver ...
-				if [[ -f ${ENV_D}/${HOST}-${x} ]] ; then
-					x=${HOST}-${x}
-				else
-					die "could not locate '$x' in '${ENV_D}/'!"
-				fi
-				PROFILE=${x}
-			else
-				# Maybe they just gave us a target ... pick active profile
-				PROFILE=$(TARGET=${x} set_current_profile)
-			fi
-		fi
-	fi
-	;;
-*)
-	# lookup current profile as the user gave us a target
-	PROFILE=$(TARGET=${UARG:-${HOST}} set_current_profile) || exit 1
-	;;
-esac
-
-eval ${DOIT}
-
-# vim:ts=4
diff --git a/sys-devel/binutils-config/metadata.xml b/sys-devel/binutils-config/metadata.xml
index e396f3755977..393442d23fa4 100644
--- a/sys-devel/binutils-config/metadata.xml
+++ b/sys-devel/binutils-config/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>toolchain@gentoo.org</email>
-	<name>Gentoo Toolchain Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<use>
+		<flag name="native-symlinks">Install native symlinks like 'as' or 'ar' to /usr/bin. Otherwise keep only ${CTARGET}-as and friends.</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 770a40b48060..348bcd9274b9 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -3,8 +3,10 @@ DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7
 DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-1.tar.xz 20388 BLAKE2B 8828505f62259a307de445357320827e7f6bc416a7f4c72140add505f62eef3928c7daec13be158b52c2a7a1d989f539025e4be6ec27ef80ede81477a42c5042 SHA512 951dffcc30ad5706dc48e71995217655c5d96472446ab66a357f19486b57d1868143a9809887eab7ba8c42c33124f8b37d3bab6618388ea8a08b4399d348a645
+DIST binutils-2.34-patches-4.tar.xz 95232 BLAKE2B 0a355120ecaf447d863f6d0837028061968166c9024da36212ce7d172ee2060e4027be1fca0089e38ab9073b5332307ff1dc05b868603bd2aa0ec8e88af7cd0a SHA512 e593edbeddaf97ef23fa8eb25c5714c7f2dd2500d11422bd9dba42e119884fe71593adc98862f74c7d391ceb298556ed049eee3c504733c634faef236045876b
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 EBUILD binutils-hppa64-2.32-r1.ebuild 12648 BLAKE2B aa452384823e5b0be386bc4a7501d49b2de644af4492a05992f7dddd680c5e87481dbf5a38fff342526e571e271adc6af68b33bda2e83059877a307b4d892b81 SHA512 df21c036804f909f7c8b3ccec6119c6f35189cfe3988390be4dbe3f36cc7ead39eea4415cae689dcdcaa9387bb7d97477e50f329c7a11f75d28880a6f676b1eb
 EBUILD binutils-hppa64-2.33.1.ebuild 12302 BLAKE2B 84e6b959af5995933200f19231c033fbc7bec57f54c7a28d92733556a2194e963120469d68ca488788e32f3199312bf2f08351e1d541e847c15e67d451648b79 SHA512 4b1330e3070fb3ccbaea43f261ce9a96786779d3c876d41fa4e80e73206395ef1586bc7e82e959b744ebe0c6ca798aaa41d48a19c77380b627f0824aad405bba
+EBUILD binutils-hppa64-2.34-r1.ebuild 12436 BLAKE2B 3f9c4e9e20bfb2f4537b2edd190638f7c4be134bf591be0e69dc8837f0e453a8acac9d77c84ebcc62a1681598864a1ea2c72b45679552ee819caf96465e4425f SHA512 14d59dc2c1eefdc0c2980641db00cff0629d6c205d2ede58dc844e97304b53386dc82edc9018a8634f6e546065b82872c8a4b78da562a74822c34c9aa2a77d90
 EBUILD binutils-hppa64-2.34.ebuild 12433 BLAKE2B 239db2882c3f484fccca1b90a0db543bf9529c7af0f3c0bffb9b8a2a055d923af9769d3ac2b00ffaa3df9f2bd9da2f177382bbd038aad8a1a10dfa4df907baf0 SHA512 f4fbf04c0b84b27053890f31ef61ceff6a326d5049dc5a1cb6a5ac84fe1eb9562df628dc5ab93a3733bba94fde4f81eb23f0bf9918d216eaff149b1326f53407
 MISC metadata.xml 766 BLAKE2B e03336034fccf22a9cd0559a1a78bcc99f7cec05b7e526798e739a48589d50732d1664c6d9fcffe6defcd18840e612cba1a158e557785423d4834c2c54183579 SHA512 ea6c1bc005fecf24c4673f623b6d21ded664e5999720c6b74ad2a3654c40a274c9003a2a44dd402de3317a1d3d4450bc1d3c74683b3a98557363d62e21043e04
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r1.ebuild
new file mode 100644
index 000000000000..c848f55dace6
--- /dev/null
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r1.ebuild
@@ -0,0 +1,442 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CTARGET=hppa64-${CHOST#*-}
+
+inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+LICENSE="GPL-3+"
+IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
+REQUIRED_USE="default-gold? ( gold )"
+
+# Variables that can be set here:
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=4
+PATCH_DEV=dilfridge
+
+case ${PV} in
+	9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		SLOT=${PV}
+		;;
+	*.9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		EGIT_BRANCH=$(ver_cut 1-2)
+		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
+		SLOT=$(ver_cut 1-2)
+		;;
+	*)
+		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+		SLOT=$(ver_cut 1-2)
+		KEYWORDS="-* ~hppa"
+		;;
+esac
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( sys-apps/texinfo )
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR=${WORKDIR}/build
+S=${WORKDIR}/${P/-hppa64/}
+
+src_unpack() {
+	case ${PV} in
+		*9999)
+			git-r3_src_unpack
+			;;
+		*)
+			;;
+	esac
+	default
+	mkdir -p "${MY_BUILDDIR}"
+}
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		# Use upstream patch to enable development mode
+		rm -v "${WORKDIR}/patch"/0000-Gentoo-Git-is-development.patch || die
+
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# This check should probably go somewhere else, like pkg_pretend.
+	if [[ ${CTARGET} == *-uclibc* ]] ; then
+		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
+			die "sorry, but this binutils doesn't yet support uClibc :("
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered. #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Fix locale issues if possible #122216
+	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
+		einfo "Fixing misc issues in configure files"
+		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
+			ebegin "  Updating ${f/${S}\/}"
+			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
+				|| eerror "Please file a bug about this"
+			eend $?
+		done
+	fi
+
+	# Fix conflicts with newer glibc #272594
+	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
+		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
+	fi
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${PV}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}"
+	local myconf=()
+
+	if use plugins ; then
+		myconf+=( --enable-plugins )
+	fi
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use gold ; then
+		myconf+=( --enable-gold )
+		if use default-gold; then
+			myconf+=( --enable-gold=default )
+		fi
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd.  This matches
+	# the bi-arch logic in toolchain.eclass. #446946
+	# We used to do it for everyone, but it's slow on 32bit arches. #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
+	# on everyone in alpha (for now), we'll just enable it when possible
+	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
+	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.27) offer a configure flag now.
+		--enable-relro
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		${EXTRA_ECONF}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# Change SONAME to avoid conflict across
+		# {native,cross}/binutils, binutils-libs. #666100
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+	)
+	echo ./configure "${myconf[@]}"
+	"${S}"/configure "${myconf[@]}" || die
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake tooldir="${EPREFIX}${TOOLPATH}" all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}"
+	# bug 637066
+	filter-flags -Wall -Wreturn-type
+	emake -k check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${ED}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${PV} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}"
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${PV}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${PV}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+
+	# the hppa64 hack; this should go into 9999 as a PN-conditional
+	# tweak the default fake list a little bit
+	cd "${D}"/etc/env.d/binutils
+	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${PV}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+		binutils-config ${CTARGET}-${PV}
+	fi
+}
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. Many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not allow ./configure to tweak every location
+# we need for slotting binutils hence all the shuffling in
+# src_install(). This note is about SCRIPTDIR define handling.
+#
+# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 7871ddfe0aca..3c5242ea8c0b 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -15,7 +15,7 @@ DIST binutils-9999-patches-5.tar.xz 17492 BLAKE2B 4d5072d26d714dbc2a65899102c357
 EBUILD binutils-2.32-r1.ebuild 12638 BLAKE2B 3bb6831d91295ad0e1eba8f50de8d5ceea51f245b2798cf890b2e0d42628db175150d4372f918067e560d229c2173412662320c90b39d3ab99f69fb1c9c4e18e SHA512 e4c24268b2bb5780bdbaaee7d7b7a02fbf590afb95b11037e1b518fd5c98e94ac8b25e60d188609d98dc30180e030f44ec78e1ef7ce1162fe13658fbe057b340
 EBUILD binutils-2.32-r2.ebuild 12417 BLAKE2B 0db121dfdf5af96c1884684ab0d8a25d69c037d8b394a8d364f742ded9962f96c4e94f5073294c41eaefb0b9061b58b4f78f86ae04c73bd13797b3de5d3e3c4d SHA512 abbf2690b78b9c74c8db40db03a0de41afdf9006120b2d32014c53b064ff3872813c2a35d610e5dc5b50324613395ff8dbd6f9e0811fc09003efd830c748d459
 EBUILD binutils-2.33.1-r1.ebuild 12152 BLAKE2B 71c89261848ff7d8898c81cd013de9bd9fac9f3853732fb4636c6e420106b74d3f42970d2dc25c2053a71003d898377618fb2c6ef271f993302f3f5c1f4d3d54 SHA512 689498a68f0e802c1468ee3a4df6dfe8ede15dfa797d1983466d01e64f5da26c071f1396d52f25085e5df4075cb2969349f0533eb89a543da224c6c3ed47d4b9
-EBUILD binutils-2.34-r1.ebuild 12341 BLAKE2B cbe017c110b93d16a26fcb66ec501ff4f00c915a00b1cc4b239b799ef204b7c0a82d94aec9a42c6724b144c240aae00120edf959c2594e3e2903fcf4e18172b3 SHA512 b9868290b96172696fa50ce27a7c1a5bbc8a7b3bd3fa2f76862ffe4deda94fb67d5080aa5db75f2672c65c97ef23eb305dd805d44b404d4a8f93056b5ec7b196
+EBUILD binutils-2.34-r1.ebuild 12340 BLAKE2B f4947adc40ef2cd12bc0f95889372fa53166a91b70ad454127f239870524eb6fd334ba6a0ecf1e74163928d46c243c3e8e52e408419faad360e9e5dbfcb54e7c SHA512 32dc8053199384e15b74d1859988e8974164b0376452206face59c8b30e99dfcb030769b0252920c3a8ab2fd943fe292e70b82c9cb79bd0f88c96fbe1f2e48e4
 EBUILD binutils-2.34.ebuild 12337 BLAKE2B dc373bf8ef89bf4b81619d16037996e19086859a5f8de8289a0f47bb21a0381990df5d0a912abcc3009213c0c97da8277f9b0bd92d740a529cadf7feda358ded SHA512 be63803f09026d414e77b0a831da5d24526c5c2e0a65649010074acb5410d7ffefd7b861e2ddeb6338356a0a488e0095009240bda7a4f398a5f63add9333e4d8
 EBUILD binutils-9999.ebuild 12148 BLAKE2B 0efe47e54fd54debf514adf269d8151ad7e6932854055becc0ba242da61c2cb17a1f3aa11e7d1edfafc1086e3a4d2a4f6bf69d37a753357f6d3d57cefecee96e SHA512 62b1b9540fbd666eec6c935e24cfc79ce293b89db75690dc7667aa99bceae51e82ff6c495a58a9a4d6283158297877523d798a9f0a802264c669d0308670b076
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.34-r1.ebuild b/sys-devel/binutils/binutils-2.34-r1.ebuild
index 98c25e05d260..4948e72ad99e 100644
--- a/sys-devel/binutils/binutils-2.34-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.34-r1.ebuild
@@ -42,7 +42,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-		#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 		;;
 esac
 
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 20276f854f3a..5998ccfd996f 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -8,11 +8,11 @@ DIST bison-3.5.1-patches-01.tar.xz 9388 BLAKE2B 656cdc4fef308df3bc97c8f452ae7544
 DIST bison-3.5.4.tar.xz 2370252 BLAKE2B 38078224f2e8e99210b64948831942f91062c6c9a080bee627f1ab4542f01b15bf2d4ce33a9864ae37cd5fb9bcc21e7e3382f98086698be12e01916640dd11f9 SHA512 92f59122dc4d5cae1debdd5567253f269ef001c98582a5763a2051424fecb78e8710c80a09fc488f6784705e679a8bc82874bc11cc03e4eb83445cb9f418b331
 DIST bison-3.6-patches-01.tar.xz 10140 BLAKE2B 7731f5ed15bd221f75a42961efa8a034383332344474c71db6d1c95bbeff6687f83e4a77f2330000f31787eb78d0826942a648c6f55b084632b2876e5810a5d4 SHA512 0325f4a5cf53ab4a51a4abe22bd53eb4023684d1b3bbe89de8a15769e0c76bc6746aebd36f1efa950f14228d194202b68de28b304260eeada4f85cecd1eb4675
 DIST bison-3.6.1.tar.xz 2463812 BLAKE2B f9906254a4226fa8321008bce2b241e18a1e5301cd688a10eaf284b6eb08699a40987c43dce60a73d0188a7213403cc1bc0d4c0ca9a648e42af6d720ac52d313 SHA512 64c81a63745d4ecf167d303cd6c254a5df57adf4cc52560d295a1f411be0d99abb7399ea82c3c80cb35a66bda831c4bbe56bf272a66b33939ce4b7631398bfe0
-DIST bison-3.6.tar.xz 2463276 BLAKE2B 4a846a16f6da7d34880215dcc4fde4699b86ad524ade111acc1aaca653e672f7a287a4d39a1a82601103fabf5a2f703f0e18f780f71196f37410322fcb0ac675 SHA512 968bbcfd1dffd10fb46ea4b3d49486d31b605f79ca88b8e2aa45fbafdb2fca3e1b0ac38564a9101681c8831cf423ea6a366f55d9497d21c05ddb3c7d66acb042
+DIST bison-3.6.2.tar.xz 2468224 BLAKE2B a2a6b0e110de3a18686b174928d3216a671111d1a38a99719d0796788fe34a1508af19a08bb090db2bd84a092be2d5511393399db12a5e856582499c9fe20b0b SHA512 69f5b6d9f28e0fe2d127a86e1315b06f3367c4d1cb667c0f0eee537fd5705d702d2a8db51204d7928db83efa83208cb5f738b27453eac6e2fd5037e8ffd0cd19
 EBUILD bison-3.1.ebuild 2482 BLAKE2B 2595a1242d213c2839fd7cf1d3a069b666d3915d1e86a4903ee35136be9018bc5d0a960c9e4c24927c9f0573d76802a764ab8da9157ab399dd000238d196760c SHA512 97f27e6390787b602ad7aad377e1d8313d58036e7b3f3acb141b009bd8327839e2cac72ae3231d8ffed5fbaeb66298c356834956c8ea5665d1b0e674751457db
 EBUILD bison-3.3.2.ebuild 2604 BLAKE2B 4a634ef94acb4ec6189aa83967232f3b6a29f8408000a733920a8125da22ab2180950cd44eb06c7948cb87080e1fc9ca0ab864666d3ee519056b5820f12fa1c5 SHA512 95b30075d74b742c71cc8efbe9e2c096bc73827bbedc996e5429a9d26e6bd35c2ed6388f60e8f831588014e75868d3165078bab29e18a7970907e8e8a96357dd
 EBUILD bison-3.4.2.ebuild 2475 BLAKE2B 08355d3475296df4df66d7d8ed336d7bd85e3f856afdb43802afd929784c31b945250ace89f9f33f95238348a54502b3c62bea91cf75eb4becb0dc78fefb3273 SHA512 3a743140947e99949c2fb599ad2ebabc69bb3f773bc70961b0345c3009261b84a8f2bcc7a9612830b80e432957db4e50acbedd2d25c4af4d5436da58a8f97a4c
 EBUILD bison-3.5.4.ebuild 2487 BLAKE2B 4f9475c770b3ea48b98724599a5abd0846f907c5e37b5b315e4d19a74fb0b17981c1e2911f277132fc9d73e412a630c50b3b5802a3a6eaf39e8f0cf3c0aa1e8e SHA512 7e1e957a90d5244d13559f26c14f23b60b8cc9c23793a84c75cd78af77d28dae338932f9b87b7a3bbd9d3df141d43d1c770bf5611812d8ec1a08449471683285
 EBUILD bison-3.6.1.ebuild 2483 BLAKE2B 88ff7f1aeaa597f162123b63d1c22461d53ae9208cd62de168a678ccbd2439f6e088b55b15f8fe7bffe8a3883b6b7325212e528d6cc17bc25128cd09e1c4c502 SHA512 23d7b9097bfde2d99ccab14eaf1975af5ef2f9116a9e5353534771193baaebd820f105e3088457103628c5f9ab167de506eedda3d4ecd3f98c0961a74ac47924
-EBUILD bison-3.6.ebuild 2483 BLAKE2B 88ff7f1aeaa597f162123b63d1c22461d53ae9208cd62de168a678ccbd2439f6e088b55b15f8fe7bffe8a3883b6b7325212e528d6cc17bc25128cd09e1c4c502 SHA512 23d7b9097bfde2d99ccab14eaf1975af5ef2f9116a9e5353534771193baaebd820f105e3088457103628c5f9ab167de506eedda3d4ecd3f98c0961a74ac47924
+EBUILD bison-3.6.2.ebuild 2483 BLAKE2B 88ff7f1aeaa597f162123b63d1c22461d53ae9208cd62de168a678ccbd2439f6e088b55b15f8fe7bffe8a3883b6b7325212e528d6cc17bc25128cd09e1c4c502 SHA512 23d7b9097bfde2d99ccab14eaf1975af5ef2f9116a9e5353534771193baaebd820f105e3088457103628c5f9ab167de506eedda3d4ecd3f98c0961a74ac47924
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bison/bison-3.6.ebuild b/sys-devel/bison/bison-3.6.2.ebuild
index ae1caa517daa..ae1caa517daa 100644
--- a/sys-devel/bison/bison-3.6.ebuild
+++ b/sys-devel/bison/bison-3.6.2.ebuild
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 96f589135541..ecb484df6bff 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,5 +1,5 @@
 AUX bmake-20181221-fix-gcc10-fno-common.patch 575 BLAKE2B f8e767c442683332b258cb4df3cad965cc2cb2903ce404e6f0f923c6ff1135e3e51d28e3b1855fe0ac27e5db839ae117236ead9cf8fed3bef6706dff9754e56f SHA512 d6986497844239b7c67e721b76387c391a7bf71a7122dfa54aadbada6add5bf3d810aea0f8f119d47c76445266f90a2cc39bef23b398cb3ee396de6cefa0020b
-DIST bmake-20181221.tar.gz 558806 BLAKE2B 57759a76f38431120db4d01770440b301b1170b6d24ce38930020df483010c5631e4276bd63b90204b2a01a3853c7146709b9b8b9cf1e7d958158f589269e955 SHA512 7824fb60e4ac8f9c5ab9f6a0d42720c5f3cb475851146bf8042625eb58bbd0dbacafce6969da2b51cdd6514e789a8f2a958e8b8538cd862eeea1b571da203e5b
+DIST bmake-20200318.tar.gz 572827 BLAKE2B f10c6f3e87497508e26154acb3e8a07b78daeba083228478023443b5ccaf540385c1d594fb968ed1fe9ccad30680e7c527db48fc3787c01930f62f88f1fb6699 SHA512 a405226e8f4a9a985ed00dc359390da7890d70f8a7b7e134db05da34ebc3c6ee2373497a9e44e0d75bb64edd81f860fd0cc204bdf7f392dd4e9d2e6a5fe9e507
 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
-EBUILD bmake-20181221.ebuild 979 BLAKE2B 4d5c1d11111526ce986d3e42c8490085d515af4bf190987d9e5119cfcfdcc2922c9f322c06495e1c47ba5fa491044b7e2df11d2eb43b27e63c9389f01fc3a749 SHA512 90fb29c32f1d981bb803f815bf864333ed7ada9643588c1658e33174ea844f4c1de41df0a0d7ef82a0aed0f1d8cf2a9586aed40714c6b9ece49c4d83c737993d
+EBUILD bmake-20200318.ebuild 979 BLAKE2B 4d5c1d11111526ce986d3e42c8490085d515af4bf190987d9e5119cfcfdcc2922c9f322c06495e1c47ba5fa491044b7e2df11d2eb43b27e63c9389f01fc3a749 SHA512 90fb29c32f1d981bb803f815bf864333ed7ada9643588c1658e33174ea844f4c1de41df0a0d7ef82a0aed0f1d8cf2a9586aed40714c6b9ece49c4d83c737993d
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-devel/bmake/bmake-20181221.ebuild b/sys-devel/bmake/bmake-20200318.ebuild
index c7915e164c03..c7915e164c03 100644
--- a/sys-devel/bmake/bmake-20181221.ebuild
+++ b/sys-devel/bmake/bmake-20200318.ebuild
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 0c0cfe713f10..724e28fdbf35 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,8 +1,10 @@
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
+DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-common-10.0.0.9999.ebuild 513 BLAKE2B 3ca10da9963052dfcd89bfbc0399f9839325caba42a63e916ccb3ab5f10c0b1f1089cf2b932ce1f166e0dc60ae2d605003e345354eed6310eebc29a40275405d SHA512 18c55050f97348880eaa7676dcf4bde318f2db16c9014713ca32b17c2c02997e68034ed20dc8737a1f1c5d51de88da321dd68bfe83068008dc7f92857d782997
 EBUILD clang-common-10.0.0.ebuild 589 BLAKE2B 71f0090e6d67508ab556dc2260ae6f0d0aa05fedec01815b67db31884d41756c0224d5df19ad7c242a0ab24b23dfde9ba8bad5d9bf95ce5434848663bcd0b0a2 SHA512 ac2a3296c395e38f1c5ba5cbccd230a0e625995756b8a8eb6b74911f87e31d1afd069b452f51a890e74147a7a79307469185f00cce21522d0b6b60045f686e24
+EBUILD clang-common-10.0.1.9999.ebuild 513 BLAKE2B 3ca10da9963052dfcd89bfbc0399f9839325caba42a63e916ccb3ab5f10c0b1f1089cf2b932ce1f166e0dc60ae2d605003e345354eed6310eebc29a40275405d SHA512 18c55050f97348880eaa7676dcf4bde318f2db16c9014713ca32b17c2c02997e68034ed20dc8737a1f1c5d51de88da321dd68bfe83068008dc7f92857d782997
+EBUILD clang-common-10.0.1_rc1.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
 EBUILD clang-common-11.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
 EBUILD clang-common-8.0.1.ebuild 798 BLAKE2B ee3a460e6e80ac0700fec452f3cf47a1f6054c7b93139e0fd4c5efec8ccf84d1cfe933420cca84e017e115bf45474db42f58813b98dc2f396feb61c00f2901d5 SHA512 feda961724c5bfde42926b0928107fae7df056e63041705a68eb7521ffc1e9f5be8f86591db41d10f97b940ef1ac664dc35ad11e59b29635b46b2fe5ea8c974b
 EBUILD clang-common-9.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
diff --git a/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-10.0.1.9999.ebuild
index d1bfe71d2f80..d1bfe71d2f80 100644
--- a/sys-devel/clang-common/clang-common-10.0.0.9999.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.1.9999.ebuild
diff --git a/sys-devel/clang-common/clang-common-10.0.1_rc1.ebuild b/sys-devel/clang-common/clang-common-10.0.1_rc1.ebuild
new file mode 100644
index 000000000000..18e41e0917da
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-10.0.1_rc1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index b8defd1b2b45..eb4e93a59430 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,5 +1,6 @@
-EBUILD clang-runtime-10.0.0.9999.ebuild 643 BLAKE2B d513da18fea612d5908924aedc4ccc2a01e25a66b306b1229e9d7c6ad5a8508a3be51b551246f64eba90f406c47c4f384d5fa69545d581aaeb55e6b2116895c2 SHA512 8f9cdfe5312cccfe2b7b5f7929d9aa3ffd8e9e007ddded8284a391bfbfe9f4e11462164336679fdfa40bb1d3b5449498d28a25fa97af2a3fbd5b978bb450b822
 EBUILD clang-runtime-10.0.0.ebuild 701 BLAKE2B 310160c35f36aab47af12dbfd1d4fd110050738a693d73276029c4e7b7c97d772294c25580808b3a267554207fb20b242ae48ffc13176b38813c108c8f6ea73f SHA512 f98ced68b29310f99744a4b8f3e024553e6db03b8c1efbb4f83997cf079e91b86d82d5742e1b3851765961d91f4940f439fdbea55061e72952eb113175cc1f57
+EBUILD clang-runtime-10.0.1.9999.ebuild 643 BLAKE2B d513da18fea612d5908924aedc4ccc2a01e25a66b306b1229e9d7c6ad5a8508a3be51b551246f64eba90f406c47c4f384d5fa69545d581aaeb55e6b2116895c2 SHA512 8f9cdfe5312cccfe2b7b5f7929d9aa3ffd8e9e007ddded8284a391bfbfe9f4e11462164336679fdfa40bb1d3b5449498d28a25fa97af2a3fbd5b978bb450b822
+EBUILD clang-runtime-10.0.1_rc1.ebuild 625 BLAKE2B 8db7bfa75ca928562b60b1bcc5f64ab85b3bd4c81f48f78488edbf80507bfa99c411ad32e5893d8f620d020bd2f21c996ad1c744e6881851d20fd5b504ee2010 SHA512 0a979a27e36ce410909e42e03ca2eb6f204059b24f654123646c17950e0a1db23b1cdd6668aef94f0623e74cf780a8b2fddb4dc1f58f1858498454650363414b
 EBUILD clang-runtime-11.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-8.0.1.ebuild 748 BLAKE2B ff21c3eb98a3d4530d7763206d8c6248173461f1fc4829975bcdc9485dddd61e474ac8b8feb99bf10ed71593516968b645ca403e7e6df4afc4054f5ffc9bbf2c SHA512 4aba44501f689d679f4fa095a896cb7d0820271bc4ae49c4e4f386950915a547ca1eb06a0847395f18ca82c123cdd28d0116309a374e98f68a4b0dc688e47385
 EBUILD clang-runtime-9.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.1.9999.ebuild
index 806c398483be..806c398483be 100644
--- a/sys-devel/clang-runtime/clang-runtime-10.0.0.9999.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.1.9999.ebuild
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.1_rc1.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.1_rc1.ebuild
new file mode 100644
index 000000000000..65e66879ab98
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.1_rc1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 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 d0cfd0c2cc1b..f6a8e0939ec4 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -6,9 +6,11 @@ DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
+DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-10.0.0.9999.ebuild 10940 BLAKE2B 5203158d0a05a7063d581478d60fd43442b1395c4a16b115331132df2296cf792ddaf382aa79f99cd981703678e1e02c271d925bfc8fa3b509a1984948fce347 SHA512 5776f771d5a7539e79f0762228c646a5e57120bff3215a230204329ac7d3727c0dc6a2918a8e5a87503a4aa189cf71892261372905bd50bced05133e361f5865
 EBUILD clang-10.0.0.ebuild 10194 BLAKE2B b7fdf307bd1df5fb9b4a1b74ce54852293d884396004f23011aa30d0f53cc740d554fe2fa723939b826c34b3b0797242d16eeaac0eb4465f09142005b0213f26 SHA512 7187998e91d5239e4824c6ecce16dddadff571a0e75f50ca7f0766ff77dd842f6fec3be06a2bd5859d0e56fae2bb58136b1114d1d5dad37e2bdad23e1956d9a7
+EBUILD clang-10.0.1.9999.ebuild 10940 BLAKE2B 5203158d0a05a7063d581478d60fd43442b1395c4a16b115331132df2296cf792ddaf382aa79f99cd981703678e1e02c271d925bfc8fa3b509a1984948fce347 SHA512 5776f771d5a7539e79f0762228c646a5e57120bff3215a230204329ac7d3727c0dc6a2918a8e5a87503a4aa189cf71892261372905bd50bced05133e361f5865
+EBUILD clang-10.0.1_rc1.ebuild 10937 BLAKE2B a92db7c198d9ede332815bf89f35aa5aaed1c3c64a9fcc48a30cdaf80bb34aab5250ff05478a503d3dd8b1a0e1d060e89d3f94f31e34c2eed7795cc48530fcd2 SHA512 2ee8f66034c4da4f0a330da1984283149fc829215071707eba5cfdee34dde9e310f8aa524480b0ced31ad5b230b81065137e45827236d44e3a0e20dac9b12e94
 EBUILD clang-11.0.0.9999.ebuild 11090 BLAKE2B 7d1395a8c2d83ca9abd0d4ac700cc47c641feafb13dbed786691a191d7ec0ca4f014bba76d0042680c583ec0b8f8f06b51000c2c6f26b8ec8aab1c4607279e03 SHA512 6a25f9a1434622ae7854c97ca702c8955b7a5f27ff2ecd768c5acc6701bb982dd29c83ce870c0c4802c2d17ddd415e8eb4941bf995a28d5793795e8811516da8
 EBUILD clang-8.0.1.ebuild 10138 BLAKE2B a2c91918e468c3f070ba10d7a0478e006c5d23289db387d6ca57ee082a7567ef24ad7af66a3b93e0e8934c69fbcd5a4fefbfbd77ba0ef077776b4110b30a6773 SHA512 da86670ee496b2a1bfe3f99eb7146cd8a85d793f580ae2ebd94bfb65363c6e39c58fb77b3b00c27e5d9bdc70ecb1688154e500506525b019da3f95d356f815e1
 EBUILD clang-9.0.1.ebuild 8982 BLAKE2B 05319c777c4ecfd03a54bc9e14f322ad6f348a99554ebf8eb1e3a0a1b8c7aba5f3ba618fd3edb21022dd34f1cd4dca2c3f24b152b6f795b939a77c8959d27fa1 SHA512 f88f6c0dc7f1faed0f0d8310c9235a4d0d17352f710f28d9a8c7e47e28aaa43f7727e3e2a7e30334ffae7cb2e6df7769a543fd4c79a0ecb8a1f0a480b15fdb06
diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.1.9999.ebuild
index 6f913045c092..6f913045c092 100644
--- a/sys-devel/clang/clang-10.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.1.9999.ebuild
diff --git a/sys-devel/clang/clang-10.0.1_rc1.ebuild b/sys-devel/clang/clang-10.0.1_rc1.ebuild
new file mode 100644
index 000000000000..13d42251a431
--- /dev/null
+++ b/sys-devel/clang/clang-10.0.1_rc1.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
+	pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+)
+llvm.org_set_globals
+# We need extra level of indirection for CLANG_RESOURCE_DIR
+S=${WORKDIR}/x/y/clang
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM 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_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
+	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	# create extra parent dir for CLANG_RESOURCE_DIR
+	mkdir -p x/y || die
+	cd x/y || die
+	llvm.org_src_unpack
+	mv clang-tools-extra clang/tools/extra || die
+}
+
+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
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						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-import-test
+			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
+		)
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-man
+			docs-clang-tools-html
+			docs-clang-tools-man
+		)
+
+		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_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			# normally copied from LLVM_INCLUDE_DOCS but the latter
+			# is lacking value in stand-alone builds
+			-DCLANG_INCLUDE_DOCS=$(usex doc)
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
+		)
+		use doc && mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=ON
+			-DLLVM_ENABLE_SPHINX=ON
+			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-clang
+	multilib_is_native_abi &&
+		cmake-utils_src_make check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake-utils_src_make 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"
+	# 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/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 3c6d4a97bd82..d941cc9cc562 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,6 @@
 DIST crossdev-20200125.tar.xz 27380 BLAKE2B 4871b3ba1130c8d2e4df263aea155f95352417e65dabe64968cf9cc2628f9a1ae32a7e569cdea73a04d32d05396b0a83720bbd712a5f5b703606692e6b61516b SHA512 a4db1d09179b23f032af59c4857c3ab58d7944633b0c612a1f8aa0ecc38201f960cc1da761f34288568bb7f3434fe4da5094b4d4445be047da8838a096f6c606
 DIST crossdev-20200131.tar.xz 28200 BLAKE2B b1b8e283d150968339e259c48b3f066f5233af2578b04e060d5e69c002af6ffd65214c559353a8ebcf3238c2b60d0ddfa29131e26c707647717088df55f77282 SHA512 e1d18a7d69cdc0240d30e77b1634bd6b5806e1576227e4ffa394805aa217c050ced75436e9a004a35bc9bc47b96ea2f3d8e19ef530a106736f7cc0d995bee4a5
 EBUILD crossdev-20200125.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5
-EBUILD crossdev-20200131.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9
+EBUILD crossdev-20200131.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5
 EBUILD crossdev-99999999.ebuild 856 BLAKE2B 8ec9e78dc63a9bdf766b1010b0953b7da86c164f221fc31058dc0e02e160091241d68d38b75f155bd8c55074019f626e9b0c272899574927f7aec9560207e357 SHA512 bffbd553b032998e649c5b505d1e7758d06d7b6f8b9d25487c8d034884dbe01259585597f731dee3e10a0e3d7bbc2ecab606ae2612fac7e46b03c91f74778490
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20200131.ebuild b/sys-devel/crossdev/crossdev-20200131.ebuild
index 809478863946..7a6c51ec73f2 100644
--- a/sys-devel/crossdev/crossdev-20200131.ebuild
+++ b/sys-devel/crossdev/crossdev-20200131.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 663e43b36ad4..5df6a4db7e22 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,4 +1,6 @@
 DIST gcc-config-2.2.1.tar.xz 16292 BLAKE2B bed319b73bb1dd1c693715654dab7d16c12929353eb28c6e93ffeda0d4539d8204e84287c58de65ed5198011130a6e0ef71421cf41e7cf59cc48781a94ec9af2 SHA512 783caf2f4236d7c84e7c76c2d001d069a1b8544644d7e6e12b79f4dc55f34c953a24a8cd8d01b2aa69fa7f8e02ec3380e0e33a83eda6b3cb00e8c43d2f69f673
+DIST gcc-config-2.3.tar.xz 16736 BLAKE2B e8c22348d73ec756ebe377c3f9b0aca8e22b7ef53507bfa4dc0fbd459bca38ba6bea9dbb290b4d83239c21c913d12f8262a263e1c078a3997558a0b14fdf355d SHA512 4ce1e46bee6b2182c664746d939a7d843d5b4323c860ea3ee24e36aa629e65f3aa99da99905d4a7091ad0a3a37c14a6a56a0f79c76d6bc93fa0dad39552f221d
 EBUILD gcc-config-2.2.1.ebuild 1186 BLAKE2B c12aab5a9529bda5ad1a8d71598f8614428e494607651d26b510ccb14a5f612a2f114c8d40f9fdee1f4d62397891dc619bc60d7f54f1e987d1ad54f6b956a4a1 SHA512 ceb3d6b270f1bc0607b112dbb09faa27bc0584f1a35abcd770a4f3c2ac673b3a22ee3f3eaf6ac1073af66bac9802197bd408bee6a60c1dacd35350d04010cb6b
-EBUILD gcc-config-9999.ebuild 1191 BLAKE2B 5968b7ce726f124fdb75d485f0e0ed55f86b1d46df261824a5f71b4ed3738d1fb0565af51b11bdaad1ce0f9dec4afdf22d8072b228e51bdf8b9200fe4a01b001 SHA512 f65a73ea91c35638620f16c68768275dacfc5a47dc98b92ce9ee5c1c6477ea4d329321b1a9b1c96eb16989d1b30eceba2c5ed72769e7876047cc1897a0422e64
-MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
+EBUILD gcc-config-2.3.ebuild 1477 BLAKE2B 54a4304c340b7841be69e7308ff3c9d1b3c4db050fdbfd51313e47ee98e6daba6d9656264193f5c0997159ba0cc88c5eeaeaf0f6c01b53aa8ddf04cea2f2d5f4 SHA512 b4f845afe3380107f7444cbf1d18b7ab00946e0b2e3853f4eeb368c655b5a920217a137d0440cfc610a035f1484d02499d17a381a212994e59e0bc29eb305edf
+EBUILD gcc-config-9999.ebuild 1477 BLAKE2B 54a4304c340b7841be69e7308ff3c9d1b3c4db050fdbfd51313e47ee98e6daba6d9656264193f5c0997159ba0cc88c5eeaeaf0f6c01b53aa8ddf04cea2f2d5f4 SHA512 b4f845afe3380107f7444cbf1d18b7ab00946e0b2e3853f4eeb368c655b5a920217a137d0440cfc610a035f1484d02499d17a381a212994e59e0bc29eb305edf
+MISC metadata.xml 419 BLAKE2B 5dda1b92bb225b4a887de96721c7f8913e7ae26e0780bb0dabb875b0ee6993ec118b01c085bfa8e2d7ad824b23b561caa8a1bba443728832809242380dcde77c SHA512 7735c88b13f8ea1f076ca4344737d4d1200343e298ab37ceeeba0ff4651af7987140e541136bbdbb9feb75802e1b57f48c7b6c53bf684cd542f06adeeba5c562
diff --git a/sys-devel/gcc-config/gcc-config-2.3.ebuild b/sys-devel/gcc-config/gcc-config-2.3.ebuild
new file mode 100644
index 000000000000..e2c270403dd3
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-2.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Utility to manage compilers"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+native-symlinks"
+
+RDEPEND=">=sys-apps/gentoo-functions-0.10"
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)" \
+		USE_NATIVE_LINKS="$(usex native-symlinks)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)" \
+		install
+}
+
+pkg_postinst() {
+	# Scrub eselect-compiler remains.
+	# To be removed in 2021.
+	rm -f "${ROOT}"/etc/env.d/05compiler
+
+	# We not longer use the /usr/include/g++-v3 hacks, as
+	# it is not needed ...
+	# To be removed in 2021.
+	rm -f "${ROOT}"/usr/include/g++{,-v3}
+
+	# Do we have a valid multi ver setup ?
+	local x
+	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		gcc-config ${x}
+	done
+
+	# USE flag change can add or delete files in /usr/bin worth recaching
+	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+}
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index c27a2a1f2a82..e2c270403dd3 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -9,23 +9,23 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
 HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="+native-symlinks"
 
 RDEPEND=">=sys-apps/gentoo-functions-0.10"
 
 src_compile() {
 	emake CC="$(tc-getCC)" \
 		PV="${PV}" \
-		SUBLIBDIR="$(get_libdir)"
+		SUBLIBDIR="$(get_libdir)" \
+		USE_NATIVE_LINKS="$(usex native-symlinks)"
 }
 
 src_install() {
@@ -37,12 +37,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	# Scrub eselect-compiler remains
-	rm -f "${ROOT}"/etc/env.d/05compiler &
+	# Scrub eselect-compiler remains.
+	# To be removed in 2021.
+	rm -f "${ROOT}"/etc/env.d/05compiler
 
 	# We not longer use the /usr/include/g++-v3 hacks, as
 	# it is not needed ...
-	rm -f "${ROOT}"/usr/include/g++{,-v3} &
+	# To be removed in 2021.
+	rm -f "${ROOT}"/usr/include/g++{,-v3}
 
 	# Do we have a valid multi ver setup ?
 	local x
@@ -50,5 +52,8 @@ pkg_postinst() {
 		gcc-config ${x}
 	done
 
-	wait
+	# USE flag change can add or delete files in /usr/bin worth recaching
+	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
 }
diff --git a/sys-devel/gcc-config/metadata.xml b/sys-devel/gcc-config/metadata.xml
index e396f3755977..33e9604b0414 100644
--- a/sys-devel/gcc-config/metadata.xml
+++ b/sys-devel/gcc-config/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>toolchain@gentoo.org</email>
-	<name>Gentoo Toolchain Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<use>
+		<flag name="native-symlinks">Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends.</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 72b5fa3558f4..aca5fe85a74d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -10,104 +10,55 @@ AUX c89 412 BLAKE2B 04236b6a32e8819c65713821e769d5bf55f194fb6bdaa61c48ad09c7e13e
 AUX c99 446 BLAKE2B 061fcbef85149de611c4692c99c2c5ebeeef045637b999dbea0d1922398e16361cedbd461ed6aaf0c49c6269900a4c346f5026d8c22780044e1cc8afee74be4e SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989
 AUX fix_libtool_files.sh 1546 BLAKE2B afef9b4e3add813374d95226ebe1d76986c00c7e81be20cb5110388ad9322e1a18f42d8c1ad2d355699033bb5f24071e2c1c308eee6390eeb864769f13e93614 SHA512 3c6fb7d8b127875aa9450b0f0835f99ae69a3d88df86fefc3932e9ced9912811f58e21a5d1ba9444422476efb5497452aa8a89a9d3499ad88add493a02b98fd3
 AUX gcc-4.9.4-bootstrap.patch 2698 BLAKE2B 2fe9519590f0870aa201d550e027eaec311961c07b62f470d77f1de125fdf81cab6f884f08dfd8b957b7c2880ad04a7400f3fb395f5404d6c467373042e2fb0c SHA512 c712234b87aa66379bc52b43bce31a2dfd8de996030588a26261bb08471cd6e92587bc5aa35bb8f776a5128b1deb524e37aebe1c0b970a98210d653b5094d95b
-AUX gcc-8.3.0-ia64-bootstrap.patch 1327 BLAKE2B b8f2e46eb619830fec5f44350bac7f4e0908bca0460df642269b1404e3a11526142f9e658a0c4598ada21e68353d137e892eb827fcec3a25516775e8d89ecb40 SHA512 8c6802ec130bb618b675f8519729f096933d19ff246d10e231ec9e94ece532a06edff905f5b83023e32416f99c06635714a3dfb767740d3786587536c7bd9554
-AUX gcc-8.3.0-norisc32.patch 1390 BLAKE2B fc9d4b5afb57631957d66086af67de5843c3a3421f855bedce747fe41b78f3423c33c0cbb00ac8f4ed27af0691d1f0a7b8342850826667f25ef8a2d63b4e6944 SHA512 8e32e1fe14bdb1b29a6ae3c64f7bfcb7db41ba3fadaa00a5f2b85e4d63991bbb624ef04789a313c277a016ad055795ddba23c69762c19e3a536d4cb101cca2fa
-AUX gcc-9.1.0-norisc32.patch 2559 BLAKE2B 3fd196fd55ea9aeba406b7dbfa60e4c888e1cce7982f6ca35432161f9d523ec05d676925a33c07b4a140d26f9920677a9f70803c1696d085f61dd58950281876 SHA512 3e9c9b172ef4b228a17b8e914816abc8360de8650625d34956a604ee233a0f4a8d05c10a23ac02b9da82ea34d97b852f164cfb5fa2d69de10a6da4c75255cb2e
 AUX gcc-9.2.0-neg-insn-cost.patch 728 BLAKE2B 31b393a42b5d54de07a43cc6e43dc9d7228905ceaf27f7541cad4baf4d1f475dfbf0b6c00e76e5cddaea382fb77909166843f16d2a76b07b9c42bb0e181b5781 SHA512 057c8fb003df37dd15bbfc7f9e87e07d8a1cdd67885f8efffb80aaa694cc9314bb7317b43e57be55d55b3dc58a29bde138b07738a2a0d6cb8454b270e1c88983
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54a00a88b5c389bbf93b8b61bc12c86a07df03d57280759e5485ac0cd89ea69826ace01b5720681ca3102640b SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16
 AUX gcc-spec-env.patch 1544 BLAKE2B ebd019ff63f6a8526f741f1760925538f10b25c7d5fc69bc015e27bdb468ddf1239aa9d0af21520ed1f286babc98b7418828e212b68415d238cd2c78b43db2f1 SHA512 ce9c1f923e2c6d17347ec2d3d8482351a9644194b2753627389294d43bb4f11b9c2ef41eda1b46ad83d09901a0bedebd5b6b8a57a198646030ab61e8d2d8cb48
-DIST bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 829688 BLAKE2B 5a33cf9ecf04df64d23901c4b03f8ab5aad5e8ebeae225fa08c7ceb5fc28c5010685e7c429a1e8b8e21402fc5b906b2f3184a3095e302df647e031339c4e0cef SHA512 d4533d02289dcd2ee11952f83dc687d82624d6e31ddb548e4f54cde4ef9cced5a1aac5b64086441f8930274e31f20d0ee82850fe1257f96c08b05d406d3b2e26
-DIST bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 815566 BLAKE2B b202610cbc3e5a902a2bd9f3d217d224ea5f3ee68247557af907736cff577cd720065ab1567046d89f6d87cc433b3edbd1a24a3c8ef2ced97af9782ce49cab26 SHA512 da11cb354d5ec95c74081c2cbb29bcb49817a1f9d6875587b4a27f1c9fdea8f07eec8147b739bd18a4fa2365e5da50e4bca7d7531612fbf2514c50516d225ac2
-DIST ecj-4.3.jar 1377431 BLAKE2B 1d6a8ae1cef0fc4ee325f935873e4a2e560c34cac929bc4190c7dd47e1ca4480ad608f0b7a5d00f2bde30ff2dc78f74ccb0effa48db1df9358a6e35ebce32100 SHA512 c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-10.1.0-patches-1.tar.bz2 13432 BLAKE2B 2f0517778eb012288ae305a91f84eb31a5f08f842c504201f1a8085afd42ed4c9b4a5b15f7553982c926735e8ea57307a1749004e679880ef47abad7d4596115 SHA512 cc513d8b68dcf484d37c51961c809fc6c470a8341f068b4029430ca4677e7b49155c3d964b3b9ab50c69835b32db98bcb9a91f14de14417e4611521059192118
 DIST gcc-10.1.0.tar.xz 74591240 BLAKE2B d64cf01beaaff7af9e7d5b1d5e6fdfb37cce5667b4455c1c9bbfd190e631f03555d63d52d31e7be5ac232256be11058f89d5bc7d0dcb01de44e90a52645ad87f SHA512 0cb2a74c793face751f42bc580960b00e2bfea785872a0a2155f1f1dbfaa248f9591b67f4322db0f096f8844aca9243bc02732bda106c3b6e43b02bb67eb3096
-DIST gcc-3.3.6-patches-3.tar.bz2 52952 BLAKE2B e4e52b96f67eb8f09ff814b54c60e92b424c38ea4b699a81d37ca9d97551ac665579a624ddffe6498a39a92c2598fe886c9e1203dbf5002252c2edbefe577739 SHA512 a3b35fb0c9faa765c136d4b10023fdffd0d99d256bfffce1a72be778e972bcde1e14804ddb3abbce3b99875968241cc518308a70e9070b6da20f34cc1fdc3605
-DIST gcc-3.3.6-uclibc-patches-1.1.tar.bz2 27261 BLAKE2B 3e6874419f33ff95f166f5bc8aaa0d015340f025562e432794941fc5bcee7190266c414ff1482fbdea36ff90e9886dd7fa6174d0a3482034a661b27b1511c012 SHA512 8e487053ac00153c3670280a977da019eabb6d1c3fde83b964c37ef09c2f7249159f1768e619554fa3e48323ebd7ca2474629f3fbca156f6448cffb6991ec210
-DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
-DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 BLAKE2B 174eb5e437367a8e64a48f3764b4a3971afc7f5bffac583b7cf4e98a2ea2241ff896751137cc59d45a12b12333319efd52094925ba175073fe70dc143a5ea7fa SHA512 c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa
-DIST gcc-3.4.6-patches-3.tar.bz2 62100 BLAKE2B 9d3c2ba5095066ef0eda55e80f2ff62da13c41e7b38193439f29e127004c487de810b5975c585d5944888b5edde7fe24ed8adcfccfc8af24e4fe40799d4e8c8d SHA512 6f68e29ec86d5e3921348be2c5a9eb79e01a5169c20224a9b53fdec5e02a10cb687728677ba9440bf48219f1b9fbd92c0ce72e371f6b16828912e9f72cd8433d
-DIST gcc-3.4.6.tar.bz2 28193401 BLAKE2B b3e2d52269e59acbdb04248d8d95bee957da29722f998ef39731b8f4fe9ce29ab6b29020be440d7d5db2b56f93fa77bc7e56f979912d03ebb755a92ab14927c9 SHA512 d235e1223d5faf8f37f2d73db35edeff44c88974b09dfcf325f4b181b16d7124710d93b1b65b60206ce3525f062236ea0f338b3a5341d7ecbe196d8e90c3ff18
-DIST gcc-4.0.4-patches-2.tar.bz2 43785 BLAKE2B a2815fd8ff53332c93e14308e1b7d19010e74fac197998005d741bb9ddb646f7aa6b028e4f12c88c87df5eff2f540e96f06577c20c82b93a58015d4ba22f3713 SHA512 f2975fe419313158586157fd81ce35c3d599d1718578ec0e48460e6ddbc08870da78fd4c4bece0518b2f1aafe2f6738c87d74f4eba743490f3a4297d19318630
-DIST gcc-4.0.4-uclibc-patches-1.0.tar.bz2 20164 BLAKE2B d2d9626f03bcf0b06f316f22f2d4ea71ba0721d8369ff914bb27e20c4423a2a5b511bb23e74d2efc247ecc9c0554144a7ebd16d8baf432e289226ef610bef978 SHA512 67bdb8be3b7d173795ae3692f8f76fb6c236bfe3054112db30e3f0a56982685fe0b15e2c37f7d9e15e6198e4a41e47e1434a2befeee4e9e460e7bc9e0fa9d235
-DIST gcc-4.0.4.tar.bz2 32642939 BLAKE2B a152e6183bb288e587f1e6ad21401de5ce21f871aa4f82344bf76af4518d3286d281770754fd5744a9c0a86bd656be8bce88aa72380e42c438271e1f471c4d8e SHA512 194c12b5a1bc50c003f6fc849a4c0032388a960fb4b769bdb6e76cf330f04f880a0723661c991ec03742443c21ccba9af8599ae648a0777e0a5875c5fe7f6abd
-DIST gcc-4.1.2-patches-2.tar.bz2 56296 BLAKE2B 1b7660dc55ce36158f0715c0e277621deb2dbf45bdcb15a723e8c75038c1591cab64864d8a8cde62b443933b6212703996895a98619506437eb185b9f866e4a4 SHA512 c61b0251c8826be34a6688924f61a4318ffc20fe22a7aaee98db69aa84e29f90c2e1eb8c78961f8d6b4d610478c242d3fc1b74642e6e3661b102acea1f1f6e14
-DIST gcc-4.1.2-uclibc-patches-1.0.tar.bz2 20980 BLAKE2B cfc7dd4c7a0b1ed80c491d4ad56b05b05ff308fdbed2faa1b9f15b10c0f7834ee4ffcb0df1619f959f7a1a5f315305b550665c232404a8a3306e3e615539a0c8 SHA512 57789f4236a3085136afa83be3cef677bd813afd258d67bfdbecd2058f497cd459366d5515044c0208ab753946dc951dac6a3889752ca6dae836d837c22ce33b
-DIST gcc-4.1.2.tar.bz2 39707720 BLAKE2B 966b6a64c118456c7fb66eb2ad0dd84b1d53ad88dcbd146f446ef097a6975f5d6a7f1bcbbc4bfcd4e48b00eeb8054728e412db3d9818cff1f195e37859a4e510 SHA512 b97d3b72a3b0355611d5090b2c715b7a774f0e466a89326a0226c2809d12dfafb2d7c5a7af54bd5e00c135bbb6596f535e1a484740f7f1f691e8a57e6f0425cc
-DIST gcc-4.2.4-patches-2.tar.bz2 27511 BLAKE2B 9d4b84d2f0032d99264eb684f56dace3b354112f8265881e1c40707cfbc10c9488662048bcd515f45561118a91472369e2be17ca93cd0560a951739714fd9143 SHA512 26fc63ec19848b6e1ff776622d6066144315a6e0a051e84c38129f684002578b3590b4d8e3b84dd2f4d83209abc14db5b2dd56938b8c8b9e2f48152314ea0a6f
-DIST gcc-4.2.4-uclibc-patches-1.0.tar.bz2 19167 BLAKE2B bf2bcc9ece9096cf7fda9999c56073774072fa03e5dbf389a617888b2269bc79a7cfb68a6e26da66dedce9f954a1766ed21bbdd907b747e9fb5ea3a0fbbb6474 SHA512 5545cfe6bfa7ab9a69a474cc051cc8744380077dcc193afefeb455e959e408a5e4dfd1adde5357886c7f598835400273ef80ad5c14976c0552b44f5cd48704ed
-DIST gcc-4.2.4.tar.bz2 44025458 BLAKE2B 1d9645298dbbb1aba7b2957acf5b9839bd702a85120aa82d4cada0e4ea68a1d633422d8fcedc405504768e2f932e4b9d1a70a86da0b8efa5fc923b786ebc259f SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9
-DIST gcc-4.3.6-patches-2.tar.bz2 78999 BLAKE2B d84440508462ae82f40fbe6bd8c44dbacd25ca32fe312e15611884d5de31bcb480c6c8894bea3ad909f4cd23fb86c64f4a1bcbc0483e3a1a3d17c6c13d40d46e SHA512 20d23132ed62dbdd8138a617b185d57e7209f4aa00f000e14f311c399db8345c43ae63fa9d3ac266fbd656c4d6f36a7242e1791046cb955398ede186285e238f
-DIST gcc-4.3.6-uclibc-patches-1.0.tar.bz2 3021 BLAKE2B c3b18a85253fc7b63e2f1fa541ce2c9bbe0c664fb5da8d494c89889d19aaebf513c40cabdf3271e3d074aace500bcde4f0ba4478c35ae0ae105b4a31d6e4e917 SHA512 6b85bf4caf5662ae114e472199c2f77d1fef63c485c073643968b6e0575c13bfa4ce9a32191908f34e70d41fd9fb5b9bc2b527542d82dac881a0462bfe89b120
-DIST gcc-4.3.6.tar.bz2 59756702 BLAKE2B 0bca01c8c2e7d8dc2f971c2b2bfb52d61285154c3fd14d6356a1cf083622aadadd9031bf0aead9a285eb1c4200c2d9515773c256acbdc901842aa16e06cc81e7 SHA512 0cb43f523135c6d54b3b5e26de7044fe096c16e7c3af8e400b2b48c5e52b4b5aa56615b1eca5e326b0202cf34870daa6ac44ec9633762acafa4425552b4029ee
+DIST gcc-11.0.0-patches-1.tar.bz2 12832 BLAKE2B aad6ce610fa484c4bb2e80f237c68f253db1767ea4274380c66ae42c45a300e58736c4d64a73106af254d2293f1f6e27e1589d013613346bc56265efb2ca00dc SHA512 cdabb7f3a699aad3d796b1bbff173736dc2ba1c0fbb42980b01221e86b2c964786558bb2197a05785f124217ac083ce83dd97dc29508acc1b6fe4a17f0b5ffe1
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
-DIST gcc-4.4.7-patches-2.tar.bz2 27816 BLAKE2B 59a1ebc7e4f4a8db0a8e3f123aa8f8c41c7b166311bf3a0208ddef46d0cefca041a68ec1987df9e001f676459da76e6a39486f2071541d1c6cb6cad176b76365 SHA512 8a9364b0e0a5b48f9cb11e749a9261f5fa29679af57a52eea3970201e1be926039967d889bde4244e09fd8c606f308ce247589fc98bbb714577159f4b887b18c
-DIST gcc-4.4.7-uclibc-patches-1.0.tar.bz2 3016 BLAKE2B cced59dc8f03a2f8bce7f95c5028164b41189b2272ae6a0d525241dd24df827292dda39b1bd9b4d6c0741be0ff0eb4df62d7c6aadf54d54c2bf64f268c68988f SHA512 46a69cb8e2e3b97116d012b95a515953b2629be04228a2ac90fe628705e6bc3bdf05ee22e3ed7d5fd0fe6e60aad8f1f96f36e8dd3b231bdfd048e61c6cc15beb
-DIST gcc-4.4.7.tar.bz2 63179340 BLAKE2B e01c90907228572c3d25bbb776c8232fa3f8e8f4112a27f69be2bad8eec50b68add39839f8d5726f5f82491f50e71fa1b44d98b60a3e0f145848a0e0e8760700 SHA512 5562a7319cfd8cc7c5261de9170f2cda86cbd3a231a444a5ec0ad3d8fd60af6f8bd86af8f201cebb7bddcd083d761834d1cbd652c68af0f5607d22a63439ed0e
-DIST gcc-4.5.4-patches-2.tar.bz2 22782 BLAKE2B 8934812b03b4ad41674fc66f3e67d1d7582bb53ea480b57950b12b9a02653da01e919b069b9509d4502e86adbb510e446a13e44ebc118caa9d7448e5632e4793 SHA512 4d6b54c5a6747756e2cf2c8ddbcc295156de0e5229709b29638312b68f7da9e32e4d3a5840068faae821024759990313ba0aa491b31ef1dee9b60faf76e9ec77
-DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B abf53f85a4af1336437963595b04d2c24284ebf7cc76d845bc3502cf54ef2dcfc21f76fda336f99165cc9939daa8b8c8dc9493c276879670a3cd0ac0efe526da SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a
-DIST gcc-4.5.4.tar.bz2 66426133 BLAKE2B 8725c7868e1fc9e72a28635f39aa014681aa502db4687e5d2d6ec7cf6d30b04902eca2ebbc1ef2b0e20b89908424d0053f0958e24ded5366fa1c38469913caa2 SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115
-DIST gcc-4.6.4-patches-2.tar.bz2 19007 BLAKE2B 02e2de43d2ff52c16dc19bdb986b9938b188adc806b1cd540dc58747e9717d803c018649f1fe696d488cada7f44c498d754a6db19adab4ee06016fe70a7a8e4b SHA512 848e748bf679970d749e8e5b2a073cfb1b82ce49bbf7a24ffa9100ce93d357f4aadb8709cff3ba49827a1f31573dd212067b1fc841b3a078e3803e17ca03e207
-DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 BLAKE2B e841db5125638b0ec34323d0500786ab6577042a22af3b423433542164408199ac4ff1036d27999aa01aa96e9e50988df2e86835102142f74c3f8fb33096a47e SHA512 fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133
-DIST gcc-4.6.4.tar.bz2 72006076 BLAKE2B 321c14c097c18cf60c32d228720980717e25e22e26ce5e75c3a411c423f9657eb896974200664132e2fb10c3010c5136d2da7f3c916fffddf7e4afe4e8bfdc20 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc
-DIST gcc-4.7.4-patches-1.6.tar.bz2 20746 BLAKE2B 56687d1788b2a6484fd52dbfffef77f19f3182a38d90ccd24f8df6fbe5daeb3b27176cf01de7ce3723e79b427cd3cc77e06e690e13e8271a0a5067c20117c273 SHA512 4ad9a08f1c9b21b3d9f069346ca752bb9772b9826d3cc50abb9a1cc2b916c208d6a715efdfe3602d5a3f08b6c058e5bfb43f87248b7a09d8b0fc39e2403580bc
-DIST gcc-4.7.4-piepatches-v0.5.5.tar.bz2 15358 BLAKE2B e0df0b19829d9f9b1e8719467a6e15336d58ccf50c182c3d14438bc7e8690940535f6391b83f359c4e0bedf16814b7d4e2b0888f4698740be511bf6a574f9556 SHA512 f5e078bf4c17f7b5be102f1e3358d91c72e80363b5e055a92461f78399a1bf27bf6cb690d41900719bb260b6529f5d1aac999e613fda6ac5e4efa27f622510e6
-DIST gcc-4.7.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B b24522bd5516e0f2bb4e8d20437e0a0aed22ea8cae3c78fc600688f71a57bb7fbd3d431737a30e4406a9ff5426ed7d2289b3efac4d5efaa5841f7db290ef023c SHA512 c2e6c96b74365f8233f6106fa03d94075b60f6f77c683aa2e27aceb007da723243f8e3ddea8b178e6a0f7939b8e35615165534dc74e5050f87680ab261a31c52
-DIST gcc-4.7.4.tar.bz2 82935453 BLAKE2B 98cc902dd1506161b96c8eba10e5a5c7fb11d2dfd95ebac15825806fcdb262a1ff962b72275dcfc8453b753164fc234bdd666b207202cfd5a0a2b4cd09b8c741 SHA512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189
-DIST gcc-4.8.5-patches-1.5.tar.bz2 30345 BLAKE2B 1bd2868e675b43c15d4bafe3c18655042ebf2687ca28675d0e94135251375d6912e086f3132620d8a20a2a6d11a6282b2749c7dbd3b8bb1307909d3502610c32 SHA512 238b5a852521feb90f4f1df691eaeb95c7d125d749253fb800208265e10c9a357842206fcd78a4a2d9c6c16362b623ae1c4878f21e3a9010c6dbffafc5a31f66
-DIST gcc-4.8.5-piepatches-v0.6.2.tar.bz2 14265 BLAKE2B b3bb37957ba8ee446967a3a60fee61c26a49f237241bbaf8bb3c3ec63656dd0492f518b129c8ef43cc06091742bc9c0b1042bb612c1110732b1e9608f28753ad SHA512 cd6af4047d4719dae9dbe86ce5342c7d8ddec38aad032486713b08e1b0cb711f5ca017e08d583137d51b8d4ef673366ba310e71bca7b49b82e9314781d6e9d99
-DIST gcc-4.8.5-uclibc-patches-1.0.tar.bz2 2976 BLAKE2B 1a804fd0b2fd5756e824f3eb511cf62d6af0fa8059ebcffadf6deb85e242ec8728b7883f2e054b465b87e4b61b6a2b55061a68eb8329c3a79a659d4c15808d21 SHA512 5469128eab06525915c75241797ad9ec4b63072ebfd5e110319bf810633cf3fbed39bbda4f6a0c74e537b248e7642780ecbe2086ad10be6e66b7dd289fa6534f
-DIST gcc-4.8.5.tar.bz2 86165587 BLAKE2B 760931013f96083078e74b8376eede6c23954e1f41cb44dbbdd8220fdede48807d89b9ca44fc4ae309f7cef441831b533512f1145cd563c5c797e96cf6cf1bfa SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea
-DIST gcc-4.9.4-patches-1.4.tar.bz2 27240 BLAKE2B 26b7d08bad4b617ede2564f77ded67cc87ec6b9f6b4d4ff78b5b75c1d5739fc4049480c716075d74c9b8e23a4a3c1889796cacb3456a3982ab04a0781fe3cd04 SHA512 efa60a7f86e684710848182c7d040565c9cec7666e897adc02e5dea9d4c76117deece7b1f7e1f8772cdec9697bb92b762f93408824e47b3f63b4f35029f50a4b
+DIST gcc-4.9.4-patches-2.tar.bz2 27713 BLAKE2B daff50fcad1e06fdd04770d4be0c06f2c4a2abdcf28e3b7704fe5a41b6c02dedd33ea36db68b7f28fcdfc391f4731f85907ffa6d88bc98fb912db3749216e68b SHA512 e4cdbbb47ecf3107dc87889790020aef629a0b2070145df2cf23327c5343cb2ce5fe72f0d4661f19ba2a73ab1315a48d6f7a006d6d425f8de41db88308398937
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
 DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
-DIST gcc-5.5.0-patches-2.tar.bz2 30315 BLAKE2B 165c2d796008b62712d8481538739b280334f2111383bea182b9eb6f82631dce6fa7ae3adfe127acc113f5d91b7931133c90182897bfdf3cde30dfc6405536ce SHA512 231319dccfb4a8d7d386db526511ab248e6fce867e138769bf40dbbd5563e8e519140c377eb381a009172d07c778afbeebf749c5e8faabdc1da50c45988bee97
+DIST gcc-5.5.0-patches-3.tar.bz2 31519 BLAKE2B 7ca1850e127210c8f594b0061adf578b9a94c69353a4a6e40722f7716ccaaa2979c0190171fbd84a756cbc1015d931afbf54a05c13ca7061105b626018b02506 SHA512 a3cbcf56c9655cb0f464da703277401046f309d4b06198dea18d3a8b67aafae30ecbfd01c74f2db375ce0801e75cb7be6016f96a0b61496e503e2fe22542c057
 DIST gcc-5.5.0-piepatches-v1.tar.bz2 14367 BLAKE2B ce1d288ca4d563cb12e2795dbc9f9c674e451295c75fb4b15b9ba65d3efc8dacea725775cca8c67b581647235b692dd4083e8b158f87c7951bbf6303d8efed43 SHA512 6baf18a7ac6cdc1f93a1a8f87bbbdcc96c68d2b256e82ce04beabdd4ad82b2260e04dbff0850da703fb94bb1f9e13439d2922d7aaae3b12eaa92bc53a89a9398
 DIST gcc-5.5.0-uclibc-patches-1.0.tar.bz2 3518 BLAKE2B b528d79d41de1099f3540c168339350b403568f38a338a5eeaf0a080ebc850cfa390ec72f03a6c61433f2617eaa452ed0c7397a530662188e9a73e5144bd6a1d SHA512 97b97d99fd121642ba7c170c62de245e9f2719dbfae148e0d69f7ee172f84669277f4ef26554fb4cecfab5956587ce50131d92e4244f28f914d1eecd2c361ba5
 DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1
 DIST gcc-6.5.0-patches-3.tar.bz2 10882 BLAKE2B d4eaf97c7d531bd02442b8eea2a8537436681d01a4fe225ab4fd31863c174ee76fa9443c083bb85d51743c7d3e6e6791cf94390cdcc80f5d05179f90074b0346 SHA512 e99586b142cce71aca0843543a195753a27872c9b49ca841c8b3525d8a010d8e6793dc4800d9acd89c7f63c57635e630a2db2f25b33f9690af4a1eff1aebd9eb
+DIST gcc-6.5.0-patches-4.tar.bz2 12270 BLAKE2B fe985ac4d232b3e237c99d9441ba8fa1ab8e1f223ef93e93580f53fcc54c874d7ce3b1dc0041a9ddbf540f532f32b2ced95c50f412a466c49a7b78fda8d5be0f SHA512 5c51dddbe6787b968bbe358ca6e5d3a18203d2fe59fceae636b820e757b9b91afe52b569d7ef1734077151e1c3f70744cd51f3c840bc050ce41685a345f5cd36
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
-DIST gcc-7.4.0-patches-1.2.tar.bz2 9380 BLAKE2B a9608c7993b875f1c8d81e2aa15c46e10f91e6f37a723d7c09dd29dff7bb169a58597afc483dd46ffb3ce24944f824d746aa49d1a59924036e04aa855ca875aa SHA512 7959126eee11c10d9c3bbc867f6a74273dbd6e8f2d896d65b3fe1de73f0d8e09fbb62c7ff02ba8d1798206251ad1059c4490cdefa8adff09212eb23403923642
-DIST gcc-7.4.0.tar.xz 62601888 BLAKE2B df91ec680d5389736d3a37a2d85cf2e12fbe87b642fdf4b332e67a043e00944aca00243cc6709f86abd92115cb5a78502146636395571d1ea4899531e15d5d0e SHA512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
 DIST gcc-7.5.0-patches-2.tar.bz2 10573 BLAKE2B 7f631174fe317d97d92cbad7dd18285eb1596333ff2dfad346fea0d76a00fbcbd78b4c296f863854772c9ed3ce23ca9fd41c23d02e172d4dbbf23bd1f803bb4f SHA512 1f53b320acd813e97bb37b3165f6f2e37259d551e0ee49df08056c0b17a7e4a02b3a764e56d97a37c4cb71302ab5fe55b82f0b96c1adf5fa8b71016cab4fc0b9
+DIST gcc-7.5.0-patches-3.tar.bz2 11613 BLAKE2B 84d59103bffaec8fc57e69dbb17f53882935b20c23d54db5f805e8270fa16d8e572ee4a369ecc82d2279cf66a71d1eb2a7f0c9792d4495d2f68946d6b6403f15 SHA512 6e5bea150c56ce3d43c9b0878691ed54ecc5d2a12482e99261efa74af7f1d59ec94c2d0c363792d99e0d3a0abd739d5d06b861da4dea2c1676e5d498b5815d55
 DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acdf27419f1067f5c3d087333d9eea0c8db427b8bd895af646990bb00ee173069980ca49cec848434a4127256f SHA512 fe716cc19f2e3255d3a8b1b8290777bf769c6d98e6e0b07b81a3d6ad43f8af74cb170dfa18b1555dbfcd3f55ae582b91a286ccef496b9b65c1579902f96a1f60
 DIST gcc-8.3.0-patches-4.tar.bz2 17095 BLAKE2B 449d83371bf5a70020f4caad38d7b8f79bc4b3aeb13b060d28b56506fdd33e15527ab38c41baa3134dc9a25208dadfafab5992e93b2e9719dda420f830e7a8bf SHA512 0dcc5ce887b5c1dd9977ca1b1d8760563edf7ce2d39644f6212397c55c325ee441e1e02aea623bff157d95827db25528791137edc24931a88baad6499d0d15d5
 DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
 DIST gcc-8.4.0-patches-1.tar.bz2 14854 BLAKE2B 055ac27224a100c9678b343fe85e3431d4553780716ac2a9cdfa1e5bcd7b5073b883cefa460dbab8b34ffd8d19dadab0e66cebf9ee51a89a8a2d212268450248 SHA512 aaf44c0ccbd99690cea9cd4452bae8d4d6bff98ba591b29d50a50c19f3221c24e923441a24392f9717f541aa4e097645756fdf0ff558b7a263ef21d7d1e334eb
+DIST gcc-8.4.0-patches-2.tar.bz2 16254 BLAKE2B 5ee50ee1a3f6cdb392b370a0f62af7e8fd2fb2cadc46d4faf37ddbae23812a0e9f2e35a4ed6a08c41ffe648c21e9982e965d3ab91f68ae941c6cad74098afa2f SHA512 26fd2ad9f29dfd1db671d4966c16165a6fb75bd74f440871fb41dcb9b6102f07347ae8df67baa9e4d52aec91d3d67803a952b7bd45159fde56e1a1f28237c5eb
 DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280
 DIST gcc-9.2.0-patches-3.tar.bz2 15452 BLAKE2B 8ebd8beef1a7d3b0e0e544a0967599e9a06662092e9f4626e071051c3dbbbfd9b74fcc1bcec6405960a50133d741906f77cbf2058fba140b5cd35f632e999a92 SHA512 ea1a400d6285c545d28b00258d8ed67f7deb3211c28db32e2c9a427c166481d80a36d0b2b89c532e84aea76ed705cdfddc51ccb2817cef7928398c092937a9ad
-DIST gcc-9.2.0-patches-4.tar.bz2 21655 BLAKE2B 2acf6d83ec934a65e77d2079a024b42622e1234f0516f12839f7d03c2f3e1bb275037b020e35ba847d6809d5577ba966619c78345b75355df0a754d02ccf9819 SHA512 114e01a7b08ecb1feab24ef3cfc72c8953748f1526722b80c18602025eef132e2b4c05db59c7a23eb2e7f42ed48eb02d92bcd73b1ca932374d6bedaf89cc66d0
 DIST gcc-9.2.0-patches-6.tar.bz2 23171 BLAKE2B 00295f471a276764daf003c0eb6351d6d4e7e247df2519b4fc6bf360d72ba10af1230ca0175cbd96ab4beaf0123b5061c7c2f7f5c0b95b7f416a735ad9ff454d SHA512 8a8a070a66a24f31ec2d3d1cf170db2d030a1667485064646d360c3154330f01e7b44595642040c07d033922f1654c4b18bbabfe269210b3d1aeb24fe248b613
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
 DIST gcc-9.3.0-patches-2.tar.bz2 13230 BLAKE2B d37859c753864be2c4b8c98847f6e51d9c2b1c091304971c31cf680d6f2194131bac3dfd625077117ca452d6f4416e72c7892d19ccc5880eac7a6bcbe5b2a286 SHA512 c5f7c9d4350879e5ca61e97897e37e4cfea56d0c961aad8df09041e6b1fededad0d7ed89387836d0779b947bdfe7696009d5c61c73630c45f09ca1f3ec3b163c
+DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
-DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
 EBUILD gcc-10.1.0.ebuild 290 BLAKE2B 02d5ac3a657382fa7a1146e5d504ddd4d3ab4caf55f6e4f114a3e5bae01a41055e8ee7421a7aaa241ceff332fafa44c1bebc5bfc77960ea27f204b4b9c467e18 SHA512 e95b6d2bfb0f1297c7bc2a7f2b2cc36a638b60f2aa66dbcd499d86d2e9c9e4e85e4927fadde94a80cc7cc4a1874bf03d4dc6fd2f770953d9cca2ad25afdcdaa5
 EBUILD gcc-10.1.1_pre9999.ebuild 405 BLAKE2B acdd045129f65fba03a33cc6ea25c429dbc768264d1841445daa6715780f27ad8776199bb3c0c52287f3a70b6ce077a5d13f43aee3a0315106f0a3516bc03b78 SHA512 c0691849f15e7671654f00c663890e7189fa0d1694a53c3f5289a7325427ed31910ff175556578c4e5180fa8d5049973be0aada659d8ee8823db71f63772942e
-EBUILD gcc-11.0.0_pre9999.ebuild 425 BLAKE2B 8c050e1ae457edaa1da00bfd837e45e13907c3504de9730021b2698d073becd895b7ba983684df82e1823201f0dc71e920ae23d03ff5ac4f22b90e4e75a21d58 SHA512 326383c74f5eeb7b3b64c4587dcd318b47a9d1f69e294cc29b4208b7b331ee76eb226f55e4afbb10b4dca8f90a20e25ce8b78f738c8985903c09a2390e41f274
-EBUILD gcc-3.3.6-r5.ebuild 1242 BLAKE2B 9c316577e76d305f8eac6ba33ca97c26c207cade4da2f0d37c33be02fac6f9faa0eb487ddf9f68fb6db2cd128d6dabc3355eaef62c6775626af56eb96ba2f5b0 SHA512 3d11094be8ea52010d5128941db2dd23fae8e80460f2f03b03ee9111e5a32e3f6dfdf214d257de59de8cc02bdab9cdb563252a5b1a19ccb577d1e7ad8156cb81
-EBUILD gcc-3.4.6-r5.ebuild 1378 BLAKE2B 9e100ed11696853bc94162de79e2f2faad9762e86058056c8698d0666211a89b02156eef14514b137dc935c4daafd707187f52fc42e69416d76d68e975ff1c47 SHA512 4d0fb19b03bf5203d1d5c297a7de367b9f5fc26001af2bfce81cb24ae8f696a05ddeea59db2206662a1274f05e64a224f385ffdbcf696b96ac068b9f6c3809f0
-EBUILD gcc-4.0.4-r3.ebuild 242 BLAKE2B 269e476876f1ee62e288c7a3ee14a2261698bd12be875cd6bde54cb6d048bbcff11a82fec5b46d740fc4c607deed8cc6e1452cfcd4e5fa32b8a11708b86fca20 SHA512 8bb91642a9f12b48ac79011885bf416afdc501f080459b02a32efd2577ead6d6076f2a6637024eeb2364889de1a45191c0b3e47e7038871287b073072b420015
-EBUILD gcc-4.1.2-r2.ebuild 639 BLAKE2B d53b85c247c05141525b56f878a8637d90765699cf4e6917e1e43f81e1ef8ae1a712c75ce22a3adf897491bf83b993f6e58ad63db9c035236b5ca90868d605f0 SHA512 f83b2a2f22f0d332df4feaa852b6ea8d1187d9b172b4516676a50eddd1346a7a3d5c80471e1f6cb301abe5c3c8714c419b7decd5390129b90f2db46c3f736582
-EBUILD gcc-4.2.4-r4.ebuild 380 BLAKE2B 547b1c63e3f35852fd1731bd7c18b54aad03d3796fb6065f537029657fd96cca930aa3f59e3adff034b1b81e5f46348a771c04f116a5fa1eccf38323a9d51c78 SHA512 4d2fe882873b3083f966c7612486a47f349182cf726cd18dd973ee884d1dab14336c524734aece515957c632e63dcb6901a844aa8e0bdf0eb47f0973eaeb54ce
-EBUILD gcc-4.3.6-r4.ebuild 619 BLAKE2B b762535b06447d7c51b00dff019901c5134039f2708c980f47b67f1b35bebf98b4dedd19a5e68afdfb88eb6cb0163f6f8f620a6ac52029d8a391ad907bd7ab6b SHA512 75ddab4a3c9caa736e379edd46c70bb11924061535c6a07a6145c4f4a9d4d5a6f816862e2ec44c3c40d6065457c245cc53233111e7360b118274d5f397a59629
-EBUILD gcc-4.4.7-r3.ebuild 664 BLAKE2B 75c651baffce01fdb277f40ad4404f6fe8e6a219250d52382ee4c88ece681cc3438c6c05fb010c57a22ecdf71518387934b77cbcbb2561ed8d395b592d88a84f SHA512 a5e4d77b3a2cc236aaed2df5d1e009087d5f1ffc07f07d5f2720d0d7d12ccd20b2d2b6adedc15f2fc197c2ac55da1432846e67e9cbbc4ee780489cb66fa3036e
-EBUILD gcc-4.5.4-r3.ebuild 665 BLAKE2B 2948e8405c2fdafc2025238d03e5d8e90dfc1cdc1e33984e1106a50ac83d1874831f5537acb572772b006a39a850274282a1c915a9b7eba5670cde238e0d307d SHA512 e1a733d7644144bbab9111651c2d75c65ca898e0d3e15a8385c025ab1a73a6dcd5a4482a5652e97c05f0606566df1f9c4b66860d51cd6a8f8bdeeda3c97a3851
-EBUILD gcc-4.6.4-r3.ebuild 746 BLAKE2B e56566d1dc637c6b87aa0073a525c2f639da1ab2c73ae03c3baa17df1e63b54113f5e2a63968117c76bfcb7c54c961f8bde6d9af179b706da6962baa60abda8e SHA512 32ce82c4393f221ba648d26c8171c15d27b3824c2cc6c9342394a5d2b87c76c7bfce1af76d51422bf5e79ae3c717010abfb3d82b873fa9ffd7dba015cc5690b7
-EBUILD gcc-4.7.4-r3.ebuild 1274 BLAKE2B f3243e7d4b7b8dc08cdd575c22f78a7b19b61d3f2c55808e59d5131654902d67cb8162992e0e9db74b734c333afc3390bed5fbc5a93caef48c1533287a937018 SHA512 86821e0d24bf1831d6d77d5230a8445582b282ebee0a3c4dcb23d63c553f01bbde9f7b14bcba6fc35cfb8be7ab1276781044705a0879d73baba2beda545a9070
-EBUILD gcc-4.8.5-r3.ebuild 1385 BLAKE2B 5ed907287fd0b729d4c808daeefdd95b45ef4aaf25a6a13bef266c4924a16d92af6b9aeee0bddddc558a33ad58d29d03b5c01f778a571b27907eef99c2ef304e SHA512 3eff1ba9c19a2a70b855cf0d46a67c6632589787d99a3261d1addbd8937bd1c1ff8f93124dd7e81e12fa4ba83e04bd4429dbdc3457016fb385c6ecbff92761ec
-EBUILD gcc-4.9.4-r1.ebuild 1444 BLAKE2B 3ecef2e4150f0e898226925961120df6ec7725e5dbf1cbc9ec5cb1382f5dca5ff2fa3f4c4ece97f17adf47a312e42d7edf53884b7d489f92e4b848f6d72249fc SHA512 c4fe2e86190c215b4ed0a90503d7db6921a3753472b21b077a4140b7b973d27b74d62ad5f73d4e0e9f598107e340bf389ace1c242bdc5a9849b9a4cb89ac7763
-EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B cd947d1ea85b03a37803702504ff438fdd776f97063737491dd947a64318596fe18ea8e5402e23169a6f6e72648de07babe7a4c9c71b5949efa50b9f72baeb78 SHA512 dfae1324898a4eb8b47ffdc3ae581b67f45155b041ee4672c7e843a6e7d6f193528dc5d882155e2d0717491d8ce210f3d3c85b92d3b4dcb45f14d68bdb072a1b
-EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B bdd1de3a0facba6f1ee9b0e7c8717920d0df66beb44b1b24a85f65476326e8a812d9dace2ca65e5df89fc2a94caf9c03b35fe83d6c18054e82ee751455a84906 SHA512 4990258b95bd948b1891b7265bac5bbfd5feaf1bb534596ad4c779a871dc5156db0c3286ec8396eeb0991ba5462a78a02d6bee9024967e375b23bc499bcaa3aa
-EBUILD gcc-7.4.0-r2.ebuild 449 BLAKE2B f25a70783840dd785025922c3de9432a19c08c1e187850d9212c1532dc512305d66d71638a5d3a6d07fa206ee2819a944627d0b7af652349cfffa135a8b8c21a SHA512 b65171a954f1cab8065c9009ef81899f4df6db734b50c29e23fbcad9a733cc18a69ea131fd7e69b2d7bd602f78228a9e37e5ed35e60e64a4ccd84479af0a055c
+EBUILD gcc-11.0.0_pre9999.ebuild 367 BLAKE2B 4dd45cc0f1599d2c94904cbc930285e75bb10de7611de5d0182128459a805cf6fd77e22f2d36e716572894a8d0bdb8264f6016266d7e6055acc157a7b8f0311a SHA512 0e7e924eb559d58f3742f3645c49bc73cc6a50079209de6ea4b9a7f3d6ee8d31b835d297d578aeea8c7f0731bb66e50546026b46fc6de6885ea123280f0afbaf
+EBUILD gcc-4.9.4-r1.ebuild 1442 BLAKE2B 89d982040aeeb513b50baaae4863edf3d8419536f09e4a44d327d0bbd342c528897209ff036a99ba3fda2c75cd36931ee8f413e273e86045cafd22c5cbd8957c SHA512 156e51cc3fee5404c97e04cb8eb96ef86b885bd4c82d3cf225075fe1f94cbed11840d394bdedfadd3e1ba4396e72a312892faf5e90b5f1d94e780801f590dfdb
+EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B 061928d67216aac304cfb6bb02f65b2ff04ee8139a005f0989ebfe75460af572b9bf997bdcdd3604267190db8b31b5d9512e4dd96c3fe92c7aa923d0dfa8ee37 SHA512 e9b20d919ea32363f5d0314ab59708403256d3a7178f41562f39cf15d223ce8fc96bab060fb10390720a244b87bced2dd0570f5e31059245d4c452050bc057c8
+EBUILD gcc-6.5.0-r1.ebuild 436 BLAKE2B f340e099406e6325e3ace5d179b01f1972acab4482be0af46017d1e55f5fd2a7bf1b8f7e7c7b493084bfbe4fd9c889d51f85d2ddd379f481181e9f645b4eebe7 SHA512 d5c9af31f338affd52e90651d2119bcc9f142d3699f83c5b14b095c8e05b9a1ffcb9d60f464567dee581ca26cf692bd0a611046e93ace8d85676ede02d9166c2
+EBUILD gcc-6.5.0-r2.ebuild 445 BLAKE2B 020c4fb4471fb540ece00f81800187b529c2ded64b249b4a82f81fab0e05d4b68ce165357dc82c71eae870ab4e244a4a56856b1fbfe890bd9c3628d345a56ea5 SHA512 998e30c8bfc69c734ed782081fe01533ee6106a77997d72f3500d9464afb586b7649e8ebaba2ac24a862592729780595a03beef99cfcf9ee6c52921f494746ff
+EBUILD gcc-7.5.0-r1.ebuild 456 BLAKE2B bad9ccb3415eae7e4f793fcda356b076556c62475d74e25d8133d1ac7b8f8c35394f999ccc1ed24330ea9eea454c61e953704f6dccc92edcf483bf967b3fe0cd SHA512 9ab3740bd4f074db8b96c06d45cedfa05719d5e832ed47c170733d7569b90966617efdf4c5bc7c2ec325dca9618d285f27c9f1e30a22479d7e763f4db735d7cf
 EBUILD gcc-7.5.0.ebuild 447 BLAKE2B e9c72e8743ec650fd79244b81e7855bcd1ff1b4a13d8fe245f92e0ae2fd37c15609aa951429afcd2eecd4ac2d3f45786e5e2d8a72fac439aaf7cd7a525f3c4e9 SHA512 3b0e22f868d6ff1ec47b21196354873da4d01f21350aea79d1a86c218d4245237a9e5462ae3cb5486ba48736edf6fd1550729a0b49fb22cd87d0f4d99c4eb68d
 EBUILD gcc-8.3.0-r3.ebuild 443 BLAKE2B d5da62636879b66b6e23d2bb000736c17b85d0ee81e3858994fc472edea55810b59f99737d07611ccbe7ff7e6b1af956e315feeffa3ffde227e92490c04b9300 SHA512 4b4b60fcdc829d5c28d8bff8e17d4ccfa0bb09426bf0b741fee6c5df6fc2753e8132c06d09cca8966ed398de4b1e94ba58cd06fb19c944f949a2cde0dfdc4614
+EBUILD gcc-8.4.0-r1.ebuild 452 BLAKE2B 0896974e52aeced6004b4bab01fea077803a8e92a0df45f1cd9df3bca0bc19bb1502ab764526749252888b0cc9a67ba2ef09ec07589768ba6d65390502a751fe SHA512 0016848b01a437b8d5e40e115fbab8311b525b41bab46b5c3eb47727abaf4d8b26828293407533792fc9aefd931af9b0dcd56c8853b5e9708081e62789e6ee6b
 EBUILD gcc-8.4.0.ebuild 444 BLAKE2B 2e2f512a590006c683ea89c51d82d64f43a3d775ef778941de495ae107ecf20dff336c56c9a32e24750ceb69dbb671dc955dd9f89ea248ed12ca5b7628adccd9 SHA512 182138a5434a5092d7a6d51d6c62294eaf87b10ddf72d817bda480e8ab4c3fcd07ccac6cae7c1f23ce640256f2dcaf5b5883bb50e0363202d7acbbf7c203a9a3
 EBUILD gcc-9.2.0-r2.ebuild 539 BLAKE2B d48f3dd9a33734a1db5546b6223bbb68ddb1f5831c92aa435fe6536af843f3754a688e728055b56999dd836a82e2bbc0f7dd9a4644d66d1c64ab127bba1af3a3 SHA512 a0b565c5a9c54f419c572a760f9b0b310e7008ca0d701a890bee224f7491c265e978215714d12a9565f4924f37c389bfd7fb1512d43e325e715d40ad3ec85f38
-EBUILD gcc-9.2.0-r3.ebuild 548 BLAKE2B 89ab2ddb997e6a6ff24151c074597040fc32dd755044b2e0d17bab595adc8fca34a253205dc5a6ba29f562b175a31854f74d51d4055aa0f95c53f92e64a6f03b SHA512 1a387d45deb6cbb58031c32c104f0dc40bdbcdc746b8e37e30d991f9b9461f87d46bdfd3498361f4b4c970a8059efba597f5b51062f103724724bd361169f9a4
 EBUILD gcc-9.2.0-r4.ebuild 452 BLAKE2B 5b1ced4bebbe5558068cde5d495e04a978292cdccb118f199642484a6cb4fdde844c31fcd99347271addaafa7c23e6d8dbbd13d1d54a08bbe9fbc470566817d3 SHA512 65ae72ce9e55b2c8a86375ffe8188d9e05fd82a077d8b5abac5b5971f152efb7610fce553af12f1746ec6f6bcf881fafe3db76a5098d99c9e56fdd3cc3091096
+EBUILD gcc-9.3.0-r1.ebuild 452 BLAKE2B a08af9f8f55166a07894145a6d53a4c6988b9a419e95386e28f6875d6a81a6a02db25a051506c981e17c68846056a919697cad6f5ee3461b4f3167777974921d SHA512 1991ba970e5e56eda9a8e1391514de8028ed6741b379375d23ae3e13f267203cdd29ac0aee9f8faf8dc6a42c0291095521257886c77bea64159665f0ebb00c1a
 EBUILD gcc-9.3.0.ebuild 444 BLAKE2B ea6cd0618f8e9a9de4b6e52e9597bb41427ab6b763eb52efbe99cabe02584d33e920fe4563cc1a85b47241ede3c24b0839dac8036f5868d47104cbe91ffeb2a8 SHA512 a238831c8db63c73c5edbd19121652cb0165220546811c9a2c82f08df54a1b1a6413592e5cc5d9d24ea771121721673881aae9a03f7757d95484c300b8fe78e8
-MISC metadata.xml 2970 BLAKE2B 0ce2155b175a12d60088bd98d8679024ccdfda4b789f141ebea6a580cc42b1f4f484032862d63969439341193028a061cff2d7efe6582a18ea7e0a9e9d461ac7 SHA512 71e4b2ff3be2cfdf15a39c336ff984184fe1c3057f7690496d7ecad2ea10f7100127725860820f8109d40e682624dd9bb78943747fb7df6898f5a83482a06754
+MISC metadata.xml 2741 BLAKE2B 0d133f98159b4fb6aef4c9817e7f8a0fdd5b0b5b2455a8adf6285e2670495a613a5c1ecb7b88dff642d6b640bbcb97c3295604fa07e220ac6cc0764c0770a39d SHA512 b74707c77eabf279fbaad6fbf6d1c9950beb7c36aa06bf4b188360c12921fc85597cd42c95b3cad78b021207ffa0e70453b3d12f1305408dd308ce72b8a4e269
diff --git a/sys-devel/gcc/files/gcc-8.3.0-ia64-bootstrap.patch b/sys-devel/gcc/files/gcc-8.3.0-ia64-bootstrap.patch
deleted file mode 100644
index 0a0a25b56555..000000000000
--- a/sys-devel/gcc/files/gcc-8.3.0-ia64-bootstrap.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://gcc.gnu.org/PR87338
-
-From 1cc1dc32fcf6b47db4e6d28f55de343713f824a4 Mon Sep 17 00:00:00 2001
-From: James Clarke <jrtc27@jrtc27.com>
-Date: Thu, 25 Apr 2019 15:58:55 +0200
-Subject: [PATCH] PR bootstrap/87338: Fix ia64 bootstrap comparison regression
- in r257511
-To: gcc-patches@gcc.gnu.org
-
-By using ASM_OUTPUT_LABEL, r257511 forced the assembler to start a new
-bundle when emitting an inline entry label on. Instead, use
-ASM_OUTPUT_DEBUG_LABEL like for the block begin and end labels so tags are
-emitted rather than labels.
-
-gcc/
-	PR bootstrap/87338
-	* dwarf2out.c (dwarf2out_inline_entry): Use ASM_OUTPUT_DEBUG_LABEL
-	instead of ASM_GENERATE_INTERNAL_LABEL and ASM_OUTPUT_LABEL.
----
- gcc/dwarf2out.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- a/gcc/dwarf2out.c
-+++ b/gcc/dwarf2out.c
-@@ -27670,11 +27670,8 @@ dwarf2out_inline_entry (tree block)
-   if (cur_line_info_table)
-     ied->view = cur_line_info_table->view;
- 
--  char label[MAX_ARTIFICIAL_LABEL_BYTES];
--
--  ASM_GENERATE_INTERNAL_LABEL (label, BLOCK_INLINE_ENTRY_LABEL,
--			       BLOCK_NUMBER (block));
--  ASM_OUTPUT_LABEL (asm_out_file, label);
-+  ASM_OUTPUT_DEBUG_LABEL (asm_out_file, BLOCK_INLINE_ENTRY_LABEL,
-+			  BLOCK_NUMBER (block));
- }
- 
- /* Called from finalize_size_functions for size functions so that their body
--- 
-1.8.5.3
-
diff --git a/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch b/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch
deleted file mode 100644
index 19f4f56871f2..000000000000
--- a/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gcc.gnu.org/PR90419
-
-diff -ruN gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib gcc-8.3.0/gcc/config/riscv/t-linux-multilib
---- gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib	2017-02-06 22:38:37.000000000 +0100
-+++ gcc-8.3.0/gcc/config/riscv/t-linux-multilib	2019-04-28 16:37:44.377841943 +0200
-@@ -20,21 +20,9 @@
- ilp32d \
- lp64 \
- lp64d
--MULTILIB_REQUIRED = march=rv32imac/mabi=ilp32 \
--march=rv32imafdc/mabi=ilp32d \
--march=rv64imac/mabi=lp64 \
-+MULTILIB_REQUIRED = march=rv64imac/mabi=lp64 \
- march=rv64imafdc/mabi=lp64d
--MULTILIB_REUSE = march.rv32imac/mabi.ilp32=march.rv32ima/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32imaf/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32imafd/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32imafc/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32imafdc/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32g/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32gc/mabi.ilp32 \
--march.rv32imafdc/mabi.ilp32d=march.rv32imafd/mabi.ilp32d \
--march.rv32imafdc/mabi.ilp32d=march.rv32gc/mabi.ilp32d \
--march.rv32imafdc/mabi.ilp32d=march.rv32g/mabi.ilp32d \
--march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \
-+MULTILIB_REUSE = march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \
- march.rv64imac/mabi.lp64=march.rv64imaf/mabi.lp64 \
- march.rv64imac/mabi.lp64=march.rv64imafd/mabi.lp64 \
- march.rv64imac/mabi.lp64=march.rv64imafc/mabi.lp64 \
diff --git a/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch b/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch
deleted file mode 100644
index ad0128a0a18b..000000000000
--- a/sys-devel/gcc/files/gcc-9.1.0-norisc32.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Autogenerated patch disabling the 32bit RISCV support
-See https://gcc.gnu.org/PR90419
-
-diff -ruN gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib gcc-9.1.0/gcc/config/riscv/t-linux-multilib
---- gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib	2017-02-06 22:38:37.000000000 +0100
-+++ gcc-9.1.0/gcc/config/riscv/t-linux-multilib	2019-05-18 23:04:54.849400774 +0200
-@@ -1,40 +1,18 @@
- # This file was generated by multilib-generator with the command:
--#  ./multilib-generator rv32imac-ilp32-rv32ima,rv32imaf,rv32imafd,rv32imafc,rv32imafdc- rv32imafdc-ilp32d-rv32imafd- rv64imac-lp64-rv64ima,rv64imaf,rv64imafd,rv64imafc,rv64imafdc- rv64imafdc-lp64d-rv64imafd-
--MULTILIB_OPTIONS = march=rv32imac/march=rv32ima/march=rv32imaf/march=rv32imafd/march=rv32imafc/march=rv32imafdc/march=rv32g/march=rv32gc/march=rv64imac/march=rv64ima/march=rv64imaf/march=rv64imafd/march=rv64imafc/march=rv64imafdc/march=rv64g/march=rv64gc mabi=ilp32/mabi=ilp32d/mabi=lp64/mabi=lp64d
--MULTILIB_DIRNAMES = rv32imac \
--rv32ima \
--rv32imaf \
--rv32imafd \
--rv32imafc \
--rv32imafdc \
--rv32g \
--rv32gc \
--rv64imac \
-+#  ./multilib-generator rv64imac-lp64-rv64ima,rv64imaf,rv64imafd,rv64imafc,rv64imafdc- rv64imafdc-lp64d-rv64imafd-
-+MULTILIB_OPTIONS = march=rv64imac/march=rv64ima/march=rv64imaf/march=rv64imafd/march=rv64imafc/march=rv64imafdc/march=rv64g/march=rv64gc mabi=lp64/mabi=lp64d
-+MULTILIB_DIRNAMES = rv64imac \
- rv64ima \
- rv64imaf \
- rv64imafd \
- rv64imafc \
- rv64imafdc \
- rv64g \
--rv64gc ilp32 \
--ilp32d \
--lp64 \
-+rv64gc lp64 \
- lp64d
--MULTILIB_REQUIRED = march=rv32imac/mabi=ilp32 \
--march=rv32imafdc/mabi=ilp32d \
--march=rv64imac/mabi=lp64 \
-+MULTILIB_REQUIRED = march=rv64imac/mabi=lp64 \
- march=rv64imafdc/mabi=lp64d
--MULTILIB_REUSE = march.rv32imac/mabi.ilp32=march.rv32ima/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32imaf/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32imafd/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32imafc/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32imafdc/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32g/mabi.ilp32 \
--march.rv32imac/mabi.ilp32=march.rv32gc/mabi.ilp32 \
--march.rv32imafdc/mabi.ilp32d=march.rv32imafd/mabi.ilp32d \
--march.rv32imafdc/mabi.ilp32d=march.rv32gc/mabi.ilp32d \
--march.rv32imafdc/mabi.ilp32d=march.rv32g/mabi.ilp32d \
--march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \
-+MULTILIB_REUSE = march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \
- march.rv64imac/mabi.lp64=march.rv64imaf/mabi.lp64 \
- march.rv64imac/mabi.lp64=march.rv64imafd/mabi.lp64 \
- march.rv64imac/mabi.lp64=march.rv64imafc/mabi.lp64 \
diff --git a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
index 12a6ad6eb62d..bfa20734ea5a 100644
--- a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PATCH_GCC_VER="10.1.0" # reuse subset of patches for latest for live ebuilds gcc
+PATCH_GCC_VER="11.0.0"
 PATCH_VER="1"
 
 inherit toolchain
diff --git a/sys-devel/gcc/gcc-3.3.6-r5.ebuild b/sys-devel/gcc/gcc-3.3.6-r5.ebuild
deleted file mode 100644
index ca341bf4a814..000000000000
--- a/sys-devel/gcc/gcc-3.3.6-r5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PATCH_VER="3"
-UCLIBC_VER="1.1"
-HTB_VER="1.00-r2"
-
-inherit eutils toolchain
-
-# ia64 - broken static handling; USE=static emerge busybox
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
-# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
-# well tested in gentoo on any arch other than amd64!!
-RDEPEND=">=sys-devel/binutils-2.14.90.0.6-r1"
-DEPEND="${RDEPEND}
-	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	if [[ -n ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] ; then
-		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/os/uclibc "${S}"/libstdc++-v3/config/os/ || die
-		mv "${S}"/gcc-3.3.2/libstdc++-v3/config/locale/uclibc "${S}"/libstdc++-v3/config/locale/ || die
-	fi
-
-	# Anything useful and objc will require libffi. Seriously. Lets just force
-	# libffi to install with USE="objc", even though it normally only installs
-	# if you attempt to build gcj.
-	if use objc && ! use gcj ; then
-		epatch "${FILESDIR}"/3.3.4/libffi-without-libgcj.patch
-		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
-	fi
-}
diff --git a/sys-devel/gcc/gcc-3.4.6-r5.ebuild b/sys-devel/gcc/gcc-3.4.6-r5.ebuild
deleted file mode 100644
index 0357792e1a41..000000000000
--- a/sys-devel/gcc/gcc-3.4.6-r5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="3"
-UCLIBC_VER="1.1"
-UCLIBC_GCC_VER="3.4.5"
-HTB_VER="1.00.1"
-HTB_GCC_VER="3.4.4"
-D_VER="0.24"
-
-inherit eutils toolchain toolchain-funcs
-
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
-# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
-# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
-# well tested in gentoo on any arch other than amd64!!
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.14.90.0.8-r1
-	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	# Anything useful and objc will require libffi. Seriously. Lets just force
-	# libffi to install with USE="objc", even though it normally only installs
-	# if you attempt to build gcj.
-	if use objc && ! use gcj ; then
-		epatch "${FILESDIR}"/3.4.3/libffi-without-libgcj.patch
-		#epatch "${FILESDIR}"/3.4.3/libffi-nogcj-lib-path-fix.patch
-	fi
-
-	# Fix cross-compiling
-	epatch "${FILESDIR}"/3.4.4/gcc-3.4.4-cross-compile.patch
-
-	# Arch stuff
-	case $(tc-arch) in
-		amd64)
-			if is_multilib ; then
-				sed -i -e '/GLIBCXX_IS_NATIVE=/s:false:true:' libstdc++-v3/configure || die
-			fi
-			;;
-	esac
-}
diff --git a/sys-devel/gcc/gcc-4.0.4-r3.ebuild b/sys-devel/gcc/gcc-4.0.4-r3.ebuild
deleted file mode 100644
index dba04bf9dc4f..000000000000
--- a/sys-devel/gcc/gcc-4.0.4-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="2"
-UCLIBC_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=${CATEGORY}/binutils-2.15.94"
diff --git a/sys-devel/gcc/gcc-4.1.2-r2.ebuild b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
deleted file mode 100644
index 43ffaf103129..000000000000
--- a/sys-devel/gcc/gcc-4.1.2-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="2"
-UCLIBC_VER="1.0"
-D_VER="0.24"
-
-inherit eutils toolchain
-
-KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# Fix cross-compiling
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
-
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch
-}
diff --git a/sys-devel/gcc/gcc-4.2.4-r4.ebuild b/sys-devel/gcc/gcc-4.2.4-r4.ebuild
deleted file mode 100644
index f9f923b618c2..000000000000
--- a/sys-devel/gcc/gcc-4.2.4-r4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="2"
-UCLIBC_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
diff --git a/sys-devel/gcc/gcc-4.3.6-r4.ebuild b/sys-devel/gcc/gcc-4.3.6-r4.ebuild
deleted file mode 100644
index fc9bca983e4d..000000000000
--- a/sys-devel/gcc/gcc-4.3.6-r4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="2"
-UCLIBC_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-}
diff --git a/sys-devel/gcc/gcc-4.4.7-r3.ebuild b/sys-devel/gcc/gcc-4.4.7-r3.ebuild
deleted file mode 100644
index 52dfcf6ac1db..000000000000
--- a/sys-devel/gcc/gcc-4.4.7-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="2"
-UCLIBC_VER="1.0"
-
-inherit eutils toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-	use vanilla && return 0
-
-	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-}
diff --git a/sys-devel/gcc/gcc-4.5.4-r3.ebuild b/sys-devel/gcc/gcc-4.5.4-r3.ebuild
deleted file mode 100644
index 9c67148b0b46..000000000000
--- a/sys-devel/gcc/gcc-4.5.4-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="2"
-UCLIBC_VER="1.0"
-
-inherit eutils toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	ppc? ( >=${CATEGORY}/binutils-2.17 )
-	ppc64? ( >=${CATEGORY}/binutils-2.17 )
-	>=${CATEGORY}/binutils-2.15.94"
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-}
diff --git a/sys-devel/gcc/gcc-4.6.4-r3.ebuild b/sys-devel/gcc/gcc-4.6.4-r3.ebuild
deleted file mode 100644
index a8e9019da817..000000000000
--- a/sys-devel/gcc/gcc-4.6.4-r3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PATCH_VER="2"
-UCLIBC_VER="1.0"
-
-inherit eutils toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=${CATEGORY}/binutils-2.18"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-4.7.4-r3.ebuild b/sys-devel/gcc/gcc-4.7.4-r3.ebuild
deleted file mode 100644
index adda46087cde..000000000000
--- a/sys-devel/gcc/gcc-4.7.4-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.6"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.5.5"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64"
-SSP_STABLE="amd64 x86 ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=${CATEGORY}/binutils-2.18"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-}
diff --git a/sys-devel/gcc/gcc-4.8.5-r3.ebuild b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
deleted file mode 100644
index e446dbb082ab..000000000000
--- a/sys-devel/gcc/gcc-4.8.5-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.5"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.2"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-}
diff --git a/sys-devel/gcc/gcc-4.9.4-r1.ebuild b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
index 7113d1a71602..7580cc2b1b11 100644
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PATCH_VER="1.4"
+PATCH_VER="2"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
diff --git a/sys-devel/gcc/gcc-5.5.0.ebuild b/sys-devel/gcc/gcc-5.5.0.ebuild
index 969cc8d4933f..b3b32128d053 100644
--- a/sys-devel/gcc/gcc-5.5.0.ebuild
+++ b/sys-devel/gcc/gcc-5.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PATCH_VER="2"
+PATCH_VER="3"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
index ceffa35a49ab..d720fd6569b9 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PATCH_VER="3"
+PATCH_VER="4"
 
 inherit toolchain
 
diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild b/sys-devel/gcc/gcc-6.5.0-r2.ebuild
index 536da3607f0f..ff44f51814e7 100644
--- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PATCH_VER="1.2"
+PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.5.0-r1.ebuild b/sys-devel/gcc/gcc-7.5.0-r1.ebuild
new file mode 100644
index 000000000000..779dc5475441
--- /dev/null
+++ b/sys-devel/gcc/gcc-7.5.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="3"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/gcc-9.2.0-r3.ebuild b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
index b1ae22cf7f4d..257d96bff95c 100644
--- a/sys-devel/gcc/gcc-9.2.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PATCH_VER="4"
+PATCH_VER="2"
 
 inherit toolchain
 
@@ -17,8 +17,3 @@ DEPEND="${RDEPEND}
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 fi
-
-src_prepare() {
-	toolchain_src_prepare
-	eapply "${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch
-}
diff --git a/sys-devel/gcc/gcc-9.3.0-r1.ebuild b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
new file mode 100644
index 000000000000..576f5446974d
--- /dev/null
+++ b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="3"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index 06bf70ec1ea0..a6c76c3bd108 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -9,8 +9,6 @@
     <flag name="ada">Build the ADA language (GNAT) frontend</flag>
     <flag name="awt">Useful only when building GCJ, this enables Abstract Window Toolkit
       (AWT) peer support on top of GTK+</flag>
-    <flag name="boundschecking">Add the bounds checking patch by Haj Ten Brugge,
-      this will DISABLE the hardened PIE+SSP patches</flag>
     <flag name="cilk">Support the Cilk Plus language (C/C++ based languages for parallel programming)</flag>
     <flag name="d">Enable support for the D programming language</flag>
     <flag name="fixed-point">Enable fixed-point arithmetic support for MIPS targets 
@@ -25,7 +23,6 @@
       code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag>
     <flag name="lto">Build using Link Time Optimizations (LTO)</flag>
     <flag name="mpx">Enable support for Intel Memory Protection Extensions (MPX)</flag>
-    <flag name="mudflap">Add support for mudflap, a pointer use checking library</flag>
     <flag name="nopie">Disable PIE support (NOT FOR GENERAL USE)</flag>
     <flag name="nossp">Disable SSP support (NOT FOR GENERAL USE)</flag>
     <flag name="nptl">Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)</flag>
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index b0ad32187c0e..39657096a536 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,5 +1,8 @@
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
+AUX gdb-9.1-ia64.patch 305 BLAKE2B 06201f81db7b3b8059e818bf263fd1090927b3d23bda3d00891c751c62abe0faedc8a21acd4d97a6bcb0e397f31287b343e01627552c4e3df7fd8635e6b8d39b SHA512 e8219d0dccd192b47daab7de6ec8010ec39192225f29df0443bf54969dd6c39b59889a539a5a9ec0519c512377242a4311f3f3ba4dbbd9d8685ca5e617056ef8
 DIST gdb-9.1.tar.xz 20980824 BLAKE2B b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30 SHA512 84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7
-EBUILD gdb-9.1.ebuild 7390 BLAKE2B e536e1c821da8d0bec279b9409a07297adf48d69db1bc1b52cab7e7f429a45da907d70d924020e013003ccfde6290c8f27c90ca19f6d7291a9d64c44532d54c7 SHA512 f0a424180ab2fcfd9d6554385cb47303d4ffe73debfc5bec15d75552edf7332eab6d724420a5be3a012350b0ab65013de1e7ea251c53c571ad61f466b98e9685
+DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274
+EBUILD gdb-9.1.ebuild 7426 BLAKE2B 3e945db45755c81c0827b5ba88cd50a973a1b31b2fe1002c6952456305b23e74cf15b5883c66bad0b0dbe5a391cf339d5360a499783fece47a9a40d0b9b3149b SHA512 363f56c0cbcf235005ecfbe46c269bee068d99b75679c92d40e7608c631f0a51eedfd4163f865aae85749b9f994ca166535e711a5d5c7433b491091c6a3263ba
+EBUILD gdb-9.2.ebuild 7435 BLAKE2B 8aeb71d77f1d3695bf2ef50b54a085257a8aebad10261f6102cc122b6702c9a1585622cc9a980277323c0eac8057351007bfd78127cf16b581132d328e45c034 SHA512 9cb9c16326bc5f770145431bc20c4bc658df00fc3cc17734b081b1fbbde30a48fee950a33b0418cf9374b6e612b9706c640d509a999ab850d1d6540b535a8e3a
 EBUILD gdb-9999.ebuild 7056 BLAKE2B 578a651d684da6f98fd6c0515863c1b90a4c32be826ed469490af1fb4d6b09f43d0a85bbc0bfe9b772e322bcf3598749c6b454d1868a3a6c02c30496995f9f39 SHA512 20277a9dfbf22c6fddf71924098fdb81eeb631bd574b33e674279dc1b13c66476b7cb63d552545a87ab7888473938684adf7ad200346244ba6aee5270bc1cf64
 MISC metadata.xml 1110 BLAKE2B 9958c755c2276b00b47550593e37bda9cdd5050834650654e796b9aca622fd4e7b094e80e2648b622fdb46943d3dca00208f11e1ea0c9bfdb32ad891b9acaad1 SHA512 f58a0166980a8ef71d36872736afc8f86ded7f731864cc3d302e84818c3afc01eca49748e4533bc305c2d3d73521a008260097b9533dd3392a451528f3794a0d
diff --git a/sys-devel/gdb/files/gdb-9.1-ia64.patch b/sys-devel/gdb/files/gdb-9.1-ia64.patch
new file mode 100644
index 000000000000..49a21e4cdd29
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-9.1-ia64.patch
@@ -0,0 +1,15 @@
+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/gdb-9.1.ebuild b/sys-devel/gdb/gdb-9.1.ebuild
index 205b126af92d..a9201f627dee 100644
--- a/sys-devel/gdb/gdb-9.1.ebuild
+++ b/sys-devel/gdb/gdb-9.1.ebuild
@@ -90,6 +90,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+	"${FILESDIR}"/${PN}-9.1-ia64.patch
 )
 
 GDB_BUILD_DIR="${WORKDIR}"/${P}-build
diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild
new file mode 100644
index 000000000000..704ce614906a
--- /dev/null
+++ b/sys-devel/gdb/gdb-9.2.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml 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
+)
+
+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/lld/Manifest b/sys-devel/lld/Manifest
index b745451ffbf6..71bf355b61c4 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,9 +1,11 @@
 DIST lld-8.0.1.src.tar.xz 996440 BLAKE2B 9e205427f5534a69b665620b5ecf6713194421a35e3e815d257545d5a1e8a11d42e32abd685df1d439463b6e9e2dd6134755b458196edcd7c7807b89c779027d SHA512 646418d4a4ce922d1a69e9bf2e472f5d758f25ec21b80a2c66dfe5effc59c9c312fb167cf64ee2d8a2ced986e7474ed3d2996a38be66fbf63c574229d28e0900
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
+DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lld-10.0.0.9999.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
 EBUILD lld-10.0.0.ebuild 1483 BLAKE2B 7d949cb37acc2568db0915086fce712ad854df4fe0878ae42759f93c69a119e9f7f24fa8cd5047bc225b037d4afa178ce8e02f11eb9e1cd0e8c60ac3fe8a422d SHA512 bab240f2abe5b81f811080695d419683a423865dd38c62d8d65e7d2421aeb1b3d4da511298d78cd8b20ef53c18772f51367b25fc2b6252070297ceb262ffb1a2
+EBUILD lld-10.0.1.9999.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
+EBUILD lld-10.0.1_rc1.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
 EBUILD lld-11.0.0.9999.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
 EBUILD lld-8.0.1.ebuild 1794 BLAKE2B 31cf9d99132629908515eb9a8c6b074caa7b84bfbd86446fcd7f65391e247ac23ffd272b715836fc0d787c004a00f613c2c7b0d1bff96a1c8e9054554ae3fe41 SHA512 3d29acfa6f2eedd49917bf811f93f0f9646de38f4b17cf78d748e93c0bb0653f95e7ff1d6aefa0e77ad7af4479f7d3b27d4b10a49ae34aa86efcbeb636064e79
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
diff --git a/sys-devel/lld/lld-10.0.0.9999.ebuild b/sys-devel/lld/lld-10.0.1.9999.ebuild
index f15808abce81..f15808abce81 100644
--- a/sys-devel/lld/lld-10.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-10.0.1.9999.ebuild
diff --git a/sys-devel/lld/lld-10.0.1_rc1.ebuild b/sys-devel/lld/lld-10.0.1_rc1.ebuild
new file mode 100644
index 000000000000..f15808abce81
--- /dev/null
+++ b/sys-devel/lld/lld-10.0.1_rc1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=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="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-lld
+}
+
+src_install() {
+	cmake-utils_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 437ec02be679..b328bd419ff9 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,8 +1,10 @@
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
+DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-common-10.0.0.9999.ebuild 528 BLAKE2B 957a2fbd49748e29068dfa987ee45e4fe1330c386ec4c3d7f2105136d1561c4427fe098f4199052b0f8267f4b5e50ff10f0c359435e4df007a6b4d9970275bd4 SHA512 643116074781e724ffb1184eaaa2ae041e20c9fb9b8927f1e6f1784c0a94b62021138267ff4d1fc1714e40eb4cf2e9b378b72d17ed16da32c9a0696580c8fe30
 EBUILD llvm-common-10.0.0.ebuild 604 BLAKE2B fe149a945f69a83939278f76189b47786f68f2f7953c948825ca6cf8caa5e3d986a21e87f23f8549160475a36a3c9fad30724979681141316c2bd84ba44125f0 SHA512 0798acea6da50210e14c460637d5f38f7d3c18f9de13ee36e2dd2424b475f3c343c0c4d8531811063056b4682a8d20b1de881044bdf47bec1fc421996568f98f
+EBUILD llvm-common-10.0.1.9999.ebuild 528 BLAKE2B 957a2fbd49748e29068dfa987ee45e4fe1330c386ec4c3d7f2105136d1561c4427fe098f4199052b0f8267f4b5e50ff10f0c359435e4df007a6b4d9970275bd4 SHA512 643116074781e724ffb1184eaaa2ae041e20c9fb9b8927f1e6f1784c0a94b62021138267ff4d1fc1714e40eb4cf2e9b378b72d17ed16da32c9a0696580c8fe30
+EBUILD llvm-common-10.0.1_rc1.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-11.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-8.0.1.ebuild 855 BLAKE2B 81171ca3ce7d05be60c151d814ceb592e18fd2d8986db8a1106662727d0b1f94011cac9057f7fe8b398197b2d8fe588e684dacf7ed6b4d93777f4a8cdbfdc644 SHA512 f6a1f1b256bb1dae884dcecbeb6b22c295407ea3b3126839ac99c7c6e745c074c77167f52d7790b38501a0cab5680109274323ff8f6d27ea9b39bdec82ff8f7f
 EBUILD llvm-common-9.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
diff --git a/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-10.0.1.9999.ebuild
index ba2ffc76a706..ba2ffc76a706 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.0.9999.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.1.9999.ebuild
diff --git a/sys-devel/llvm-common/llvm-common-10.0.1_rc1.ebuild b/sys-devel/llvm-common/llvm-common-10.0.1_rc1.ebuild
new file mode 100644
index 000000000000..df9cf92b47a1
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-10.0.1_rc1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 061623741a43..ea14d4de79be 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -17,6 +17,7 @@ DIST llvm-roc-ocl-2.9.0.tar.gz 50246154 BLAKE2B 5ed8faf4582a41dac3bdc71a9fc6e12e
 DIST llvm-roc-ocl-3.0.0.tar.gz 117363122 BLAKE2B a85e456e715629fbb3349e13e50a62aee7c82c6479127d7e46ff2de13f0eab108dd0332136aa736c30ed46c1563207b7ab22df0f7f53404315d51f0a172b5e86 SHA512 7d1281fc1628e4e88ddd740ccf03107cdccf86178046dfe79efd6b503193b3be4e23a67363f24f1d6250a156da86fe0d93933d9c67510b755d1e454e7bbedb68
 DIST llvm-roc-ocl-3.1.0.tar.gz 120981974 BLAKE2B cbefc7b087c8df81ee093aeebff292c652dc29f37ee5bcf9ef891130c52bf93b3b735f1aa746fd1ec5e5e86c879d73ffa6f9df074f27b31799ef701206a7ea32 SHA512 bc6eb441f655f3b9cb13161fb731e592295a156e7d7bd0a38e4d3017bac90852d2ef64980c70889939ae082c9d1523af25d82ec2221415bbae0d01201d20ec57
 DIST llvm-rocm-ocl-3.3.0.tar.gz 115703174 BLAKE2B 4695f07317d625bb285470cc906489f22a5eb023b4337945c1d7b4237509d3481b9f9369611dc57f4e8daa8a70c7cdd8a9b0df4842cc1424e301a5366f458727 SHA512 896afa458c7527de469e6ee891b22be6ef351858c5d0c3da57bcd6d1d85667256b3ab3fe64167cc26536dbcfd95e1146edff9c24daf5e1c966195555748d9278
+DIST llvm-rocm-ocl-3.5.0.tar.gz 116948115 BLAKE2B 067ce3cef03b714059e6720269c864d8cffa8687040ae9a8607c6207d00a6a4d8e31099aba7ff09144bf1ded809b842fe856103346b9b06eb9bcd393397fe63f SHA512 04808724c7ede3e21485153d3ccf8050b4f2ceae356c4c6451e36da714ed57ac3578f1485d922b747e3c1f654cc9f27544800f869bef24efa80f4e1b98afbbaf
 EBUILD llvm-roc-2.10.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e382a4f7b12ec8d178551e00e47e05d28ef46b8ad930fd01cfa3a052ca4947de59bb69ed3c54fdd76133c0e42fd2 SHA512 3fd04264ec0a05f28661cf63d7b2dd63824c41a9c4e8ed5b209f94ab1a816b8cf6968c1c70cad8dc4a2d34811baf8971116aa99aebe7f14481ee22ae5039ebfe
 EBUILD llvm-roc-2.6.0-r1.ebuild 1380 BLAKE2B 76af5352a82861b2ee0d95f1d3d2d8025af747523f36ef847bb03e77aa8b4aa3932dda9f57d525265eb39cfaafa9e8a7c5fe3b106875bfd3090f5627e7d55c96 SHA512 4fbb8add4966a700e31e4774665b4a8a583b5fb2a09bdac395ed0ccd19b4726d36e7c84a0d3bc571e846abdd282f7cd8b06c50a127a5d31346b99c689adcdd45
 EBUILD llvm-roc-2.7.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e382a4f7b12ec8d178551e00e47e05d28ef46b8ad930fd01cfa3a052ca4947de59bb69ed3c54fdd76133c0e42fd2 SHA512 3fd04264ec0a05f28661cf63d7b2dd63824c41a9c4e8ed5b209f94ab1a816b8cf6968c1c70cad8dc4a2d34811baf8971116aa99aebe7f14481ee22ae5039ebfe
@@ -25,4 +26,5 @@ EBUILD llvm-roc-2.9.0.ebuild 1408 BLAKE2B 403c92548945befa4f863b45432096e19ce5e3
 EBUILD llvm-roc-3.0.0.ebuild 1279 BLAKE2B 60660c178d5b92e46b877277552b4ba19d529949db56a5aa183d8dbe6686e9d5d51f6b69f0901670f9d6a87003d9650acd042d769b342b1c5066237e2c207327 SHA512 a5030ed80293ed444f5628d2148a49f239634e69913533813e71da0b61d3a876576cd13ce1bfc127d500e475c7961d8f9a6aca42a87589f6931fab028a3c7dc1
 EBUILD llvm-roc-3.1.0.ebuild 1286 BLAKE2B 9349a3432f62a8884ad2105cfd1e82b942239e69be369814447ae56a26b42f2893c915acdf020dabfb0c25df12f83bd52d81041ca1f58964f7328e01efbf4c8f SHA512 e9635742f05bb43a3aebf2b12c161c6beb18f727c9573fa7a32ccc39c7d977fe4a2c65e17e70ddb9699e89d5a5f10f301e8a984389eadb1aa431c72591d88c73
 EBUILD llvm-roc-3.3.0.ebuild 1289 BLAKE2B 569f17f1a4a97932a55e352a80fb6b8769809b1d05ecc52d25b262726382c68779dd2e2a2a4bea1c4b15bdafa36a0380dc99d6d3e250f79cf4f394ea4f83f75f SHA512 ec7822fc2774d905368c84c39bd9341f4df8706adf8c44afd26f9364d83ef0098d67d11b9075710c21355e60f6ca8470f3e6255db52b6e170342f3ae95350781
+EBUILD llvm-roc-3.5.0.ebuild 1284 BLAKE2B 00d1837eba74f2bae5e40c5a7cad49cbe41bcfa13a92005367916028ebb16516f39f3951426f17aa2db46b7a0dd663ca3dbb6dc7084c4bcb2e8ad708999b8d3f SHA512 23174cc206eddab27d9e180b479ee02ce355f996b0a954531192835b6a8fc5bf6ac7f0d82578e7eaece5553f5587309bdcc235ebb62ddd5b43826e7fe0a37d53
 MISC metadata.xml 469 BLAKE2B f2b3af990bf9b130ed1be4ad2c4da5a97f6eae74d5feb43d81b4dc90ca1c5dcf896b293ad60d1c932d0c64773c203c52ccca8a6e0e5dd1d614f97b53113146db SHA512 e3783dde65d914cc272478c2d1823de27a2daaf8fa3aa2d281b98b0ed707c758bce1d52326dda577baed5b127293fca435211cfee17cc43553b9be424a4e2348
diff --git a/sys-devel/llvm-roc/llvm-roc-3.5.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.5.0.ebuild
new file mode 100644
index 000000000000..616e05f5cb90
--- /dev/null
+++ b/sys-devel/llvm-roc/llvm-roc-3.5.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 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"
+
+RDEPEND="virtual/cblas
+	dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
+	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
+		-DLLVM_ENABLE_PROJECTS="clang;lld"
+		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
+		-DLLVM_BUILD_DOCS=NO
+		-DLLVM_ENABLE_OCAMLDOC=OFF
+		-DLLVM_ENABLE_SPHINX=NO
+		-DLLVM_ENABLE_DOXYGEN=OFF
+		-DLLVM_INSTALL_UTILS=ON
+		-DLLVM_VERSION_SUFFIX=roc
+		-DOCAMLFIND=NO
+	)
+
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	cat > "99${PN}" <<-EOF
+		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
+	EOF
+	doenvd "99${PN}"
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 2bce087daff3..72f0ce5078c3 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -5,9 +5,11 @@ DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
+DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-10.0.0.9999.ebuild 12263 BLAKE2B 448f555d5cdb973560e10c84d0175189a442a56d81e1f33a7eba74bde2c0d8ffa071caa000d496a86deeb78d7dcdcb783759d50a1d61fb9c8ce262639baff3e2 SHA512 9286d7a5e1ce0d62161246b5dd5623f072cf4528e92d6413c25bd62fc8334eb477e5ece33bb31979a0a88220ffc89b77ebcc0be934872aec5ff2845f78748b8f
 EBUILD llvm-10.0.0.ebuild 10579 BLAKE2B 04be48351a56d46e4b13357415364c9d20a5e3e6438ca587a40f1233ffabaeeb14013a03e1794409a80cf9578bed03e93c82baae5ebe82fab7b4a9d141abaab4 SHA512 b4f6e58592423642bc570e57112b80a2c3b5abee66118333fff8bb06e5c7bb447b6636d73c304ab424d2caf842ef709db846aa8758eb7b72d0253e7e4b979b6d
+EBUILD llvm-10.0.1.9999.ebuild 12263 BLAKE2B 448f555d5cdb973560e10c84d0175189a442a56d81e1f33a7eba74bde2c0d8ffa071caa000d496a86deeb78d7dcdcb783759d50a1d61fb9c8ce262639baff3e2 SHA512 9286d7a5e1ce0d62161246b5dd5623f072cf4528e92d6413c25bd62fc8334eb477e5ece33bb31979a0a88220ffc89b77ebcc0be934872aec5ff2845f78748b8f
+EBUILD llvm-10.0.1_rc1.ebuild 11270 BLAKE2B 261bbe7885e29d83a0b60e71534e65dae287875d803f409675e17408d0a29f79417d03f59d1b69db6ead61b8cfaea374a8f40b2fb60fb7a390b5f40d3fca4503 SHA512 72d28860a4ab3c7ed79661165566b390b588a6ccdf8e4f43755430d90d1de23f0b109dea4998538561e7ab209ea037fc91b4b68eab9a94cdaa344570d8443149
 EBUILD llvm-11.0.0.9999.ebuild 12291 BLAKE2B 79a8f491fc1cc74303079b6c4365d20891a74c334623cde31c57909efad6f7c4d077a30f203bde50543823af0ab6c4d1b4169c9696799a53b1f26e27bf54585a SHA512 9691860b36db22a11b7956e1b077fd3debf2a4432d951dbac28e48c185d8618748b7f6597d814a3791193f302a3f9df7bd55c40a6a5c79b68a880aee35fcd82f
 EBUILD llvm-8.0.1.ebuild 8423 BLAKE2B 229579ed2cd28987476612666617c61af49760ace9b4664a4419f2518990666d88a2c234d55f7f9c89d04e4a107b34cad50ce7866e4fa944829b0eb3f7473a2b SHA512 307e04c4dac29e8b3fef2a422d231883883384b23fc9d54c8f5f9e69b9f40fb3ea7950651cc15938e0ea92a12413db67996b87b59ec88cf3ba4661b6099602e7
 EBUILD llvm-9.0.1.ebuild 8454 BLAKE2B 33b4c7bdf4bc136d29f3f6f505799b11de31d33e393b51c9bafb121b0b8b347e86a5954ba6ba039cd6b39cb7c1a501d4747f51652351559c42ba0b84c4bae54b SHA512 f43a600265c1559e924a6f2ec97dffdacfae35df2cc3e3e874704c5ae179ba48d90fdd666411cdab500d171fa63b557538282545c7c4078867857e077c941a4c
diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.1.9999.ebuild
index f308f41ee444..f308f41ee444 100644
--- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-10.0.1.9999.ebuild
diff --git a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild
new file mode 100644
index 000000000000..59ccce098614
--- /dev/null
+++ b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-utils llvm.org multilib-minimal multiprocessing \
+	pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_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]
+			<sys-devel/binutils-2.31.1-r4:*[cxx]
+		)
+	)
+	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
+	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} )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+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
+						;;
+				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
+
+	# User patches + QA
+	cmake-utils_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+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-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-lib
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			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
+		)
+
+		use doc && out+=(
+			docs-dsymutil-man
+			docs-llvm-dwarfdump-man
+			docs-llvm-man
+			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)
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use doc && mycmakeargs+=(
+			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake-utils_src_make 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"
+}
+
+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/prelink/Manifest b/sys-devel/prelink/Manifest
index 495ad1c9c588..e60fa3ca198b 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -1,6 +1,5 @@
 AUX prelink-20130503-libiberty-md5.patch 2604 BLAKE2B 4e6eb6cbcd91ea31a090eddb92591b3b7bcdf4db8ba9e03b490823240dcc8d08c60e89c9485a6062124905f6fecfc82adcd2714ad26638dcb2641a54dd1fa44f SHA512 5240d1d0d2a0014aa117f09cb8af872cda178401d09d1df4260bfedecf0aa74b2c713dc08ba0cf08a15aba2e49155a40047c30f7907b27a65f39ebbf8ad4f9ca
 AUX prelink-20130503-prelink-conf.patch 910 BLAKE2B 71049a340b7f2d01c3b68b417296023bac432581ee5d9569ab707b1f9c308947e9d515711bbc528d99594f079700655046e9ea773eb7165758408e124cdc3d9e SHA512 640fce42bac33d76a9ed312a138817695b57b03e7b0d1c57b074903739c3fb3b7c64b8c0d839687dd60fd50054d682f2f095c3f0eff7d5f4fe505d6c334267b2
-AUX prelink-armhf-dynamic-linker.patch 519 BLAKE2B 1cc1790256e9c9cfedccb200dbcfcacd61e6dfe5165c9703a1ccd098c0e5b07c4053b9da6a46a309242347e27478ab47b12c95bf3b9e83e6e6f19e118b97669b SHA512 af898440f11af102d6d4b95ade2ed267dc5e3e01407ded17ca2df7454ee845f8177c0316e9bc73838f3965f5000f58ac51055588fdb4a90293cc431e07e9e467
 AUX prelink.confd 1677 BLAKE2B 009d62e2b8342d9b1ee1f4a4f09ba290099071624c1d5165e672855a99a49537fb0791390bd7943ba15a082836f5ab985f93c95342b46364e1afff0497e39643 SHA512 d9edf2535d0b5f1effa797882abfc1cae71a4944e7a443880845a6f860d160125f2ab3a1d69db444e31a35b62a09ed661adcbc1ee62539e9a73f270d33602e9b
 AUX prelink.cron 2452 BLAKE2B 5e6ad6afd895c09e12e6bf1836e94fb3461e2184464f09c2afb31d45554a66ac14236f463568c644897c1b82404d4cb8f2c290bafd85dac4f001f39db07ab4ad SHA512 1123d01fb08fc943d21362d53ce7c1fa79e3997f3567e854982ced9cdd4a7b0e73d860401d09a35382ef7af9f246c9911aac182197a87938e6b3b0c178524151
 DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee99f97a2d654b7c0379acb80ea3763412f3e892c366a9962ff3e1493bba9c83a8a140e79a1d5fb08b269a08ef596d63fd1d32 SHA512 75edd8617b95ae5bd3bfc968732ee142c968855c97c5b2b93784d3476a9724e0fd9a4eb7af681a5356616a4f023e24d5c5a2e75fb57e2a25b142cc901d9bfcaf
diff --git a/sys-devel/prelink/files/prelink-armhf-dynamic-linker.patch b/sys-devel/prelink/files/prelink-armhf-dynamic-linker.patch
deleted file mode 100644
index 896101040b5b..000000000000
--- a/sys-devel/prelink/files/prelink-armhf-dynamic-linker.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNp prelink_orig/src/arch-arm.c prelink/src/arch-arm.c
---- prelink_orig/src/arch-arm.c	2011-08-26 03:20:49.000000000 -0400
-+++ prelink/src/arch-arm.c	2012-11-28 23:59:28.030164736 -0500
-@@ -832,7 +832,7 @@ PL_ARCH = {
-   .R_COPY = R_ARM_COPY,
-   .R_RELATIVE = R_ARM_RELATIVE,
-   .rtype_class_valid = RTYPE_CLASS_VALID,
--  .dynamic_linker = "/lib/ld-linux.so.3",
-+  .dynamic_linker = "/lib/ld-linux-armhf.so.3",
-   .adjust_dyn = arm_adjust_dyn,
-   .adjust_rel = arm_adjust_rel,
-   .adjust_rela = arm_adjust_rela,
diff --git a/sys-devel/qconf/Manifest b/sys-devel/qconf/Manifest
index a218ccc38f3a..ffe2c8db85c8 100644
--- a/sys-devel/qconf/Manifest
+++ b/sys-devel/qconf/Manifest
@@ -3,5 +3,5 @@ DIST qconf-2.4.tar.xz 51880 BLAKE2B c87a2a6dbca56fa52bccd0cdbbdba64013adcbf03c6c
 DIST qconf-2.5.tar.gz 100704 BLAKE2B 01dcca053e020cfc76e8595927dd3cedb6c82ade24381c95935c87994037ca5129f5e9e0ec58dd0e0fc6815b1500249b767367fbf7a16549459f814bb1591368 SHA512 4ce032eb5b9ba2d584807b3283b0dd5cf973c2fdd6792dfec13c54bb7c639d23eeaab03eb52f1a395113d973d2b01d87bf713d717e691641203865b934c7da5e
 EBUILD qconf-2.3.ebuild 816 BLAKE2B d9b6098f799e41e2626e8dd4c30b63d615700f5b27a1c16e3aaf5c3f0f37082b96dcb311c0aaf73649ae06f72c695325dfc8352dfce08fb4c7945656bdbadd14 SHA512 965c0f48f3de3c2947736248e48988365c4b48e76f519c4d5de7f8a51baa62e5ca421a9fe012a51732e29f8552414e891ece6ec939393a2e8127ee4f476e142b
 EBUILD qconf-2.4.ebuild 839 BLAKE2B 93d7b63e9fab27f6bdb5f30822c779056d156451042d88b0094970444880cac770c34f5dd621e0a482b813cd8f27e16ef45869ff91eb1537c19e7b9a7dfd6f44 SHA512 121992c1f91042092767f00c2e695918015d792e071ca135ae5d5675411ccbd70a56d35cea703b0439b4067517adbe4dbf5103684d2fe090fd4a8166b830915c
-EBUILD qconf-2.5.ebuild 833 BLAKE2B acb2e1a96f77f977b977c1311f0c67caa53f7fc1e911d4a9d5caeba6e54d7822e9c267213008d3bf987707d3b78c9d44522a44db2da04effb603c1a9e54b919d SHA512 ba5fb8f3b03e1e74efb81c1ebbeec82cf937a5f62e1c002212aa42b8e90f774e2a588b23c518366b404d8f86c2a7c5b75a7e818e5fb60e2f84b5f9451a618b7e
+EBUILD qconf-2.5.ebuild 830 BLAKE2B ceeb9c66789444e96ec669d93ad4f1de3f4d8f74fc743e331b25e2c9d35d4131dcf1111f68358c4a67b4c664f0372ac12faf54f1f75d08f76b88d0b0697b7d5e SHA512 5783cd51a030b0ca7446c9a2d39ba4d453a6eb41c5a52a48ed96173c8d827d4fe7ece09d28e85f6a099b4c7b2611da7b9fecd41616fcdaf01cd189f2cc1a6d36
 MISC metadata.xml 520 BLAKE2B f9a6c120d33a273ac1bd1d2be0b6af7eeddba959966af10812136a282acf423c17e14f5727dbd8a6cfad84f977e32695df43ae5bc9b13bffdd398b0ca27cd596 SHA512 d707a3c441702da2b0c4a6313acc4441fbd75e0b02990c9556a4d13906a8383683c261dc92a5c6f6a3593fd6d24761ea246110dd4514b4a7249bd6eda19b19cb
diff --git a/sys-devel/qconf/qconf-2.5.ebuild b/sys-devel/qconf/qconf-2.5.ebuild
index 0064bce46584..3866c4c05ee0 100644
--- a/sys-devel/qconf/qconf-2.5.ebuild
+++ b/sys-devel/qconf/qconf-2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/psi-im/qconf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-devel/smatch/Manifest b/sys-devel/smatch/Manifest
index 7370e2ef6f06..f633c542cd30 100644
--- a/sys-devel/smatch/Manifest
+++ b/sys-devel/smatch/Manifest
@@ -1,4 +1,4 @@
 DIST smatch-1.60.tar.gz 558479 BLAKE2B d5e564c32e33dc38847f9a258b4b47285f190652181db9b8850c832c0cf4d8a3302d989a7b42592e73a713927a29565565e83a9be1b0a5c9d10869fce278a0be SHA512 2920c9d4c500db36cfa60db5be70d157ed16abd729279462faef6f79e0756bd017ec91b8f857d19fdebd8a9d709b0555635700a2864cf0a84daa61cf2ca3eecd
-EBUILD smatch-1.60.ebuild 1246 BLAKE2B 40dcc418dcab2cc9de15bedd0ec6d1f183248775183f01a07be9a6988e36213729c66d14c2b75a39df9070e388a3b87d806b555a8523523328dafaf18bbad04e SHA512 c025bfcbc4976575e3c219d3bf2a35baeddfdf26f62df2946f93e5564640717926d793ec45f8a8df2ae7dfa3849e77a0ce0c4df93c9886f51ce87264d642cafa
-EBUILD smatch-9999.ebuild 1191 BLAKE2B d9baf17c05efa271ecb09973237297864ebc0ab937c45005874f6e8e51ccebd8ab4526cc2defa89a17c0caf6db75fa9ff764a61f473ce56f37a55d2e7c8fce46 SHA512 a99c4ddf4d17f2d5aa019a87d7151d71fdd7719f406cfd1df09f76a21bd6d8a534969bcabde50579e3d2f52b87ff5e8fda331ee0097ed525cd648845e4806962
+EBUILD smatch-1.60.ebuild 1348 BLAKE2B f0e1768ab5130967d8c75237f92f84a1ff7268e100bd74717c6ef16ece2bf9851bfd9a2a6526d33ba84109326e023595deb2673ff7c53b534c7398f4695ffc91 SHA512 3678290ac0da569f9bcc208b8b9fc951bafa680718e9099f2bb4df7e180d52f031b82d1a93952fe9454438af9547157c60afee942296435c174ac6b2cad4ec3f
+EBUILD smatch-9999.ebuild 1293 BLAKE2B 6627304cd071518654a9cddc1fa8784143941141218762c317dbb762e330d5892f6c219a4b3ad04037c081eee7cef44588ae736552b68637388110ec3d20c138 SHA512 78a7b402bbb94e8f57617e05e31b4416c2aa2c0c773fbd7daa86a7377d1a99404d60d6c3175504fe70e04f457cce71a92a1b6296dc45a80c457ecc4bd3842018
 MISC metadata.xml 337 BLAKE2B 3215b338ec89ebd2d1d39e33c5903a6ad571ee6ad4236968a2c250f2d7882c90c2791746df43455a7fd63ebff544177f49c9e0074a31ccd81f7ef68f1eabfa82 SHA512 8d4007163912848eb4e4b525c808e7c69fe5aa93913398db793b6ed73936cc936a25e1fe7dce4a915b4caf6b2796d6dd4d1a52ed6dfbd2e0fb0faf6c0ba1c7e0
diff --git a/sys-devel/smatch/smatch-1.60.ebuild b/sys-devel/smatch/smatch-1.60.ebuild
index e8505ae64d23..9423f1d108f6 100644
--- a/sys-devel/smatch/smatch-1.60.ebuild
+++ b/sys-devel/smatch/smatch-1.60.ebuild
@@ -24,6 +24,7 @@ IUSE=""
 
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${P}-7a4fdad
 
@@ -32,6 +33,7 @@ src_prepare() {
 
 	sed -i \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
 		Makefile || die
 }
 
@@ -43,6 +45,7 @@ _emake() {
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		LD='$(CC)' \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		HAVE_GTK2=no \
 		HAVE_LLVM=no \
 		HAVE_LIBXML=no \
diff --git a/sys-devel/smatch/smatch-9999.ebuild b/sys-devel/smatch/smatch-9999.ebuild
index 4e3cca48e997..8ba49a55ed46 100644
--- a/sys-devel/smatch/smatch-9999.ebuild
+++ b/sys-devel/smatch/smatch-9999.ebuild
@@ -23,12 +23,14 @@ IUSE=""
 
 RDEPEND="dev-db/sqlite"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
 
 	sed -i \
 		-e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
 		Makefile || die
 }
 
@@ -40,6 +42,7 @@ _emake() {
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
 		LD='$(CC)' \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
 		HAVE_GTK2=no \
 		HAVE_LLVM=no \
 		HAVE_LIBXML=no \
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /sys-devel
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)