gentoo resync : 27.03.2021

29 files changed, 300 insertions, 365 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 344ef3b7e21f..45d6f5a3b785 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 990c7fdadc7a..313c6ff756e5 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,5 +1,4 @@
 AUX ac-wrapper-13.sh 5055 BLAKE2B 66fd728f347cdb873007e51113225608b3dae87c5979ba512a5e65a3185d8278502cdbaa60675b33643e0f9f459cf3956967f8e07b198d442139abb06a75f597 SHA512 0bbe9a992cff140bd60161404f1d1f6a9da6c79b1e9909000092f5e1159e457edee3fcefcb8fcaf47cedd9a7074505c4a61bc25107277d248150cdde5f11c5b7
-AUX ac-wrapper-14.sh 5093 BLAKE2B 4ce76b0eae9b7be9bbf4fbb12dacf10e9c2731c13f2e708feebf583c9a7c88a9985cc992c617c5e2a30772daa61bc05391196c1d7ddebd4f1269b60c4038db60 SHA512 868751a8e73e6994fef500df37d5a002445ea3da6d68affa8aaaa5b00a8a913b08c4576ca030d578686d97e1b237defa735a46c03b9655e65e38c625488fc9ec
 AUX ac-wrapper-15.sh 5102 BLAKE2B a5575fc72c9b83801dd38104fc90c6df71bd4e387f882f515e26e22d7b24fec7958dbdba0d484dca3ae779ef0a9eca80c479e1ea5243c29e2b6f37edad795c89 SHA512 4ca9c2fd016862ff17776c1df320b72af40f8c2babf1fe49be823d5bdc4dd52d720faf0e7ff7b1859c0185db2afeb2181d0d0cb5c404e96c0f64211e9cb67db3
 EBUILD autoconf-wrapper-13-r1.ebuild 785 BLAKE2B 5b55a828dcc7260f82d8af38f4237a8ab05749bd71dfb66e1fadec59e989ea66aa49aafcd55dde54d9e34ff2096cb573d077dfd32c3cd204de6c0391d66bb4e9 SHA512 8a0c74419cac7cf8803dae5faa09cdcb5f69cc700490f7a11b05125bc0682a49bbe6346f7edd6f5676f7f85046f5a1ddc4bf2c8f879b9164797b3f74f1b5a248
 EBUILD autoconf-wrapper-15.ebuild 823 BLAKE2B 2dddfe1c7e55ec4ab70a7c556061a3b6b385a43a95e45a444038b06ca23e70c620f3b268928ebc3fe710fdf385b34f5484ca1bfd69b28771a857bbe3988c94bf SHA512 bc08692c0eb0baf560038537abad44fcab12b59c6199c383cca6d6a7331f5ed2dda9b2155cc1ec8b89041d186779684c14cd61854d99748c23b04db895cad03c
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-14.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-14.sh
deleted file mode 100644
index b3e72c847d74..000000000000
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-14.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Based on the ac-wrapper.pl script provided by MandrakeSoft
-# Rewritten in bash by Gregorio Guidi
-#
-# Executes the correct autoconf version.
-#
-# - defaults to newest version available (hopefully autoconf-2.60)
-# - runs autoconf 2.13 if:
-#   - envvar WANT_AUTOCONF is set to `2.1'
-#     -or-
-#   - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher)
-#     -or-
-#   - `configure' is already present and was generated by autoconf 2.13
-
-warn() { printf "ac-wrapper: $*\n" 1>&2; }
-err() { warn "$@"; exit 1; }
-unset IFS
-which() {
-	local p
-	IFS=: # we don't use IFS anywhere, so don't bother saving/restoring
-	for p in ${PATH} ; do
-		p="${p}/$1"
-		[ -e "${p}" ] && echo "${p}" && return 0
-	done
-	unset IFS
-	return 1
-}
-
-#
-# Sanitize argv[0] since it isn't always a full path #385201
-#
-argv0=${0##*/}
-case ${0} in
-	${argv0})
-		# find it in PATH
-		if ! full_argv0=$(which "${argv0}") ; then
-			err "could not locate ${argv0}; file a bug"
-		fi
-		;;
-	*)
-		# re-use full/relative paths
-		full_argv0=$0
-		;;
-esac
-
-if [ "${argv0}" = "ac-wrapper.sh" ] ; then
-	err "Don't call this script directly"
-fi
-
-if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${argv0}" = "autom4te" ] ; then
-	err "Autoconf 2.13 doesn't contain autom4te.\n" \
-	    "   Either unset WANT_AUTOCONF or don't execute anything\n" \
-	    "   that would use autom4te."
-fi
-
-if ! seq 0 0 2>/dev/null 1>&2 ; then #338518
-	seq() {
-		local f l i
-		case $# in
-			1) f=1 i=1 l=$1;;
-			2) f=$1 i=1 l=$2;;
-			3) f=$1 i=$2 l=$3;;
-		esac
-		while :; do
-			[ $l -lt $f -a $i -gt 0 ] && break
-			[ $f -lt $l -a $i -lt 0 ] && break
-			echo $f
-			: $(( f += i ))
-		done
-		return 0
-	}
-fi
-
-#
-# Set up bindings between actual version and WANT_AUTOCONF;
-# Start at last known unstable/stable versions to speed up lookup process.
-#
-if [ -z "${KNOWN_AUTOCONF}" ] ; then
-	KNOWN_AUTOCONF="2.70:2.5 2.69:2.5"
-fi
-vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
-
-binary=""
-for v in ${vers} ; do
-	auto_ver=${v%:*}
-	if [ -z "${binary}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
-		binary="${full_argv0}-${auto_ver}"
-		break
-	fi
-done
-if [ -z "${binary}" ] ; then
-	err "Unable to locate any usuable version of autoconf.\n" \
-	    "\tI tried these versions: ${vers}\n" \
-	    "\tWith a base name of '${full_argv0}'."
-fi
-
-#
-# Check the WANT_AUTOCONF setting.  We accept a whitespace delimited
-# list of autoconf versions.
-#
-if [ -n "${WANT_AUTOCONF}" ] ; then
-	for v in ${vers} x ; do
-		if [ "${v}" = "x" ] ; then
-			warn "warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring."
-			unset WANT_AUTOCONF
-			break
-		fi
-
-		auto_ver=${v%:*}
-		want_ver=${v#*:}
-		for wx in ${WANT_AUTOCONF} ; do
-			if [ -x "${full_argv0}-${wx}" ] ; then
-				binary="${full_argv0}-${wx}"
-				v="x"
-			elif [ "${wx}" = "${want_ver}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
-				binary="${full_argv0}-${auto_ver}"
-				v="x"
-			fi
-		done
-		[ "${v}" = "x" ] && break
-	done
-fi
-
-#
-# autodetect helpers
-#
-acprereq_version() {
-	sed -n -r \
-		-e '/^\s*(#|dnl)/d' \
-		-e '/AC_PREREQ/s:.*AC_PREREQ\s*\(\[?\s*([0-9.]+)\s*\]?\):\1:p' \
-		"$@" |
-	LC_ALL=C sort -n -t . |
-	tail -1
-}
-
-generated_version() {
-	local re='^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9.]+).*'
-	sed -n -r "/${re}/{s:${re}:\3:;p;q}" "$@"
-}
-
-#
-# autodetect routine
-#
-if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then
-	err "Since configure.ac is present, aclocal always use\n" \
-	    "\tautoconf 2.59+, which conflicts with your choice and\n" \
-	    "\tcauses error. You have two options:\n" \
-	    "\t1. Try execute command again after removing configure.ac\n" \
-	    "\t2. Don't set WANT_AUTOCONF"
-fi
-
-if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
-	# Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE
-	# is set to an older version, let's do some sanity checks.
-	case "${WANT_AUTOMAKE}" in
-	1.[456])
-		acfiles=$(ls aclocal.m4 acinclude.m4 configure.in configure.ac 2>/dev/null)
-		[ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles})
-
-		[ -z "${confversion}" ] && [ -r "configure" ] \
-			&& confversion=$(generated_version configure)
-
-		if [ "${confversion}" = "2.1" ] && [ ! -f "configure.ac" ] ; then
-			binary="${full_argv0}-2.13"
-		fi
-	esac
-fi
-
-if [ -n "${WANT_ACWRAPPER_DEBUG}" ] ; then
-	if [ -n "${WANT_AUTOCONF}" ] ; then
-		warn "DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}"
-	fi
-	warn "DEBUG: will execute <${binary}>"
-fi
-
-#
-# for further consistency
-#
-if [ -z "${WANT_AUTOCONF}" ] ; then
-	for v in ${vers} ; do
-		auto_ver=${v%:*}
-		want_ver=${v#*:}
-		if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then
-			export WANT_AUTOCONF="${want_ver}"
-			break
-		fi
-	done
-fi
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${binary}" ] ; then
-	# this shouldn't happen
-	err "${binary} is missing or not executable.\n" \
-	    "\tPlease try emerging the correct version of autoconf."
-fi
-
-exec "${binary}" "$@"
-# The shell will error out if `exec` failed.
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index be4f6fe51768..0723074d267c 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,8 +1,8 @@
-AUX bmake-20201117-tests.patch 796 BLAKE2B e30d5584e9fa36203ed54bd969b174a082f188b191ce0c3990a6b798ea938d71d14a208f7e5e1963cc74ddb85548aec20ba0b63c059c6b042e7cd04298455fc8 SHA512 270bcc2f4353e0aeba97215f92e6cf51e858b24c44d761b1d588d66604c61471b9a69e259900ad68ea71b0efe92942524763a39e4be081e24e246790f92bad78
+AUX bmake-20210206-lib-mk.patch 434 BLAKE2B bf83ead1909041a10fc3889b9157810edc8ace40bae1ed8446e2bfd839220cc3af178cd321ae2cb98ff37748a24ca5d3c9c092f89addf6fc304a73a0b20dc976 SHA512 7580c880992c7ab6a46554f91945ad99da20d6e5fd262a4f8437ee6aa8405855e67eabf8165c81f15d313f8fc741b191ac3a67fd8df095764fd7c7ee8718c08e
 AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe
-DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588
 DIST bmake-20210206.tar.gz 740065 BLAKE2B 2482b980ad4e4aac4292e0244020eeb3699148d84b0f493865a8317673eddb20ed48219f1319c490c6a88c6f1c50a44bd95af5de43f5853876bd10c1aef9b4bd SHA512 abda3aadd49abfe0e7801f4c37539a9172c3bb2d6ed542e0dec5b6177a799774a4b513041ff6167409c69ac6af35f506b1d6e585694259192a65a8575c232839
+DIST bmake-20210314.tar.gz 749343 BLAKE2B 765b06577d8b06924627de7c2551e4fa25bdf533f2ce96db09a63af01d965e2bc29001e2c07df98a15d72b3c57a11e99974df82b9ec12257c9340baf563c3faf SHA512 d27c3787102d32ccd541909aaf76083ff9d2f704b938ba64d234c5d29d2e7dea320e99bbee53d3594aa830ced59d512d8701487ec5b0c277339e705d6e64f97d
 DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861
-EBUILD bmake-20201117.ebuild 1152 BLAKE2B 643222e719b1bc152f930c85c026a19077645e767d1b1256d72882beb1b271348c944d54e5433aa96f3364fd6204e341d2854f2b93dc0f6ed40d487cd588b475 SHA512 b06d919e2d9adff7d7a39498fd1a8e2fd231af83dcac3a358e751cdda1e47e247957465e785245ffd56d0cf1ddc5015c9e23a5be28d5d5a4855d8bb8b713f49f
-EBUILD bmake-20210206.ebuild 1153 BLAKE2B 1cb5132e060ae65c0afe2a4b14740172ae2f43be23d1ca93b60001fcd0901d227ad8170d5f11cd593bbcaa80f90375f79fdab656b89876bb5d3370add35b7fea SHA512 6d1eef0c8c9371350ccb28b95c11518f0413c9224e993bd94eb6bf1fa97a51da9662e85acaa353134ddb898d37710910a12a93b1223a2b5268d31f3fb241b20e
-MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
+EBUILD bmake-20210206-r1.ebuild 1244 BLAKE2B 6b6379ab87be0a13dcd3231903cee14d037db478654f80e614b06b942e28b246fc27c396a68a405953e952be60ee21d711528b5cc12be7cb35b4eb099dd58559 SHA512 ce97b06c9fcf24dd9680913d611a49f9453e33dd09dee75a512a28c8db9b8392b9e6d9e10a97e77f6d0033487572169a3f3183f4efcd62bd9e18afbaa3a94274
+EBUILD bmake-20210314.ebuild 1265 BLAKE2B dcfe2099d9fd788bda2fbf3d8b176c63ecf98250d66fc6c8bb7e776234e598b34e04daa3885713736b2e3655dce35fc46ce5c0f9c65589afc2ff4deee4dec9bc SHA512 f879880010feeec7d0a7f0c002e55f20b679f9715e58c58bb5309965bc26de5c495e9d7c9e8bcd320d2b1927cf33c20518ee40242a1f38aab47737bd85935e84
+MISC metadata.xml 356 BLAKE2B c8acffcd095f37e19987d6d116df6654453aab320818262c98e1ccec0871084adb919e408599eb6b4460544c2ec8660abe1e0add7a858d41dc48492f78d1c53d SHA512 c63247454ecc0add57dc73ae2e16421dab39ad199d592c459366b567f3ef3f63c706cb66ac3bdadfafe8a995216e35dc3f90f22ad45a7c078b302b48116f4645
diff --git a/sys-devel/bmake/bmake-20210206.ebuild b/sys-devel/bmake/bmake-20210206-r1.ebuild
index 547f81f91f68..3b3e54fcda20 100644
--- a/sys-devel/bmake/bmake-20210206.ebuild
+++ b/sys-devel/bmake/bmake-20210206-r1.ebuild
@@ -13,13 +13,19 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 S="${WORKDIR}/${PN}"
 
 # Skip failing test (sandbox and csh)
 PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 
+src_prepare() {
+	default
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${P}-lib-mk.patch
+}
+
 src_configure() {
 	econf \
 		--with-mksrc=../mk \
diff --git a/sys-devel/bmake/bmake-20201117.ebuild b/sys-devel/bmake/bmake-20210314.ebuild
index 78a6f067ab38..cccbf6666ec7 100644
--- a/sys-devel/bmake/bmake-20201117.ebuild
+++ b/sys-devel/bmake/bmake-20210314.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,12 +13,18 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 S="${WORKDIR}/${PN}"
 
 # Skip failing test (sandbox and csh)
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch )
+
+src_prepare() {
+	default
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-20210206-lib-mk.patch
+}
 
 src_configure() {
 	econf \
diff --git a/sys-devel/bmake/files/bmake-20201117-tests.patch b/sys-devel/bmake/files/bmake-20201117-tests.patch
deleted file mode 100644
index 185f45232e1e..000000000000
--- a/sys-devel/bmake/files/bmake-20201117-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/unit-tests/Makefile
-+++ b/unit-tests/Makefile
-@@ -168,7 +168,6 @@
- TESTS+=		envfirst
- TESTS+=		error
- TESTS+=		# escape	# broken by reverting POSIX changes
--TESTS+=		export
- TESTS+=		export-all
- TESTS+=		export-env
- TESTS+=		export-variants
-@@ -255,7 +254,6 @@
- TESTS+=		sh-meta-chars
- TESTS+=		sh-multi-line
- TESTS+=		sh-single-line
--TESTS+=		shell-csh
- TESTS+=		shell-custom
- .if exists(/bin/ksh)
- TESTS+=		shell-ksh
-@@ -287,7 +285,6 @@
- TESTS+=		var-op-assign
- TESTS+=		var-op-default
- TESTS+=		var-op-expand
--TESTS+=		var-op-shell
- TESTS+=		var-op-sunsh
- TESTS+=		var-recursive
- TESTS+=		varcmd
-@@ -300,7 +297,6 @@
- TESTS+=		varmod-edge
- TESTS+=		varmod-exclam-shell
- TESTS+=		varmod-extension
--TESTS+=		varmod-gmtime
- TESTS+=		varmod-hash
- TESTS+=		varmod-head
- TESTS+=		varmod-ifelse
diff --git a/sys-devel/bmake/files/bmake-20210206-lib-mk.patch b/sys-devel/bmake/files/bmake-20210206-lib-mk.patch
new file mode 100644
index 000000000000..5f860b6f15aa
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20210206-lib-mk.patch
@@ -0,0 +1,11 @@
+--- a/mk/lib.mk
++++ b/mk/lib.mk
+@@ -170,7 +170,7 @@ LD_solib= lib${LIB}_pic.a
+ .elif ${TARGET_OSNAME} == "Linux"
+ SHLIB_LD = ${CC}
+ # this is ambiguous of course
+-LD_shared=-shared -Wl,"-soname lib${LIB}.so.${SHLIB_MAJOR}"
++LD_shared=-shared -Wl,-soname,lib${LIB}.so.${SHLIB_MAJOR}
+ LD_solib= -Wl,--whole-archive lib${LIB}_pic.a -Wl,--no-whole-archive
+ .if ${COMPILER_TYPE} == "gcc"
+ # Linux uses GNU ld, which is a multi-pass linker
diff --git a/sys-devel/bmake/metadata.xml b/sys-devel/bmake/metadata.xml
index 70f78a5392df..97c59ff25556 100644
--- a/sys-devel/bmake/metadata.xml
+++ b/sys-devel/bmake/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>soap@gentoo.org</email>
 		<name>David Seifert</name>
 	</maintainer>
diff --git a/sys-devel/elftoolchain/Manifest b/sys-devel/elftoolchain/Manifest
new file mode 100644
index 000000000000..132427c72520
--- /dev/null
+++ b/sys-devel/elftoolchain/Manifest
@@ -0,0 +1,3 @@
+DIST elftoolchain-0.7.1.tar.bz2 5361427 BLAKE2B f86204b3c89433948eaf2cd2edc57abf9b77bfab777dc2a840b7aa5fbddfd31665bd27f31d7af2dea09fab0118e201b12802b4da85f8210af29094661f6f1fe5 SHA512 8226c468b393f0d567167a9dd6b16d2a226227e4d05dab8f44550038da44dcbfb92749f8e1a4b130b893675337a6771e24a81f350f3f864b1b8b17402ed23b26
+EBUILD elftoolchain-0.7.1.ebuild 1158 BLAKE2B 70b0256921589051bc4f1c7fae4ab0347fb959743d507b0e868e08ca88ac25954cec163132d66bf841fd539ea814dccd8f8d3aa9c3d0b135d3758fc1243bf93e SHA512 9ddead8c7df0b5a589acd72eb7fe799600fe6397e36de59a6dce9309a77aaf61173d695a5d9430f8c8002d69ca7c1feefd26f3f84dccd01e2d141aec68bba3ee
+MISC metadata.xml 450 BLAKE2B b2e66c3665e4d1d24e8a4887114e5b5d2306a996a56660c7f40846550383588aea10c667b6e055c32dd22b756d8b2a81afbb0512919b273ef15bcf28b0a9c2c0 SHA512 8306332a971bd86d79ee9c3e3d1415ac15a40d015aa9db631b57e4afd125641f5106b8a06bc1c22b0d1aa128dc01ba390b94abaed780e8d92d3a43833fd79f40
diff --git a/sys-devel/elftoolchain/elftoolchain-0.7.1.ebuild b/sys-devel/elftoolchain/elftoolchain-0.7.1.ebuild
new file mode 100644
index 000000000000..8b4360d62099
--- /dev/null
+++ b/sys-devel/elftoolchain/elftoolchain-0.7.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (BSD drop in replacement for libelf)"
+HOMEPAGE="https://wiki.freebsd.org/LibElf"
+SRC_URI="https://netcologne.dl.sourceforge.net/project/elftoolchain/Sources/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!dev-libs/elfutils
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-vcs/subversion
+	sys-apps/lsb-release
+	>=sys-devel/bmake-20210206
+	virtual/yacc"
+
+src_prepare() {
+	default
+	sed -i -e "s@cc@$(tc-getCC)@" common/native-elf-format || die
+	sed -i -e "s@readelf@$(tc-getREADELF)@" common/native-elf-format || die
+}
+
+_bmake() {
+	bmake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@" || die
+}
+
+src_compile() {
+	export MAKESYSPATH="${BROOT}"/usr/share/mk/bmake
+	_bmake -C common
+	_bmake -C libelf
+}
+
+src_install() {
+	doheader common/elfdefinitions.h
+	doheader libelf/{gelf,libelf}.h
+
+	dolib.so libelf/libelf.so.1
+	dosym libelf.so.1 /usr/$(get_libdir)/libelf.so
+
+	dodoc README
+}
diff --git a/sys-devel/elftoolchain/metadata.xml b/sys-devel/elftoolchain/metadata.xml
new file mode 100644
index 000000000000..cebcfd378268
--- /dev/null
+++ b/sys-devel/elftoolchain/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">elftoolchain</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index bc89e400d13c..401a4d27eea8 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -7,6 +7,6 @@ DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee
 EBUILD flex-2.6.1.ebuild 1869 BLAKE2B 9b26bc3006a345e2bf9bdf867c70a11b4da8722feded6b1ea5209d296135061ffea1c7f59d9b6e1037041fdd07e7a1e4f1efd35e190fc47e8aeb5cc7fd4ccf43 SHA512 493ed39e7116f03bd8520a9c93ecc0890f2843749e5419cf012cf7e00f522e91a02716e3d66a790de3ff7202900744f05ba041ce2ccfefded2dc8caf800208ba
 EBUILD flex-2.6.3-r1.ebuild 2013 BLAKE2B 0825b6dbc2e8366b70cfd560f2d88ff6f127596dde6ed20dd01c26af6c7405969d156c7e6a41d5243ff6bc6de9149b10bed02e605e49252874eb791c65bc3ee9 SHA512 84006fa9fccd333a19c6ab1c313dcfd55db651e09796b96489c1d1da106074fbd8faefa4df4887faefbd9920e7bcd7a8647c6b6b7950e2891f8d192a0ab861ad
 EBUILD flex-2.6.3.ebuild 1939 BLAKE2B 3ffe8be5b5893de5c55873575728523e44f18187596cee9240b1288bc5d0865c2e552f66777956584333035f3ba05289a0502721f9a1b4001c89056a7d3df9fb SHA512 58c9d79c91bba6b3819ebead5754fcc712688ebe7313297e254ad630111a8512b273e37216adbae2616729f421468207d05a1ec8aa97518e68361b58d9e558b3
-EBUILD flex-2.6.4-r1.ebuild 2074 BLAKE2B 7ec754512179432cf6863fa67904f4e9e46e38a43eadf6750358541286409f961debd1c1dca04029897e4158643aa9f9ed6a4ac3350932492a8ded7a337470c6 SHA512 23a1b51fd6fd3e1c9e70d37f96c29c1a160a8d62bef9cee103a1a0898bb95cfc8cb8246f704a41c4bcb5e10270fdb85d80eda4d3140c312e2f9a17797688ecca
+EBUILD flex-2.6.4-r1.ebuild 2044 BLAKE2B f2bcbff8692b914dc8a5b0f970ba89c81a90e54633be771bf6a3720abb54ae42cdde4e2672f36dc71bc0f8ada1e1ba7f479a2b13229b7e32549bf880802e0398 SHA512 a6fd255ad489a7512688c9848cf7dc4af5d1ca072f67198606ea555a68ec47d6141ea8080df016be39baefa85d3a6e6c2479cbbaef9b0af453633dd0a02c9ac1
 EBUILD flex-2.6.4.ebuild 1978 BLAKE2B 409bcfa1d667e10150e3ca38a117884a09080e9e148d9349cdbae3e020962f27b4ff5cfbdad296adb0e3257c2339b244a44b77d23b61af7db3bd4d3b6e7f5c2e SHA512 d7b3ee7731f7f073c3bc4a9e9dcf9c225370d8e686b1c4a1c4dfa235e3513654318003a278e8affa062e0d5b93c0e257aa3fdb3a8622bf172abc679dcce73cf5
 MISC metadata.xml 443 BLAKE2B cc8a09bc87204eb0ff62cea3db2db77a6ec2f8128e123eb0c9983729d42d8f8f4525cf01ccaf28d1501ba56e62fcf428463ceb05d60b7a519c2ec4f6a47b583b SHA512 47d23e25c830b96e5ce176c02e90e6cae38638d15f1a9b8261258ab455e622d53f4f2349fe1701e2742176fc6bc4c1d1b71431e3769b8fb04842b4bafd7a86ab
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 71c554a4c79c..2470db3ad1ac 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit eutils flag-o-matic libtool ltprune multilib-minimal toolchain-funcs
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
 
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex"
@@ -17,8 +17,7 @@ RESTRICT="!test? ( test )"
 
 # We want bison explicitly and not yacc in general #381273
 RDEPEND="sys-devel/m4"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
+BDEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bison )"
 
@@ -59,8 +58,7 @@ multilib_src_compile() {
 	if multilib_is_native_abi; then
 		default
 	else
-		cd src || die
-		emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)'
+		emake -C src -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)'
 	fi
 }
 
@@ -72,15 +70,14 @@ multilib_src_install() {
 	if multilib_is_native_abi; then
 		default
 	else
-		cd src || die
-		emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS
+		emake -C src DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS
 	fi
 }
 
 multilib_src_install_all() {
 	einstalldocs
 	dodoc ONEWS
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -type f -delete || die
 	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
 	dosym flex /usr/bin/lex
 }
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 0ec9c0f8bfec..bedc8e3cc40c 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -2,7 +2,7 @@ DIST gcc-config-2.3.2.tar.xz 17444 BLAKE2B c66fd121770dddcb27033be228de691f766f1
 DIST gcc-config-2.3.3.tar.xz 17452 BLAKE2B fb77e2a2ea3d57142e6784d985364f3c0c82c149af10ac0a6490b3f4acceb3cd86e9d25168a60c532dd2bfce300a12a13cfc0eb290bf8c9457e43b9acf247328 SHA512 110af5a15e34c41f8f0568f20215bd4b0db2ffd2e65a4c3e7c3a6695c0de574e85478582cd65b627591ee754cd7f28c01ab8f3c3a101ed00c2b42fedab58a08a
 DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7
 EBUILD gcc-config-2.3.2-r1.ebuild 1519 BLAKE2B 0c80ef8f3c9f443f3ef5ec53eac602a3bf1b35ea527df07fc3e91307c87209aef921f757e4fc9cb4ad296eea2ee438f9b80752bd5ead2cbaa6f3107853396a44 SHA512 88eedc35a0ff2e6fbff28cf6ad5a50352ebf1ccfb3e4ce458875022a46ae22f0540f034fe39367677cd5b58e897649355d97c801271a30fd29432812a9c4424c
-EBUILD gcc-config-2.3.3.ebuild 1277 BLAKE2B 2d278e677f9731a57e68abb8682f4db48497e41fa7c89381b0dd51883f7800b14461b0900b8bc0e4eb1b75cb0c7bbdba55f0ca348efb8bbc75d155a98e4f55b2 SHA512 04ff5dbe62dd50cfd9afc219d0ff819757588dead3e58954e514dfc6fa6a5cebac6c982476580531135ead23272c233a6632128d4207c46fc11cc196253be220
+EBUILD gcc-config-2.3.3.ebuild 1276 BLAKE2B d9ec1175c915f5be6d257bf95201586e30be89e51859df679bfd952ce7ef0c96aa905ffd27080948386ed0f6808e82955ba914813fa0b25efff63fee2f654b78 SHA512 ff728ce9cc5fb0ec0f374a522d3d3d5e5e513b6ecfd6b9263f71c99e7eb8a7716a161d7c638b7368b43e4caafc90a50305925d73661a0028000d70750774ab5e
 EBUILD gcc-config-2.4.ebuild 1283 BLAKE2B b181194a31e02627538d33c2b21ca8ffa951374b059d0c8586672c02cdcc2c3ca09a828e793f899493d637334e5b127eb0d2f28453826949547ad6256f494f5c SHA512 d9edd49ebada071cf1a3d83648ceaf0f11a4211c48b2923294dcef724d38990814469d7c2a62ab76f7d1562b04d9b0306aca841814424a2ba7d7f755a102fca1
 EBUILD gcc-config-9999.ebuild 1528 BLAKE2B 2748dbbcd43c80df61ee32e744059d421691298f696d3db52d51bc8084b72da0971df1bbc22a224713690268453585e9d84ab57de94c6ba7fb25d9807c049986 SHA512 bd50f91b0ea31a175ba83180db0bfb6e3252f8c3afcfe64fe11d4abb7721accb6aebc49288fc9ee4989539adae5fa82fcbc41c0f042c7a625ab600b47806fe52
 MISC metadata.xml 532 BLAKE2B f2ce0b655376a7a6a31520f557917b4a6e2036ceec6726d869f795b6fff0a97fa27b7e13b7a41b6ea1b83ff67b9e3ef4ea12c0a8058911007da92f986c0f8265 SHA512 f2dc77e3d2301f3fadc24ceba33894ee8fd07831496b04e3513369906e101c155c7cb10cf81a4a08628514db5758368a64b0b4eb37c41f7f8fe4942f90b11935
diff --git a/sys-devel/gcc-config/gcc-config-2.3.3.ebuild b/sys-devel/gcc-config/gcc-config-2.3.3.ebuild
index 786a945b65f3..d925ad38fcbe 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.3.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 310d336e3153..8ed4c9cc6ce2 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -21,7 +21,7 @@ EBUILD gcc-11.0.1_pre9999.ebuild 511 BLAKE2B 3c298f291708ab37ce458c5950295fb3795
 EBUILD gcc-6.5.0-r3.ebuild 436 BLAKE2B 8b219613160b1d152efeebae97d56e1110473c31949b6c09b9f721afc36c765a8a499fe1ab43ec5e115197f4b9ec3f73cd6cff2d7716993a93353b8556bb5115 SHA512 b83c39a6a99971a0bc4f3ab57b5bc8c5477a1da8fb82a6b56a0dec1e0225761dbdd080606e6abf4b06d56a9b39e766ebac8b347ae56c535f7bf2a381212530ba
 EBUILD gcc-7.5.0-r1.ebuild 447 BLAKE2B b7465ed897cd3f2c0716e7fc1fe384dd93de4f29a090948857af9cbb04af1acee54557a2185e08852efb63ece42f72bf0c6289ac63f059d31bf32936bcb3dead SHA512 73b7cd1af8c1a45e0303085b95f8fa25831af50ad9999d7268847c970af9ece183dd68334bb0b57a153c8e4ed4ca3baa93c61a4ee6376bbaa944dfd529dd9bdd
 EBUILD gcc-8.4.0-r1.ebuild 443 BLAKE2B 7263728f3a730bcba73bb779ab11b4951f1171be0a0c0f2dc0efa3299e33cb0880c33d53672d369c2266816aa8f165b0d0295fa66c7fd92779ab80846428640a SHA512 2ea31641f37460d7951767780868c7e4b582531f7e0a0a732f5ce4d981a559b3f0750dd51c8dfc91154da9e4205114353ad883df35b9910d361bccaceaeb5711
-EBUILD gcc-8.4.0-r2.ebuild 450 BLAKE2B c790e74cc1d584a9dcbdf29e12d200a5bd60bfa119533649c04ddc47a272ed11635e25e0fe678ef7281d37eaeaa9d2c67f9d3996df9f780cfef0a7316bfd86af SHA512 856309bb86b77e8c4b4fd9d4ed84c552c1fed88647e6175b32d18078a23c7346255744a4e1242f1a5d315e1717534ee39ecbab27c14446b71a82d3a631048ba2
+EBUILD gcc-8.4.0-r2.ebuild 448 BLAKE2B 4dd38148a900104f7fc36a4a42b446cc2c856951bfbea9bc98a447f199a4b805dd4ff2f2313a76aa2c445568f93d8c16c11c84075ade7f8fb0ff03d5299c159e SHA512 fa6b450bec067772bdb9373ae4cca1990996e78863a630d3cf0ddd90f5a56a5aee70bb1c475723f6aa7e2cab98f0c07d3fc7543dfee138c89b1f33bd981a5764
 EBUILD gcc-9.3.0-r1.ebuild 443 BLAKE2B 0f43c582049ee55a5627d2a05e6dec513b4078d57e322fcadcc917056e840db4bd58dab264f068135569c0f06baf75e95d43302e89b2caf4bf4dac420e052872 SHA512 4efda3a2cbf371a688bfecb74369e7215dec1d5e8b72612f13a50644a884e738842f8ea25aa6800931c39bf0571c8f494972f413cc187b967f9b7a533a4237ad
 EBUILD gcc-9.3.0-r2.ebuild 447 BLAKE2B 21486596a97d2b46ac76e3f669927fc6ab936fd1ef7ba90b6eeae67880ea68f9fecb19b6fdf8c1e8f8fbcfd7df7c8a6f7e3c353ec3160bbdbcec48cdcf2406e2 SHA512 edc497faaa3e5793e7a90b2e3561b56dd9f60bd5bf742d36154b374755db45667b42e000d37cb62df792bd1586ed309fe42197bb43b2a48043d654ccfa635e99
 MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df
diff --git a/sys-devel/gcc/gcc-8.4.0-r2.ebuild b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
index 7eeaf8f532e1..34dbebcc7b00 100644
--- a/sys-devel/gcc/gcc-8.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 8a45d93d219a..1e651c60719a 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -9,6 +9,7 @@ DIST llvm-rocm-ocl-3.8.0.tar.gz 117004300 BLAKE2B 13c3213f0fb951fb9d574e8f6d76bb
 DIST llvm-rocm-ocl-3.9.0.tar.gz 123591368 BLAKE2B 54b44d705e7704921df1914bac6dc1da8e420f9383efb698a9cf6a339b653d71cad29aa077a9e24d6764ca81fb8dc55fa70abb0cfac004d40f7d811e20ec9945 SHA512 3404390506b33c1de1d05980fafb219692985f38b52d852e9a47ab94e57228caa25ccd0d0d69da656281de32c75e001f60cb9f22453e70fea7b39d065d4333af
 DIST llvm-rocm-ocl-4.0.0.tar.gz 123595983 BLAKE2B 69dd47a50a53cf7d8168f872778bcda0e028907c2341b165f40152bdf03b668ee6c209dc60fa1018dde2a946d891f15eb92a38cfbc12bb5798dd132c1ce79bf1 SHA512 2ac3d643e0bee72239089003cd2889711a7cd58dc588467fb0ca0a50bec264fda992aa2e3352d5210011a9dc1eea4dd9eacdc7d0c313cd69c7b491df126a4e4e
 DIST llvm-rocm-ocl-4.0.1.tar.gz 123608276 BLAKE2B dd5a4d6bc198c7fb6fdc2514cd8c4533a2df6ded7a574c9b4762cda3cb65498a464a0e78427db94db05b468a29ce78d3d8131ac7c6e42953fc503896732474e3 SHA512 d23dceaee2badf46cda27aa725bce5b82bab2fba7d1c2220fedb4795eee455de5077b4ff7299ecd6850eeb0bbdb131ea12a699357f373aef818758d845550f04
+DIST llvm-rocm-ocl-4.1.0.tar.gz 128913932 BLAKE2B 15a041ec7b9fec91e409c8ab98ff88f2d15ce58822aa8a77a26ff21416378a4a77a5904fce4e26c5447653da4ec2dbbb5bfec4ae70c72e8e64b2a5f5986ffb92 SHA512 8576e5a43754a9587613f166dc6cad18890812f07bfa55e563ab3de150b6f01ae1b5515aaaf4eef238a7f79e87890533ce791ef07528e4557ea8290c2642ebd3
 EBUILD llvm-roc-3.10.0.ebuild 1536 BLAKE2B 60a1d393a5df2291d971e67f9bbd2675611f935530410e9f9f18cc2178606de298266200c258c2d23bd857198ff41b292d072d0e2c03154b9a640a9ecabf94af SHA512 46771c99d57027271c61dc45d057ee5848745affa5018d218da166dfd4c20f58a38ab2dfede1c42ccb306264b0c81ea6d267353bad34cb6a0d34c2d7255a3608
 EBUILD llvm-roc-3.7.0-r1.ebuild 1397 BLAKE2B 08aec56b8ab26093f28a9118ca043adb35dcb84ae5899da5890cbeecb5d10f8d6b08e767a490272a5f35d1b3a5ee8d912a52b448ee57582cda9f99fce57ec8ec SHA512 745f2a9fa18bc3b9d76a324beb1e5165f9be8f720ef133b35e1509c08c08e48872ec4c7402e52d29a3b493e27729a43081fd0e90afe90d30b64d6da3f046e824
 EBUILD llvm-roc-3.8.0.ebuild 1492 BLAKE2B 73fd9fd2c47a18b5de44222b84fead548f85b4e67c18838050c52917b6836debee77bc83db6aa0a378516b48a56e5daaac53dde84bdbe1dbefd02494b06498d8 SHA512 d45f0e60c2f12e9b98425310fe370aeeb5d29cd24bfa83b1b908bcbc25866a49e6e1fc7facb04e699bd897f1960a394f2e3a4c5a8308ad9af6177f735dc40631
@@ -16,4 +17,5 @@ EBUILD llvm-roc-3.9.0.ebuild 1529 BLAKE2B 07aac1728864214e61ed45cee3ca718c783083
 EBUILD llvm-roc-4.0.0-r2.ebuild 2374 BLAKE2B 3944380f53d89d30e8d93314f37a191c37359095dc10c23ce9ad85cc8e9b25eaf86907fa48cd9bf2ae0adc2348d57733bc56b134fa106104e84cae34b2f6432d SHA512 2204600e6e06c08baab1fa655e1d818e0b8b8bbb057b5d8cd838e7206f47ad0af1302f38d4bbf1420c566d5d2bc1023727a695244bc7e0fccf56ec592ddbe5f9
 EBUILD llvm-roc-4.0.0.ebuild 2209 BLAKE2B 69cb35d21ea261977032b7ba780bee60d1feda3a3246e81bb16b33f21b5b08fb094fbe34b117aa68e00d1cd42551a44fb53dd64bb40a74254bf02ba872f4cc32 SHA512 34a7d3f9cfd920adad596fe7532a15c347f56ccbd3cc9f66eb02fa77efa7b512ef3ba119c5377a059471cd6e256424c4ae34fac49dd08620674e0b22375d8268
 EBUILD llvm-roc-4.0.1.ebuild 2374 BLAKE2B 3944380f53d89d30e8d93314f37a191c37359095dc10c23ce9ad85cc8e9b25eaf86907fa48cd9bf2ae0adc2348d57733bc56b134fa106104e84cae34b2f6432d SHA512 2204600e6e06c08baab1fa655e1d818e0b8b8bbb057b5d8cd838e7206f47ad0af1302f38d4bbf1420c566d5d2bc1023727a695244bc7e0fccf56ec592ddbe5f9
+EBUILD llvm-roc-4.1.0.ebuild 2330 BLAKE2B 28c3482eca9f3d1025e76b9eb9e03ce12469387f799228cfe1d1011414a3db9e20c35969b3da2ce4ca25a17cb347bf67f0ff3ee7b15ba6caeafa2b6a5b4c16da SHA512 f648e70cacefbbe172b2c8c4e703d03ecae597a5bf8420be04d61a02350f17e9a80f81cd55bbe31fab829f748a1b0a5542e7264671a873d442693f931f59d66c
 MISC metadata.xml 461 BLAKE2B 5a060c417f0bb9bf1fba8375292e7bff20b2c50c3a2ab490bd436f81a954dbd370d61ba59b305b8bdaad9887e9c6a872eb30fea31c566dc6d74d3493b40d0a26 SHA512 a82c2186fc0642dab37608155dcf0aafd20701cb7e2769c6eb3aae88d4df6690743769a75f47efdb36fd8a3d6771f0feecd3efd01c98460fe195394c16d95660
diff --git a/sys-devel/llvm-roc/llvm-roc-4.1.0.ebuild b/sys-devel/llvm-roc/llvm-roc-4.1.0.ebuild
new file mode 100644
index 000000000000..eb7e40df837d
--- /dev/null
+++ b/sys-devel/llvm-roc/llvm-roc-4.1.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Radeon Open Compute llvm,lld,clang"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
+SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz"
+
+LICENSE="UoI-NCSA rc BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug +runtime"
+
+RDEPEND="virtual/cblas
+	dev-libs/libxml2
+	sys-libs/zlib
+	sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+PDEPEND="dev-libs/rocr-runtime"
+
+S="${WORKDIR}/llvm-project-rocm-${PV}/llvm"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-current_pos.patch"
+)
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cd "${WORKDIR}/llvm-project-rocm-${PV}" || die
+	eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch"
+	eapply "${FILESDIR}/${PN}-4.0.0-remove-isystem-usr-include.patch"
+	eapply "${FILESDIR}/${PN}-4.0.0-hip-location.patch"
+
+	if [[ -n ${EPREFIX} ]]; then
+		pushd "${S}"/../clang >/dev/null || die
+		sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" CMakeLists.txt
+		eend $?
+		ebegin "Use ${EPREFIX} as default sysroot"
+		cd lib/Driver/ToolChains >/dev/null || die
+		ebegin "Use dynamic linker from ${EPREFIX}"
+		sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" Linux.cpp
+		eend $?
+
+		ebegin "Remove --sysroot call on ld for native toolchain"
+		sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
+		eend $?
+		popd >/dev/null || die
+	fi
+
+	# handled by sysroot, don't prefixify here.
+	sed -e 's:/opt/rocm:/usr/lib/hip:' \
+		-i "${S}"/../clang/lib/Driver/ToolChains/AMDGPU.cpp
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	PROJECTS="clang;lld"
+
+	if usex runtime; then
+		PROJECTS+=";compiler-rt"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
+		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
+		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
+		-DLLVM_BUILD_DOCS=NO
+		-DLLVM_ENABLE_OCAMLDOC=OFF
+		-DLLVM_ENABLE_SPHINX=NO
+		-DLLVM_ENABLE_DOXYGEN=OFF
+		-DLLVM_INSTALL_UTILS=ON
+		-DLLVM_VERSION_SUFFIX=roc
+		-DOCAMLFIND=NO
+	)
+
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	cat > "99${PN}" <<-EOF
+		LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
+	EOF
+	doenvd "99${PN}"
+}
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 157d4547dce1..39007f54874e 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,8 +1,6 @@
 AUX m4-1.4.17-posix_spawn.patch 3302 BLAKE2B fe00346f2f180fe70ef867376d9a3f0da632d83aeee21aa524642ec061e6c1e37538c37d266a32aea63c6a8f776ee3bc85fd82f447704c1e73965132f528030a SHA512 82f6f1960a290265f1a7a3c868a780fa0816194c26ed5fc8337e35983021798c55db7c75fccf979a7dcc73253d1864cbf2de89a906fc6bf8458a524e2c4604c8
 AUX m4-1.4.18-darwin17-printf-n.patch 1386 BLAKE2B e5b1e4750b21b4efc0e62f2447a3f40dd037e28b5fe833d3ddf87fe853ee8885e34c5720b7b00f08242131df9996d36f4a954571ed21d067ca0dfeae69961e09 SHA512 4ad476e538c85ee41280461269dd8acabdbdb9cd2e0e2e49ea43bc14eb370e17282c504403a7c2914d886adf703bcc3b95991724bed90dc014a66cb861a70faf
 AUX m4-1.4.18-glibc228.patch 13863 BLAKE2B f8b54c3b7feae5d458ba893e08313f5e9772e66be03a5db2fe3929e671002cc3c80cf8cc6ca0a68b792f729404dc27c95cf436663026b50682f47c306721b581 SHA512 c81df4510b01044578e11c7bd1046ec297ab195f6e5c7d7eaad7aae31862326d12cf00a9f36218f93db88e36f88ec73be8e320214b999330da3dc5bba9a3be46
-DIST m4-1.4.17.tar.xz 1149088 BLAKE2B ccba6a1cd80de241bc2e755addbf4876b00ab776e0a3c85691998e3e84e8a091d57d8c3e9b43a115e52e416450de791662a54ca8e64e1603a166029164f140ce SHA512 406e6e97c3f5c5f3c8055bac748d4fe8c2e861d97e84ab6d840a2caa7df04f523cc662d6d51f6afae7d6c219d03693c7ae0c1e669a80246a3ceb5e8342b82389
 DIST m4-1.4.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
-EBUILD m4-1.4.17.ebuild 1555 BLAKE2B 2ebb1154f51aa295d3b3cdba31c728684d99486b2794781cf13b17e62eb427d71707500afa0c943435aece261487d780dda85b078d276043c6ab1e127f05b3ba SHA512 bbb3f55867a7e7019c5069c154e0c1125eeb80f6ec19184520e0948997818723071ac6e8b3dc52e1919f78635e99e0113c2139b4da40118a322dbdc3bcf7dd86
-EBUILD m4-1.4.18-r1.ebuild 1367 BLAKE2B 498f14f10d7d3fd9cfea2dfc8244690a036e34aac08eda2ea5469a41d3ad39b3226cee8789f25ce1efbbbc05a057c9aff084fe7e595abc688285736afab881d7 SHA512 a89559f8bbfa2f6d0588646b1969fd602235a474dfde05c4130def070167d6565f993a307861539e74d85d5846fd8816dc6282c11fe42eeed5152869264a14e3
+EBUILD m4-1.4.18-r2.ebuild 1331 BLAKE2B c7270e1440c2f54182075d137199be699898a764dec39f95dd180500408ca8072ae0ae16ea48a39ed876ffbb1ffdc3041eff3ec2f9571b52b65c140db187518b SHA512 b6956a89a8672055f1ba3889461b02b223e79dcbe170d393964220b1c91b9f60877c600b35baba49fd1e6ad6b6ced9e2b986cfdd087127d89d194ba3e706f176
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/m4/m4-1.4.17.ebuild b/sys-devel/m4/m4-1.4.17.ebuild
deleted file mode 100644
index 631fdde89ffc..000000000000
--- a/sys-devel/m4/m4-1.4.17.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="GNU macro processor"
-HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-# remember: cannot dep on autoconf since it needs us
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-posix_spawn.patch #580688, 581086
-
-	# Disable gnulib build test that has no impact on the source.
-	# Re-enable w/next version bump (and gnulib is updated). #554728
-	[[ ${PV} != "1.4.17" ]] && die "re-enable test #554728"
-	echo 'exit 0' > tests/test-update-copyright.sh || die
-}
-
-src_configure() {
-	# Disable automagic dependency over libsigsegv; see bug #278026
-	export ac_cv_libsigsegv=no
-
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-	econf --enable-changeword ${myconf}
-}
-
-src_test() {
-	[[ -d /none ]] && die "m4 tests will fail with /none/" #244396
-	emake check
-}
-
-src_install() {
-	default
-	# autoconf-2.60 for instance, first checks gm4, then m4.  If we don't have
-	# gm4, it might find gm4 from outside the prefix on for instance Darwin
-	use prefix && dosym m4 /usr/bin/gm4
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-		rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
-	fi
-}
diff --git a/sys-devel/m4/m4-1.4.18-r1.ebuild b/sys-devel/m4/m4-1.4.18-r2.ebuild
index ac15d9604e10..e8f9585638d5 100644
--- a/sys-devel/m4/m4-1.4.18-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.18-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 DESCRIPTION="GNU macro processor"
 HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
@@ -13,22 +13,24 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
+BDEPEND="app-arch/xz-utils"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-darwin17-printf-n.patch
-	eapply "${FILESDIR}"/${P}-glibc228.patch #663924
-	default
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-darwin17-printf-n.patch
+	"${FILESDIR}"/${P}-glibc228.patch #663924
+)
 
 src_configure() {
-	# Disable automagic dependency over libsigsegv; see bug #278026
-	export ac_cv_libsigsegv=no
+	local -a myeconfargs=(
+		--enable-changeword
+
+		# Disable automagic dependency over libsigsegv; see bug #278026
+		ac_cv_libsigsegv=no
+	)
+
+	[[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g )
 
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-	econf --enable-changeword ${myconf}
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
@@ -42,8 +44,7 @@ src_install() {
 	# gm4, it might find gm4 from outside the prefix on for instance Darwin
 	use prefix && dosym m4 /usr/bin/gm4
 	if use examples ; then
-		docinto examples
-		dodoc -r examples/
+		dodoc -r examples
 		rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
 	fi
 }
diff --git a/sys-devel/slibtool/Manifest b/sys-devel/slibtool/Manifest
index b7171e62319f..cdc4d79b4789 100644
--- a/sys-devel/slibtool/Manifest
+++ b/sys-devel/slibtool/Manifest
@@ -1,6 +1,6 @@
-DIST slibtool-0.5.28.tar.xz 61124 BLAKE2B 86333684b6572a09fdc258146f245815a5febb9963311b241d2eb0df756fd05937e85d195af0a5e1eeaebb9051ad926b9330d76b18cfde6c7b1e3294c642af81 SHA512 bfd9a39a60203606286af53ba9acc8d06490691cec7edae5ab6978b8547029412881b9895e8e0470c4f70bc9c349fdc6918200aaac810df99cf628e5848c6563
 DIST slibtool-0.5.31.tar.xz 70008 BLAKE2B aa46b2bfe02e22dabb3dc56b2de9521ef8fd3b54774561bcccca15763c8ee88154a03bb6defd4f6b828eaadb040e66725d18b788aac0a4d0170ce02cb044e9eb SHA512 658ea3244c6d1e9bd389ea5c222c29df6ba7acc5d6f2ada7a94dd3ac29ffbb681f377d8887a99861ab2ab484a7d3551e020bac2b92bdb07ad0e9ee96facfc6bd
-EBUILD slibtool-0.5.28.ebuild 426 BLAKE2B c2dc699691870320b1f1368846b599277b101a7a6721ff9e0a2a3039b1ce9e6c25330ac2494a5e735be0b39bf6960d01339c0e6e2397c426bb5cb28501184116 SHA512 e81d7fe8ae95b6076000b45050a2490cef2f4c39e06b6374578cdbcd07b7259ce1cb9b7ac8fa1e21600f32219d9b4c665041f5984376f0fb54a7d599bee01616
-EBUILD slibtool-0.5.31.ebuild 481 BLAKE2B 8ada2b664076fc2570991c47357e05d6bb227151881cdee8a5593dc1e32a1ff9e42a86f2789087609070cc9afc346359c9daf9c86146fbf118787411c4ad0583 SHA512 d14e5365748e0b9da1ea2d643cd9e40afe2143fadd6cbdfa38654e2d591904d7190f6723e93806d5253a4bfb7b97840787bf2af221f971d3b03e8c46529f2cbc
-EBUILD slibtool-9999.ebuild 589 BLAKE2B 4bb8cd55849eac2d236bf10b7eb312f9dd4bb5a41125c1147cbee15c4bdc573b5837c7c9669f8ec133741e5d33a8ca1cb1cb8e22211652d66301aa389a4b4e26 SHA512 515fd7bde0127cf1cf86007b1f870adc878d0f4abb90d938ba985d83bfed5e9b224b79f4070b6f3c33ac91709eb127180ee74af6ec66c5676bdf12b3a0cdfd26
-MISC metadata.xml 395 BLAKE2B f7ac23e1fb55a5b516be9dffc7a8f724788f5c1458ecf5a4c49620d28bf333c01e481d1f5e2fef8835d93d572866093824228fd1aec245d21407f231497e5121 SHA512 2bbcaf964c80d261df34eba6d0680d2c73c4e97f0acdda2aeb563fa54a72b9d3b8e14d5172e85225937797b4c8e17219e6bdfe153526c7c9be6ef6d6e4adbe50
+DIST slibtool-0.5.32.tar.xz 72820 BLAKE2B 2098af643b9591d85a9fa2d34c4a0c06af664786acd15f26ebebe966d4fbac2085fa8525cdb28d7087bd59e16334f793bbb87ada7011572a8ac7ada0ca5ab770 SHA512 60c6bb8cd2e49d5a417b61c96b81fd25534bc9915d8b3db0078ae6469685591997a503fcabb0cf1b336f883e61c32892dc9d39d69b4041ef9d49d6cd52f760a5
+EBUILD slibtool-0.5.31.ebuild 590 BLAKE2B a1ee653cdf4f79f780ad71e4e07496229a5ab4d96a9dcfd8a9795576697ab0424b7d15060d7c845820e58dcfd133ace3958fdb71bb2cc9dda010afad030ee313 SHA512 57b9036b3ebf6963b449ad3d253af2d6b2f920404c3633209fd0cd86430180c6ac64c36838943339841f4813e8ed82f42a1f41f93eb65a21442fc278fbf48426
+EBUILD slibtool-0.5.32.ebuild 709 BLAKE2B 94604dbf9a5a8718cbce69e154fecff9f3645647440a5d511e4a6a556545622873aa01318c79beed5cacb8b826541e9d32080d53d9c4ca871ada80338002d6e8 SHA512 3c4cefaeb6a3f076a10fa5ee365e339b11dd786707aeef135153e03eebd67bf15fb94ed896eef2089c8818abad9c2af10b3f04a56a8b35d61964c486ea6af5a8
+EBUILD slibtool-9999.ebuild 709 BLAKE2B 94604dbf9a5a8718cbce69e154fecff9f3645647440a5d511e4a6a556545622873aa01318c79beed5cacb8b826541e9d32080d53d9c4ca871ada80338002d6e8 SHA512 3c4cefaeb6a3f076a10fa5ee365e339b11dd786707aeef135153e03eebd67bf15fb94ed896eef2089c8818abad9c2af10b3f04a56a8b35d61964c486ea6af5a8
+MISC metadata.xml 607 BLAKE2B 6c240213f79eb90907b92ebc7539fd76ab8f6bddc78e01898ad39f7f0159d9ad34f5fa1516bd78a0f554cc026d6918a9efe17c9f78f523a6175b4ff9346cac09 SHA512 24fa899cf7c7d197c04eb7408c9b8803bee662290f153e090b6d69f9cb9571c2817d5895dd2fc2e002b0529484943869689f513aa582e5f2b601696aa0a1b17f
diff --git a/sys-devel/slibtool/metadata.xml b/sys-devel/slibtool/metadata.xml
index c4ec2df2b130..d104f4e708fd 100644
--- a/sys-devel/slibtool/metadata.xml
+++ b/sys-devel/slibtool/metadata.xml
@@ -5,6 +5,14 @@
 		<email>felix.janda@posteo.de</email>
 		<name>Felix Janda</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/sys-devel/slibtool/slibtool-0.5.28.ebuild b/sys-devel/slibtool/slibtool-0.5.28.ebuild
deleted file mode 100644
index ceab475d61cf..000000000000
--- a/sys-devel/slibtool/slibtool-0.5.28.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A skinny libtool implementation, written in C"
-HOMEPAGE="https://git.midipix.org/cgit.cgi/slibtool"
-SRC_URI="https://git.midipix.org/cgit.cgi/${PN}/snapshot/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-
-src_configure() {
-	./configure --host=${CHOST} --prefix="${EPREFIX}"/usr || die
-}
diff --git a/sys-devel/slibtool/slibtool-0.5.31.ebuild b/sys-devel/slibtool/slibtool-0.5.31.ebuild
index d446adc69292..8e04399c378f 100644
--- a/sys-devel/slibtool/slibtool-0.5.31.ebuild
+++ b/sys-devel/slibtool/slibtool-0.5.31.ebuild
@@ -1,17 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
+# git.foss21.org is the official repository per upstream
 DESCRIPTION="A skinny libtool implementation, written in C"
-HOMEPAGE="https://git.midipix.org/cgit.cgi/slibtool"
-SRC_URI="https://git.midipix.org/cgit.cgi/${PN}/snapshot/${P}.tar.xz"
+HOMEPAGE="https://git.foss21.org/slibtool"
+SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc"
 
 src_configure() {
 	# custom configure script (not generated by autoconf)
-	./configure --host=${CHOST} --prefix="${EPREFIX}"/usr || die
+	./configure \
+		--compiler=$(tc-getCC) \
+		--host=${CHOST} \
+		--prefix="${EPREFIX}"/usr \
+			|| die
 }
diff --git a/sys-devel/slibtool/slibtool-0.5.32.ebuild b/sys-devel/slibtool/slibtool-0.5.32.ebuild
new file mode 100644
index 000000000000..dcfe54216da2
--- /dev/null
+++ b/sys-devel/slibtool/slibtool-0.5.32.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+# git.foss21.org is the official repository per upstream
+DESCRIPTION="A skinny libtool implementation, written in C"
+HOMEPAGE="https://git.foss21.org/slibtool"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.foss21.org/slibtool"
+else
+	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x64-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	# Custom configure script (not generated by autoconf)
+	./configure \
+		--compiler=$(tc-getCC) \
+		--host=${CHOST} \
+		--prefix="${EPREFIX}"/usr \
+			|| die
+}
diff --git a/sys-devel/slibtool/slibtool-9999.ebuild b/sys-devel/slibtool/slibtool-9999.ebuild
index b0b74aa5e382..dcfe54216da2 100644
--- a/sys-devel/slibtool/slibtool-9999.ebuild
+++ b/sys-devel/slibtool/slibtool-9999.ebuild
@@ -3,19 +3,27 @@
 
 EAPI=7
 
+inherit toolchain-funcs
+
+# git.foss21.org is the official repository per upstream
 DESCRIPTION="A skinny libtool implementation, written in C"
-HOMEPAGE="https://git.midipix.org/cgit.cgi/slibtool"
+HOMEPAGE="https://git.foss21.org/slibtool"
 if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.midipix.org/slibtool"
+	EGIT_REPO_URI="https://git.foss21.org/slibtool"
 else
-	SRC_URI="https://git.midipix.org/cgit.cgi/${PN}/snapshot/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x64-macos"
 fi
+
 LICENSE="MIT"
 SLOT="0"
 
 src_configure() {
-	# custom configure script (not generated by autoconf)
-	./configure --host=${CHOST} --prefix="${EPREFIX}"/usr || die
+	# Custom configure script (not generated by autoconf)
+	./configure \
+		--compiler=$(tc-getCC) \
+		--host=${CHOST} \
+		--prefix="${EPREFIX}"/usr \
+			|| die
 }