gentoo resync : 11.05.2021

31 files changed, 488 insertions, 501 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index cfa4d210e99a..5618d61869c1 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index e1b802ec5674..118797c31d54 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,6 +1,6 @@
 DIST binutils-config-5.3.2.tar.xz 6840 BLAKE2B 4f02b8d1f3f8d4adca811772edba6167fc0e739f8ff1e895f30745eca45b559da6622bb76a0cac6016d6e864fe7ad6c921c64c7ec1c18c130b3a64a1dd7b9cbc SHA512 03dfecf46fee941b7b9fc35b63ffd22c795ab54f0444f16fc00ed44d27c81f6baaca33170fb700cfc4d767be469f305890882839536363bc466ad200d28d2228
 DIST binutils-config-5.4.tar.xz 7332 BLAKE2B 1dd0fdebf028e9d95caa395948037d51ac1e627f370921b56fc99a6fe2e2100ddb202c8027ad1e67330306de8b4cbc6a03753105d401198e515b22fca94f760f SHA512 79411afcbec3a6cce960be1b06e4a6efdf55081992f6a92157737f7ef41fc61eaec0005078a4ce0cd78ad6af14583ab85f4f2b7b43808238088d521e1aa31af1
 EBUILD binutils-config-5.3.2.ebuild 1104 BLAKE2B e4a56ca3a2c5d89e56114dc1e9dfd5087f3075dded3a773bc47726312dfe34f9664f81954ab818f1cb97d891ea235baf6272e08274497f08586f692d9eb79483 SHA512 fed4e014fcdc459c57437c37940f850cb14718ac6611e2f8c12c2d64e8741f64d3b1f8c828d88c443c452377096311d0bfa0b1ce314c3915e1aeb1ea2cae0b65
-EBUILD binutils-config-5.4.ebuild 1107 BLAKE2B c33bd289b2dfffff7fc8ad59bcc7fd3e6df41a2bed427a9054630976079f543dfe486626d890746dc2ef7fa13f1a4d8c73ca52a86ff57854472cdc86d9313bb6 SHA512 09a242ddcd3f8284fa019b0f2ef0ea60815560c4aafe617370c89d3fe1862cca8f7627f773a333ca1c869557cfb72d4b6b538dcf9a991c4e7a27fc6e70f9feda
+EBUILD binutils-config-5.4.ebuild 1104 BLAKE2B e4a56ca3a2c5d89e56114dc1e9dfd5087f3075dded3a773bc47726312dfe34f9664f81954ab818f1cb97d891ea235baf6272e08274497f08586f692d9eb79483 SHA512 fed4e014fcdc459c57437c37940f850cb14718ac6611e2f8c12c2d64e8741f64d3b1f8c828d88c443c452377096311d0bfa0b1ce314c3915e1aeb1ea2cae0b65
 EBUILD binutils-config-9999.ebuild 1112 BLAKE2B 9cfdc08cc6f249c0fed771bdcb490e6a62e41ccfba929a0cc5f29d9d7c3f31365570896652046e5ada30e70ea43b839db886d8fd508fcc5d77a1b47088fbfb25 SHA512 38f079f8df403624be980dd71f6f218411081a48f74f502f6392dd602eb151413d5db1650e070f744eacb59a0ea936b1688628f56d5af44ceca8f81b78a97c7e
 MISC metadata.xml 416 BLAKE2B 5ea7d7b0b0ca3767c8393d3ff5c7c51d190503d6dfea9f2146b7f8bdf1f6a91237e918e6b6b178d07a3de8affc936fbde215825ec33c5b334d67d36f66c30566 SHA512 256a0c0ec2d57c3ba75a27e7a810ec70d06cecdefc20f2f58cfcbb1ddbd195c2115661c4960ab6316d88b6db21210416a4eb5855488ddd5918888365a3a9d00b
diff --git a/sys-devel/binutils-config/binutils-config-5.4.ebuild b/sys-devel/binutils-config/binutils-config-5.4.ebuild
index f30205121f8e..20b16e75f89f 100644
--- a/sys-devel/binutils-config/binutils-config-5.4.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.4.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 change the binutils version being used"
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index a0f0663c2b40..8a9337b90ccd 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -1,6 +1,3 @@
-AUX binutils-hppa64-2.35.1-cet.patch 2675 BLAKE2B b720e43514b25897a332648bfb15e16278f76606413991ce75c0233af27bbc434c36e85d36d4207339211382c0c5de5e9892f9e533e9d24b5257864939ac4874 SHA512 4fd4787c7ff2f7c2fed338ccc0f478b120d566959c0de5dde03cdcfdb37911bc22c5c11a124a000d84138a23c30ee3fa65c024eb72d1c924f926b04e079412a5
-AUX binutils-hppa64-2.36.1-bfd-ctf.patch 2861 BLAKE2B 18fe98e2352cfa7a63144f40df2ab6be925b4330bc7e4c0e65ee5d2911b9a5a9d5ddf3a118a7b2230c2b1d4d170b01b697ff66fcb5babc89815a7c628a008a73 SHA512 996b5e83efda52748c0f052fb32599c69c61674981c2f6a89cf5f148fa47b8932f763114ce69fd059600bb4ed2afa2d7757812cc7fc5f29a48215903e33c7f34
-AUX binutils-hppa64-2.36.1-ld-ctf.patch 1874 BLAKE2B 7bf0868b098e52dc58128507f6ea0cfa28c68de94ad5da3c4d62f7fed1119e34b7573a01333d216ed33931a3d9ab7c23be740277c1a47b24860762e6b7c04e29 SHA512 7e7a106bd8bc8f0f53a9d38368694f1cf56e66ca59c4bcac7ed233d751cb2f19acd8860cecf04ca39495610c766f94ff19598b4c83185051fad21313298fc864
 DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
 DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
diff --git a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.35.1-cet.patch b/sys-devel/binutils-hppa64/files/binutils-hppa64-2.35.1-cet.patch
deleted file mode 100644
index 7477ff90ac95..000000000000
--- a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.35.1-cet.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://bugs.gentoo.org/771765
-https://sourceware.org/PR27397
-
-On i586-like CPUs endbr32 added by -Wl,-z,ibt,-z,shstk
-generates crashing binaries and causes ./configure failure.
-
-From 847e4b3207f97762dc641db8d3b188081c3370c3 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Fri, 12 Feb 2021 16:30:23 -0800
-Subject: [PATCH] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
-
----
- config/cet.m4       | 19 ++++++++++++++++---
- libiberty/configure | 29 +++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+), 3 deletions(-)
-
-diff --git a/config/cet.m4 b/config/cet.m4
-index c67fb4f35b6..7718be1afe8 100644
---- a/config/cet.m4
-+++ b/config/cet.m4
-@@ -130,6 +130,18 @@ fi
- if test x$may_have_cet = xyes; then
-   if test x$cross_compiling = xno; then
-     AC_TRY_RUN([
-+int
-+main ()
-+{
-+  asm ("endbr32");
-+  return 0;
-+}
-+    ],
-+    [have_multi_byte_nop=yes],
-+    [have_multi_byte_nop=no])
-+    have_cet=no
-+    if test x$have_multi_byte_nop = xyes; then
-+      AC_TRY_RUN([
- static void
- foo (void)
- {
-@@ -155,9 +167,10 @@ main ()
-   bar ();
-   return 0;
- }
--    ],
--    [have_cet=no],
--    [have_cet=yes])
-+      ],
-+      [have_cet=no],
-+      [have_cet=yes])
-+    fi
-     if test x$enable_cet = xno -a x$have_cet = xyes; then
-       AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
-     fi
-diff --git a/libiberty/configure b/libiberty/configure
-index 160b8c9e8b1..29a690d44fc 100755
---- a/libiberty/configure
-+++ b/libiberty/configure
-@@ -5539,6 +5539,34 @@ else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+int
-+main ()
-+{
-+  asm ("endbr32");
-+  return 0;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  have_multi_byte_nop=yes
-+else
-+  have_multi_byte_nop=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+    have_cet=no
-+    if test x$have_multi_byte_nop = xyes; then
-+      if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "cannot run test program while cross compiling
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
- static void
- foo (void)
- {
-@@ -5575,6 +5603,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
-+    fi
-     if test x$enable_cet = xno -a x$have_cet = xyes; then
-       as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
-     fi
--- 
-2.29.2
-
diff --git a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-bfd-ctf.patch b/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-bfd-ctf.patch
deleted file mode 100644
index d7daf683669d..000000000000
--- a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-bfd-ctf.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=755ba58ebef02e1be9fc6770d00243ba6ed0223c
-https://bugs.gentoo.org/783777
-
-From 755ba58ebef02e1be9fc6770d00243ba6ed0223c Mon Sep 17 00:00:00 2001
-From: Nick Alcock <nick.alcock@oracle.com>
-Date: Thu, 18 Mar 2021 12:37:52 +0000
-Subject: [PATCH] Add install dependencies for ld -> bfd and libctf -> bfd
-
-This stops problems parallel-installing if a relink of libctf is needed.
-
-Also adds corresponding install-strip dependencies.
-
-ChangeLog
-2021-03-18  Nick Alcock  <nick.alcock@oracle.com>
-
-	PR libctf/27482
-	* Makefile.def: Add install-bfd dependencies for install-libctf and
-	install-ld, and install-strip-bfd dependencies for
-	install-strip-libctf and install-strip-ld; move the install-ld
-	dependency on install-libctf to join it.
-	* Makefile.in: Regenerated.
----
---- a/Makefile.def
-+++ b/Makefile.def
-@@ -448,7 +448,6 @@ dependencies = { module=all-binutils; on=all-intl; };
- dependencies = { module=all-binutils; on=all-gas; };
- dependencies = { module=all-binutils; on=all-libctf; };
- dependencies = { module=all-ld; on=all-libctf; };
--dependencies = { module=install-ld; on=install-libctf; };
- 
- // We put install-opcodes before install-binutils because the installed
- // binutils might be on PATH, and they might need the shared opcodes
-@@ -456,6 +455,14 @@ dependencies = { module=install-ld; on=install-libctf; };
- dependencies = { module=install-binutils; on=install-opcodes; };
- dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
- 
-+// Likewise for ld, libctf, and bfd.
-+dependencies = { module=install-libctf; on=install-bfd; };
-+dependencies = { module=install-ld; on=install-bfd; };
-+dependencies = { module=install-ld; on=install-libctf; };
-+dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
-+dependencies = { module=install-strip-ld; on=install-strip-bfd; };
-+dependencies = { module=install-strip-ld; on=install-strip-libctf; };
-+
- // libopcodes depends on libbfd
- dependencies = { module=install-opcodes; on=install-bfd; };
- dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52170,9 +52170,14 @@ all-stage3-ld: maybe-all-stage3-libctf
- all-stage4-ld: maybe-all-stage4-libctf
- all-stageprofile-ld: maybe-all-stageprofile-libctf
- all-stagefeedback-ld: maybe-all-stagefeedback-libctf
--install-ld: maybe-install-libctf
- install-binutils: maybe-install-opcodes
- install-strip-binutils: maybe-install-strip-opcodes
-+install-libctf: maybe-install-bfd
-+install-ld: maybe-install-bfd
-+install-ld: maybe-install-libctf
-+install-strip-libctf: maybe-install-strip-bfd
-+install-strip-ld: maybe-install-strip-bfd
-+install-strip-ld: maybe-install-strip-libctf
- install-opcodes: maybe-install-bfd
- install-strip-opcodes: maybe-install-strip-bfd
- configure-gas: maybe-configure-intl
--- 
-2.27.0
-
diff --git a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-ld-ctf.patch b/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-ld-ctf.patch
deleted file mode 100644
index 012df3aed812..000000000000
--- a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-ld-ctf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=f04ce15e831b691d7610dba284e266919e757b10
-https://bugs.gentoo.org/783777
-
-From f04ce15e831b691d7610dba284e266919e757b10 Mon Sep 17 00:00:00 2001
-From: Nick Alcock <nick.alcock@oracle.com>
-Date: Tue, 26 Jan 2021 16:05:17 +0000
-Subject: [PATCH] ld: depend on libctf
-
-Since ld may depend on libctf (if present), and libctf may be relinked
-by the installation process, libctf must be installed before ld is,
-or the relink may fail if it calls on symbols or symbol versions that do
-not exist in any libctf already present on the system.  (If none is
-present, the copy in the build tree will be automatically used, but
-if one *is* present, it may take precedence and break things.)
-
-(This is a maybe- dependency, so it will work even if libctf is
-disabled.)
-
-ChangeLog
-2021-01-26  Nick Alcock  <nick.alcock@oracle.com>
-
-	PR 27250
-	* Makefile.def: Add install-libctf dependency to install-ld.
-	* Makefile.in: Regenerated.
----
---- a/Makefile.def
-+++ b/Makefile.def
-@@ -448,6 +448,7 @@ dependencies = { module=all-binutils; on=all-intl; };
- dependencies = { module=all-binutils; on=all-gas; };
- dependencies = { module=all-binutils; on=all-libctf; };
- dependencies = { module=all-ld; on=all-libctf; };
-+dependencies = { module=install-ld; on=install-libctf; };
- 
- // We put install-opcodes before install-binutils because the installed
- // binutils might be on PATH, and they might need the shared opcodes
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52170,6 +52170,7 @@ all-stage3-ld: maybe-all-stage3-libctf
- all-stage4-ld: maybe-all-stage4-libctf
- all-stageprofile-ld: maybe-all-stageprofile-libctf
- all-stagefeedback-ld: maybe-all-stagefeedback-libctf
-+install-ld: maybe-install-libctf
- install-binutils: maybe-install-opcodes
- install-strip-binutils: maybe-install-strip-opcodes
- install-opcodes: maybe-install-bfd
--- 
-2.27.0
-
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index d7cd3b276a6e..efe78bdb2914 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -2,8 +2,6 @@ AUX binutils-2.29.1-nogoldtest.patch 730 BLAKE2B f4f5926511866e58566abc224d2bae1
 AUX binutils-2.32-gcc-10.patch 321 BLAKE2B a16a525ac14a2ebc5ec8a463370c6917a57835bd8c04599cb880193fc7c3a4569084e9eb206505357f9d73575fe380964fc404171dae7bb1ee53c157bad3e221 SHA512 dc3ef3da32ac58bb0678f49ba3e6c613653113d93dfc3af4541e1808ad92268c62003cae22e0059a8d5d8ba9e27282bca8d59ecca928d7a9f593454d795e54de
 AUX binutils-2.33-gcc-10.patch 815 BLAKE2B 84cf88e34afea70ea3728e2a78f0ba004e24934f57ff53d42694c3fe6f1afd6fb091b70ca114ff539ae6274699f0e3584decbf1355d1d1cd720bb4aca31bcb33 SHA512 8c0cd37738d2d172aadf1df875d028538d9edca35b681d7faa7dc3ab64e2c214d9c33862795a51c0cba9a61aaea9c5bbf5f9f9fb4a01762aa266f32c97eaafbd
 AUX binutils-2.35.1-cet.patch 2675 BLAKE2B b720e43514b25897a332648bfb15e16278f76606413991ce75c0233af27bbc434c36e85d36d4207339211382c0c5de5e9892f9e533e9d24b5257864939ac4874 SHA512 4fd4787c7ff2f7c2fed338ccc0f478b120d566959c0de5dde03cdcfdb37911bc22c5c11a124a000d84138a23c30ee3fa65c024eb72d1c924f926b04e079412a5
-AUX binutils-2.36.1-bfd-ctf.patch 2861 BLAKE2B 18fe98e2352cfa7a63144f40df2ab6be925b4330bc7e4c0e65ee5d2911b9a5a9d5ddf3a118a7b2230c2b1d4d170b01b697ff66fcb5babc89815a7c628a008a73 SHA512 996b5e83efda52748c0f052fb32599c69c61674981c2f6a89cf5f148fa47b8932f763114ce69fd059600bb4ed2afa2d7757812cc7fc5f29a48215903e33c7f34
-AUX binutils-2.36.1-ld-ctf.patch 1874 BLAKE2B 7bf0868b098e52dc58128507f6ea0cfa28c68de94ad5da3c4d62f7fed1119e34b7573a01333d216ed33931a3d9ab7c23be740277c1a47b24860762e6b7c04e29 SHA512 7e7a106bd8bc8f0f53a9d38368694f1cf56e66ca59c4bcac7ed233d751cb2f19acd8860cecf04ca39495610c766f94ff19598b4c83185051fad21313298fc864
 AUX binutils-configure-LANG.patch 2082 BLAKE2B 5db7ce0626dee8f3d84547eaccc5a2808bbb55657dd22c890782446fc9fe3e84683277d8da675067d9fd494d99dd292883174e133e440ce6a90d22a9f1aa9142 SHA512 1caf25d5e332d7de313b6be73e753fdde7b02235af564a9c06517f5874127998eeed731388617b75f54be6fec21835b78a54ce6c7162a33e25411fe3c78efee7
 DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
 DIST binutils-2.32-patches-3.tar.xz 151372 BLAKE2B 70d5f78d9f3e3bf9ff096b6f24babcc35c63395a5e1155a981a5ceb4b7a5706ad2ee0c77c74e910fc0eefeaed19763113186deb9665eed538dc3b8e227bef12d SHA512 5e91eff63332c2aca86a82a287ca4959a6098065ed88078265a3d79a2c851abd113e9736b75d8102a208996ed1191b0e23569921217ece975f1d9005a55afd0d
diff --git a/sys-devel/binutils/files/binutils-2.36.1-bfd-ctf.patch b/sys-devel/binutils/files/binutils-2.36.1-bfd-ctf.patch
deleted file mode 100644
index d7daf683669d..000000000000
--- a/sys-devel/binutils/files/binutils-2.36.1-bfd-ctf.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=755ba58ebef02e1be9fc6770d00243ba6ed0223c
-https://bugs.gentoo.org/783777
-
-From 755ba58ebef02e1be9fc6770d00243ba6ed0223c Mon Sep 17 00:00:00 2001
-From: Nick Alcock <nick.alcock@oracle.com>
-Date: Thu, 18 Mar 2021 12:37:52 +0000
-Subject: [PATCH] Add install dependencies for ld -> bfd and libctf -> bfd
-
-This stops problems parallel-installing if a relink of libctf is needed.
-
-Also adds corresponding install-strip dependencies.
-
-ChangeLog
-2021-03-18  Nick Alcock  <nick.alcock@oracle.com>
-
-	PR libctf/27482
-	* Makefile.def: Add install-bfd dependencies for install-libctf and
-	install-ld, and install-strip-bfd dependencies for
-	install-strip-libctf and install-strip-ld; move the install-ld
-	dependency on install-libctf to join it.
-	* Makefile.in: Regenerated.
----
---- a/Makefile.def
-+++ b/Makefile.def
-@@ -448,7 +448,6 @@ dependencies = { module=all-binutils; on=all-intl; };
- dependencies = { module=all-binutils; on=all-gas; };
- dependencies = { module=all-binutils; on=all-libctf; };
- dependencies = { module=all-ld; on=all-libctf; };
--dependencies = { module=install-ld; on=install-libctf; };
- 
- // We put install-opcodes before install-binutils because the installed
- // binutils might be on PATH, and they might need the shared opcodes
-@@ -456,6 +455,14 @@ dependencies = { module=install-ld; on=install-libctf; };
- dependencies = { module=install-binutils; on=install-opcodes; };
- dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
- 
-+// Likewise for ld, libctf, and bfd.
-+dependencies = { module=install-libctf; on=install-bfd; };
-+dependencies = { module=install-ld; on=install-bfd; };
-+dependencies = { module=install-ld; on=install-libctf; };
-+dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
-+dependencies = { module=install-strip-ld; on=install-strip-bfd; };
-+dependencies = { module=install-strip-ld; on=install-strip-libctf; };
-+
- // libopcodes depends on libbfd
- dependencies = { module=install-opcodes; on=install-bfd; };
- dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52170,9 +52170,14 @@ all-stage3-ld: maybe-all-stage3-libctf
- all-stage4-ld: maybe-all-stage4-libctf
- all-stageprofile-ld: maybe-all-stageprofile-libctf
- all-stagefeedback-ld: maybe-all-stagefeedback-libctf
--install-ld: maybe-install-libctf
- install-binutils: maybe-install-opcodes
- install-strip-binutils: maybe-install-strip-opcodes
-+install-libctf: maybe-install-bfd
-+install-ld: maybe-install-bfd
-+install-ld: maybe-install-libctf
-+install-strip-libctf: maybe-install-strip-bfd
-+install-strip-ld: maybe-install-strip-bfd
-+install-strip-ld: maybe-install-strip-libctf
- install-opcodes: maybe-install-bfd
- install-strip-opcodes: maybe-install-strip-bfd
- configure-gas: maybe-configure-intl
--- 
-2.27.0
-
diff --git a/sys-devel/binutils/files/binutils-2.36.1-ld-ctf.patch b/sys-devel/binutils/files/binutils-2.36.1-ld-ctf.patch
deleted file mode 100644
index 012df3aed812..000000000000
--- a/sys-devel/binutils/files/binutils-2.36.1-ld-ctf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=f04ce15e831b691d7610dba284e266919e757b10
-https://bugs.gentoo.org/783777
-
-From f04ce15e831b691d7610dba284e266919e757b10 Mon Sep 17 00:00:00 2001
-From: Nick Alcock <nick.alcock@oracle.com>
-Date: Tue, 26 Jan 2021 16:05:17 +0000
-Subject: [PATCH] ld: depend on libctf
-
-Since ld may depend on libctf (if present), and libctf may be relinked
-by the installation process, libctf must be installed before ld is,
-or the relink may fail if it calls on symbols or symbol versions that do
-not exist in any libctf already present on the system.  (If none is
-present, the copy in the build tree will be automatically used, but
-if one *is* present, it may take precedence and break things.)
-
-(This is a maybe- dependency, so it will work even if libctf is
-disabled.)
-
-ChangeLog
-2021-01-26  Nick Alcock  <nick.alcock@oracle.com>
-
-	PR 27250
-	* Makefile.def: Add install-libctf dependency to install-ld.
-	* Makefile.in: Regenerated.
----
---- a/Makefile.def
-+++ b/Makefile.def
-@@ -448,6 +448,7 @@ dependencies = { module=all-binutils; on=all-intl; };
- dependencies = { module=all-binutils; on=all-gas; };
- dependencies = { module=all-binutils; on=all-libctf; };
- dependencies = { module=all-ld; on=all-libctf; };
-+dependencies = { module=install-ld; on=install-libctf; };
- 
- // We put install-opcodes before install-binutils because the installed
- // binutils might be on PATH, and they might need the shared opcodes
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52170,6 +52170,7 @@ all-stage3-ld: maybe-all-stage3-libctf
- all-stage4-ld: maybe-all-stage4-libctf
- all-stageprofile-ld: maybe-all-stageprofile-libctf
- all-stagefeedback-ld: maybe-all-stagefeedback-libctf
-+install-ld: maybe-install-libctf
- install-binutils: maybe-install-opcodes
- install-strip-binutils: maybe-install-strip-opcodes
- install-opcodes: maybe-install-bfd
--- 
-2.27.0
-
diff --git a/sys-devel/elftoolchain/Manifest b/sys-devel/elftoolchain/Manifest
index 8d1eb3447f34..947f13092da4 100644
--- a/sys-devel/elftoolchain/Manifest
+++ b/sys-devel/elftoolchain/Manifest
@@ -1,4 +1,6 @@
 AUX elftoolchain-0.7.1-fno-common.patch 631 BLAKE2B 8808d37d9a0a92f224501d2e29ac05a19c836d65d0a5628da4c63f8324db126e86ba84d916869f21a01e8997512c4fa7578b68ce8e99f4eb9f4453b8e78ddf54 SHA512 3ae70a0c117dbb4531ff1e7449216dde63d7bc35412d308b295099c85634404ed577ffbb8392f39764a5a139fbb6ca790fd5bb27368c297d5e0b04e259b0b367
 DIST elftoolchain-0.7.1.tar.bz2 5361427 BLAKE2B f86204b3c89433948eaf2cd2edc57abf9b77bfab777dc2a840b7aa5fbddfd31665bd27f31d7af2dea09fab0118e201b12802b4da85f8210af29094661f6f1fe5 SHA512 8226c468b393f0d567167a9dd6b16d2a226227e4d05dab8f44550038da44dcbfb92749f8e1a4b130b893675337a6771e24a81f350f3f864b1b8b17402ed23b26
+DIST elftoolchain-0.7.1_p20210319.tar.gz 6767324 BLAKE2B c7e068577744fd42a44784e6a2b03ffdaa9dd15e41f4ff2a6d5fd80df24a61a950ff11fa63ebbbaf2c90bc1b19e58f7184a2b883a6f866adcbf0940ad9fca81c SHA512 968d3247e160dd6f90a88e69bf3cb8e6bf2b8216500a0a91699bc2b8d3de22db8f013212813139701e75c3a9eb852bb4c1360e8058f85959e0973e05e4851c8c
 EBUILD elftoolchain-0.7.1-r2.ebuild 1275 BLAKE2B 8a37ec62e7d09051d8a6b794c113dac64bc1986de6e897c4051c864dbf6d8b6ce6bb095dd82e7982afea08c634a26d3c5d912ad685b5dad180946c2ca8a0156f SHA512 40ed6cea81157836c11326fcb414019809feda1cd4b276332f358c1bfe996cdfdd7b4f7ad4b8749e440868a6f22b399bc5292ffad2e62e95dd08f78bcf827a0d
+EBUILD elftoolchain-0.7.1_p20210319.ebuild 1400 BLAKE2B dd0334ee7a4896766e3c53dc134daf6189856b02188ac76a61a74c1f9d4d6a88a52c780d8713c3aa0114df2bebc64402503141857a6aac22c896ff898232f179 SHA512 4f3e065afc8cc228ee05e959cd97d0d6c8add49263643118efbafd09508229628899cfd0b15c33ce8b1e60b55f6c1f4387442658ef4c64c8c2b33b0459243a87
 MISC metadata.xml 450 BLAKE2B b2e66c3665e4d1d24e8a4887114e5b5d2306a996a56660c7f40846550383588aea10c667b6e055c32dd22b756d8b2a81afbb0512919b273ef15bcf28b0a9c2c0 SHA512 8306332a971bd86d79ee9c3e3d1415ac15a40d015aa9db631b57e4afd125641f5106b8a06bc1c22b0d1aa128dc01ba390b94abaed780e8d92d3a43833fd79f40
diff --git a/sys-devel/elftoolchain/elftoolchain-0.7.1_p20210319.ebuild b/sys-devel/elftoolchain/elftoolchain-0.7.1_p20210319.ebuild
new file mode 100644
index 000000000000..5c427a1e2119
--- /dev/null
+++ b/sys-devel/elftoolchain/elftoolchain-0.7.1_p20210319.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_COMMIT="58584bb3e5276586e1cb246641525f72843ebc08"
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (BSD drop in replacement for libelf)"
+HOMEPAGE="https://wiki.freebsd.org/LibElf"
+SRC_URI="https://github.com/elftoolchain/elftoolchain/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/libarchive:=
+	dev-libs/uthash
+	!dev-libs/elfutils
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-vcs/subversion
+	sys-apps/lsb-release
+	>=sys-devel/bmake-20210314-r1
+	virtual/yacc"
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' -i libelf/os.Linux.mk || die
+
+	# use system uthash
+	rm common/{utarray,uthash}.h || die
+
+	# needs unpackaged TET tools
+	rm -r test || die
+}
+
+src_configure() {
+	# -pg is used and the two are incompatible
+	filter-flags -fomit-frame-pointer
+	tc-export AR CC LD RANLIB
+	export MAKESYSPATH="${BROOT}"/usr/share/mk/bmake
+}
+
+src_compile() {
+	bmake || die
+}
+
+src_install() {
+	bmake \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin/${CHOST}-elftoolchain \
+		LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		install || die
+
+	# remove static libraries
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index f2787e6a361b..84ba832b7f6c 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -1,22 +1,13 @@
 AUX 4.1.0/gcc-4.1.0-cross-compile.patch 1134 BLAKE2B 945e234afcbbf2b5d737d7a4b9fb9282070ece739e1e487723baf9aa4e7c0777ec7b43cdd4957c89b9fc42c15eb2aff0564b370dd6b3e1a3849bf32680c69bd1 SHA512 84d0ab9bcfdd18148392a7219ec0ad4a1e63d43bda3f45a13e22f551f2f119822fed700570bd659f9260b09b0958d4c49e339ad4f135740e5b60e46462de7f20
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
-DIST gcc-10.2.0-patches-1.tar.bz2 14865 BLAKE2B 055ceac96a308081f395f12a970d6f5264d5dfac6defabb6baefafd6d584c03f2f968e0720448af5b6955e209c5d2220bc45854088347d7b438de9d716072804 SHA512 3583f51b2b80e1dab5ebda174c83054375a0c6601c6fca54a6991bbbbe5f335e30ee846fae57c0096ce28b23715fbfee8b560727c77cac263e83f44f03c6eda4
-DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
 DIST gcc-10.3.0-patches-1.tar.bz2 15282 BLAKE2B ef283e8b108af9bfd3324fabb95c835374113c6ff2cf1430a5568b3d1b27183e6de6751367c1e5720c85ac4c45132848888d5510c63f95e88a1f623b6bcf4000 SHA512 6dc435c8619a1532000fae843b9964d0d1e28d3cc9cc1962ab7391570a0cf1135424ea5c0b0d3d5ec5ea863f02e963be2ec4c94822f217fc692a1d808325404e
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
 DIST gcc-11.1.0-patches-1.tar.bz2 12130 BLAKE2B 4d763b83dba7875bbbe8bbb9b6c392791ba97037d17347548604ffa7c70b32fdafcd45b0722ae40aa3aa8cbb34b9f3e3aa399d0096e35e74f75b174aad0c032e SHA512 e4e363c6a81bbc423ec36b6c57801ea2a70961ee7d7d0333924c7012b2b6fd4008f53e9208b5d1f6025f9e74a95d46c121b4b8909827070b46091228688996a4
 DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
-DIST gcc-8.3.0-patches-1.0.tar.bz2 12278 BLAKE2B 793465c5de0af850c7f3017b3011e68f3bd1664e6ce3500a3dc3003d37c03fe81857698957770a135eadd395a7767fa804d354ecdcdeb1d83623280ca569d4ec SHA512 0efadd2481713992807fed2683666f1094b3757674754601c079569f3ef70cd7aed3cefc9f815f4e59a21d37e4e940c122df714e16f3878a5f966450c4273669
-DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
-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.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110
 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
-EBUILD kgcc64-10.2.0.ebuild 978 BLAKE2B 75121733c67b2e4a0d81e9617fee0df121608a26523e2febc6b1629d25db3cb42123ea785d9598c6522561b309345fcc939207dc2fb8c07d925d57bc0a53ecb9 SHA512 2248d8c7fc7905ac60fb542416a03d13106135f51244b303b43bcdb8577bf65fca8c50347ad64d2db0b5e5b580e44e68e9c2c7e73adc4f8c40ecdda5c931b8d2
 EBUILD kgcc64-10.3.0.ebuild 978 BLAKE2B 75121733c67b2e4a0d81e9617fee0df121608a26523e2febc6b1629d25db3cb42123ea785d9598c6522561b309345fcc939207dc2fb8c07d925d57bc0a53ecb9 SHA512 2248d8c7fc7905ac60fb542416a03d13106135f51244b303b43bcdb8577bf65fca8c50347ad64d2db0b5e5b580e44e68e9c2c7e73adc4f8c40ecdda5c931b8d2
 EBUILD kgcc64-11.1.0.ebuild 978 BLAKE2B 75121733c67b2e4a0d81e9617fee0df121608a26523e2febc6b1629d25db3cb42123ea785d9598c6522561b309345fcc939207dc2fb8c07d925d57bc0a53ecb9 SHA512 2248d8c7fc7905ac60fb542416a03d13106135f51244b303b43bcdb8577bf65fca8c50347ad64d2db0b5e5b580e44e68e9c2c7e73adc4f8c40ecdda5c931b8d2
-EBUILD kgcc64-8.3.0.ebuild 1144 BLAKE2B b2cecd0f99670b35f692fdf4a46fdd5837eccdffa17a6d2b1452b3ef063e02bd114393a9a6a8f9c48bdc3ac9faf7caab6820e35f0a70afbbe547a5ddbe2a78d2 SHA512 0d34d6df03605d040d06495f94faeec558429223ca0cfa2174cd1a2002449db5c7298b40bfd0e864dc35132b5ca9e573b413a9749773b6ead00b47cb4b3b0885
-EBUILD kgcc64-8.4.0.ebuild 978 BLAKE2B 388f3c95bdc4bdaab926df6b9870b7304f7d6eff852be1bc26d8a9d787c2a7fb1d846a17d396edef6014d57cfebab3880fbf13fe47e0dba8cbd7fbc1b99d5b03 SHA512 0fed1c806d3cfa3dce689304a223481b367552e02e75b7ddaf16a71b6e141405048c395c74a50856db3b325f61f0a31b2d0a65242ad054afbd77734e178e5f3b
 EBUILD kgcc64-9.3.0-r2.ebuild 977 BLAKE2B 2e96cd95ee42508f3b2889fdf679233523897c1800c8a64eaccb1bf2fe9a600d585b78d9f1b4dd225a083923e1f90f208e6eff82475ce2a0da3ef792be5a9d18 SHA512 ff5328502339d065bf38686cd77506e654819331d4c59eb84e8d46d0d9c0a1abd2c024b9e2e908da1552931b21cc04dbce8ea9fc1d1ba0de5e6d1a5573ac378c
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/sys-devel/kgcc64/kgcc64-10.2.0.ebuild b/sys-devel/kgcc64/kgcc64-10.2.0.ebuild
deleted file mode 100644
index c8abbd9325b8..000000000000
--- a/sys-devel/kgcc64/kgcc64-10.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1"
-inherit toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-8.3.0.ebuild b/sys-devel/kgcc64/kgcc64-8.3.0.ebuild
deleted file mode 100644
index c352f6a87f46..000000000000
--- a/sys-devel/kgcc64/kgcc64-8.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="1.0"
-inherit toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="hppa"
-
-RDEPEND=">=dev-libs/gmp-4.3.2
-	>=dev-libs/mpfr-2.4.2
-	>=dev-libs/mpc-0.8.1
-	>=sys-devel/gcc-config-1.4"
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="${RDEPEND}
-	hppa? ( sys-devel/binutils-hppa64 )
-	>=sys-apps/texinfo-4.8
-	>=sys-devel/bison-1.875"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/kgcc64/kgcc64-8.4.0.ebuild b/sys-devel/kgcc64/kgcc64-8.4.0.ebuild
deleted file mode 100644
index db4031768182..000000000000
--- a/sys-devel/kgcc64/kgcc64-8.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-case ${CHOST} in
-	hppa*)    CTARGET=hppa64-${CHOST#*-};;
-	mips*)    CTARGET=${CHOST/mips/mips64};;
-	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
-	s390*)    CTARGET=${CHOST/s390/s390x};;
-	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
-	i?86*)    CTARGET=x86_64-${CHOST#*-};;
-esac
-export CTARGET
-TOOLCHAIN_ALLOWED_LANGS="c"
-GCC_TARGET_NO_MULTILIB=true
-
-PATCH_VER="2"
-inherit toolchain
-
-DESCRIPTION="64bit kernel compiler"
-
-# Works on hppa and mips; all other archs, refer to bug #228115
-KEYWORDS="~hppa"
-
-# unlike every other target, hppa has not unified the 32/64 bit
-# ports in binutils yet
-DEPEND="hppa? ( sys-devel/binutils-hppa64 )"
-
-pkg_postinst() {
-	toolchain_pkg_postinst
-
-	cd "${ROOT}"/usr/bin
-	local x
-	for x in gcc cpp ; do
-		cat <<-EOF >${CTARGET%%-*}-linux-${x}
-		#!/bin/sh
-		exec ${CTARGET}-${x} "\$@"
-		EOF
-		chmod a+rx ${CTARGET%%-*}-linux-${x}
-	done
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 1c043e6eb48f..2d39b62423ff 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -3,13 +3,13 @@ DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
-EBUILD lld-10.0.1-r1.ebuild 1182 BLAKE2B c40b16dba3b8905a9f38b6fb367595b21f051cce65c4d118963e3700d009adf0f3e3d58bf9456d3a9b6a91e805c3f309af5f9ceb79341693dca89852d62e6cbb SHA512 c81987067b33c69392434de16349a9dcdeb7344dabc01bf1146dc6033acb4561ff575b52a62aa43b30e99461998d29af0c6060f90cf6e3e8667cb1e9721033af
+EBUILD lld-10.0.1-r1.ebuild 1181 BLAKE2B 448fad363e7cf9ff129b0c4ca5b1910825ad7c3d815306ee3d0465edd96b375304df111b5eee0339f2dd2adfabaf7102d4d730ba3be51b1bce43623b5072d43a SHA512 bfe853ce71afadc57f9d5dd5445a454d8c3ff70e07ae833a307bd1d12ca10e2d237a5894d651390da0a8da7c84984748660ecd12a998becf30df5a87d3b3aab7
 EBUILD lld-10.0.1.ebuild 1327 BLAKE2B c1933a141d5460f94cee3bdeac644760aec6d8e5906e3202e54a7a9da441a57d2de33b77d906dea4dcf6d7bac0bef97edd29c0a8d756093e9b56f81fbec07e01 SHA512 5901b7d0f5b2d07234d3287ab003e68b032a42e0887ab0d76fdd7a7af12feaea97a3ce07f06f3f1c428f7b5b4fa7f98daddf0909c8e3c0bf7ab2adc75363ed95
-EBUILD lld-11.0.0-r1.ebuild 1251 BLAKE2B e8329bd8da12f281a80b7fee4c482f32c2b0e0c440ffb956394ff9a77eb226187a16df4e7b53a4a6b9f1c64c67b63cafa7a2501c93ca8ae30b0ab06a09a6f4fb SHA512 9a1cda08268ac9971b06c6e36ffbe752f9571c3c62ffee058bfcd14ca16b1ffeb9c6f9125e0b2b698caa0d812ffd9e0f1fe06689e3ee8b416e5efd18dd219d3c
+EBUILD lld-11.0.0-r1.ebuild 1250 BLAKE2B 3959247f58d1f2e4fce666ccbd6bc962d4273a81b2164febb3f92c2a849e1388bf1f349c75b6677082811a9e57c3238794a46c366cf2b4a1f4c74938bc9ab98a SHA512 f581a468fdc4ebebf90e54cf87c39228e77e8f692c73e0b96a7a5dc3f1edeb8ebac5e13072fe44cc550b48b4998384e16d88579796de346fb956fd4e96930630
 EBUILD lld-11.0.0.ebuild 1396 BLAKE2B 07a3d3579893dedf289ca83285ee2525eb8c9f540cc0d56ce364196ecf283fb08de909e03bea512ecd87f485ff56e330d349fc67564ff286b27c43a2cb9c5973 SHA512 015524e207b25ecd6e9b9e5c51ea218aeee0bb88ca86e09c6ad8743dd2841d32234ae7faac908456e0b75e4c6da72837363e76f781cfb2cb337b5ac7e04f079b
-EBUILD lld-11.0.1-r1.ebuild 1254 BLAKE2B e5c14cfb974e92b292be3d04b5b3981fb17040c050bbfcf92094bb3bfd3ec15a750f3660dfc8c33fb087eb46aa78021e1c05054c203b82c1d606c8e647671295 SHA512 0a7a22b0d0b359485828ed4dda77de475ab4f2a8145d41c2fc26ecf4da07354d638328afb87242804275cec39b84c190f9f5a8dd9254ee10d82baf82e1221957
+EBUILD lld-11.0.1-r1.ebuild 1253 BLAKE2B 90aa72d32f1cf34432f6e87478f8fc3cc58b03326563a91d242a6dca62577a5d224822f2f1a4d64d1f49100cfc413468331bfc5f452e2a2843bf419786da30ab SHA512 c8f711f9c1079ab108d0a92df7236f884797c6061e9454ccec223c31b6f6bef3c107544955ac67284359596510154a52f49086c6ca81ee32964a765837103c57
 EBUILD lld-11.0.1.ebuild 1400 BLAKE2B 3ff6e59f2cb59db760e54af910f564c1d2d2086fd94b04982c0e918cee159b9fdfb7d8b9b3a63a500f04e715f0b505462b3ec2110dea2cb5fb3c466f506791b3 SHA512 cba352b000bec766f499e6df1063b86b9f8d5d4c6c763e1a03ff31abfa179d89ea98248a84b3e3c4769d3a61150e1ed281e9c4c1b18235cf831e55e03f4163e2
-EBUILD lld-11.1.0-r1.ebuild 1254 BLAKE2B e5c14cfb974e92b292be3d04b5b3981fb17040c050bbfcf92094bb3bfd3ec15a750f3660dfc8c33fb087eb46aa78021e1c05054c203b82c1d606c8e647671295 SHA512 0a7a22b0d0b359485828ed4dda77de475ab4f2a8145d41c2fc26ecf4da07354d638328afb87242804275cec39b84c190f9f5a8dd9254ee10d82baf82e1221957
+EBUILD lld-11.1.0-r1.ebuild 1253 BLAKE2B 90aa72d32f1cf34432f6e87478f8fc3cc58b03326563a91d242a6dca62577a5d224822f2f1a4d64d1f49100cfc413468331bfc5f452e2a2843bf419786da30ab SHA512 c8f711f9c1079ab108d0a92df7236f884797c6061e9454ccec223c31b6f6bef3c107544955ac67284359596510154a52f49086c6ca81ee32964a765837103c57
 EBUILD lld-11.1.0.ebuild 1400 BLAKE2B 3ff6e59f2cb59db760e54af910f564c1d2d2086fd94b04982c0e918cee159b9fdfb7d8b9b3a63a500f04e715f0b505462b3ec2110dea2cb5fb3c466f506791b3 SHA512 cba352b000bec766f499e6df1063b86b9f8d5d4c6c763e1a03ff31abfa179d89ea98248a84b3e3c4769d3a61150e1ed281e9c4c1b18235cf831e55e03f4163e2
 EBUILD lld-12.0.0.9999.ebuild 1628 BLAKE2B 0287a5e68645f48b08189ef850705bb3e161f42a384efad389ed7915f575f60e850c73087a4833257683e34d9acf2b4c7e930c02ef0cc34a6a1591454927cd2c SHA512 006e8a213d2517483a8c719c6634dcf1fe21281159737b40c4f50a2da51a730fe37e44b4d3b3f4fec0cff8c2055b57f49e94666180c7fd61046e8b60784d0e24
 EBUILD lld-12.0.0.ebuild 1665 BLAKE2B 126f62c4638e0a4cbe759fb0e65f790f2707029068e2294b329c832d1cb13767b002d704b2fe4e90c99a18a0885213b658b32d6b73d63f265694cb196450b15a SHA512 628c631ee7371520a630d72726e1878f964bcb564154d01989e2e8ce8f5d401fd37a0e3576363f40f27cbe3a101ba5a93f7b50ce89c74174549df85bfffd0eb6
diff --git a/sys-devel/lld/lld-10.0.1-r1.ebuild b/sys-devel/lld/lld-10.0.1-r1.ebuild
index 78f07434b1bd..be23be6149cc 100644
--- a/sys-devel/lld/lld-10.0.1-r1.ebuild
+++ b/sys-devel/lld/lld-10.0.1-r1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-11.0.0-r1.ebuild b/sys-devel/lld/lld-11.0.0-r1.ebuild
index 7a05fc47a2a6..2adb783d40d2 100644
--- a/sys-devel/lld/lld-11.0.0-r1.ebuild
+++ b/sys-devel/lld/lld-11.0.0-r1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-11.0.1-r1.ebuild b/sys-devel/lld/lld-11.0.1-r1.ebuild
index 32c44de6a55b..4c6c81585d37 100644
--- a/sys-devel/lld/lld-11.0.1-r1.ebuild
+++ b/sys-devel/lld/lld-11.0.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-11.1.0-r1.ebuild b/sys-devel/lld/lld-11.1.0-r1.ebuild
index 32c44de6a55b..4c6c81585d37 100644
--- a/sys-devel/lld/lld-11.1.0-r1.ebuild
+++ b/sys-devel/lld/lld-11.1.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index c42bfd540262..7d7168116b71 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,5 +1,7 @@
 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.18.tar.xz 1207688 BLAKE2B debfaa4d25af6f583e2cd703e77b73775790f48f34e878eddd820c6b244a065c69495473ce5067be1f20ca07b2d6af9f90cffd33e12c18fd719c0d234eb5462a SHA512 06f583efc3855cd8477d8347544f4ae5153a3e50aea74d21968afa7214784ea3ddfc02d0a2b11324120d76a19f2e804d20de11a456b5da929eb6ae469519b174
+DIST m4-1.4.18b.tar.xz 1541748 BLAKE2B f5d87a58bc8313fd3cb8f28f7e9a6f885d8a4ae2514f2ec16e56fceaf4b147b9812cca16be56b306a385a843aade08bad521ee739e7222157da8ff14567639bb SHA512 febdc35fb41b0277825aaa6d27bd8dcd0cbd4ae5e891d4867b5f142e51ed90663e2fd9ac75312453e3e647a274902cca907d67f514b84ee78cdebe2880156360
 EBUILD m4-1.4.18-r2.ebuild 1332 BLAKE2B e436ea04a282b05aa213f92822f619520c280910a676aa3bffdc313e1c3c8bd648f6aa71e326bd50876714dbe51ab088961277f213d45972355906987c681666 SHA512 6ae904bce3461eba20d7c42e49f83b0a6ec6f0f48f32ceae61dc9dd590299158f332298becdf5391aa4dcf7f74db8eda37a053cae584c9fb00a2d901e5d31a7f
+EBUILD m4-1.4.19_beta1.ebuild 1443 BLAKE2B b4a3eff220980b52919ec0a914e09b272c54f9c4ed7c93f57a3d22ee66da326de90ead2e7506d1950af734a1b851cdfb746e54597ddef69f5343df5a19e32a14 SHA512 86a56b46c854ad46c74030fc4789ff06e9d0e86f7f572f402888ab22b4289ef61106efc928d8e5b7ee4b6e0cf4b3d8ca1563c34b7565bd01b434a4384e9cb1d1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/m4/m4-1.4.19_beta1.ebuild b/sys-devel/m4/m4-1.4.19_beta1.ebuild
new file mode 100644
index 000000000000..cf3d10dfd14a
--- /dev/null
+++ b/sys-devel/m4/m4-1.4.19_beta1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-1.4.18b"
+
+DESCRIPTION="GNU macro processor"
+HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
+if [[ "${PV}" == *_beta* ]] ; then
+	#SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+else
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="examples"
+
+# remember: cannot dep on autoconf since it needs us
+BDEPEND="app-arch/xz-utils"
+
+src_configure() {
+	local -a myeconfargs=(
+		--enable-changeword
+
+		# Disable automagic dependency over libsigsegv; see bug #278026
+		ac_cv_libsigsegv=no
+	)
+
+	[[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g )
+
+	econf "${myeconfargs[@]}"
+}
+
+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
+		dodoc -r examples
+		rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
+	fi
+}
diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest
index e872845ddf17..07fead4d6651 100644
--- a/sys-devel/remake/Manifest
+++ b/sys-devel/remake/Manifest
@@ -1,5 +1,8 @@
 AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4
 AUX remake-4.2.1.1.4-fno-common.patch 3096 BLAKE2B ca1fb0cd2382d1507239135f0aa2fe4c0d02414abd5c008a89ddae68d65589a8fc7244acfb7cf4881b3a44754208fbf05e54c8da2bc7317213b4bfa6ea4d4cfe SHA512 0d0751958e466bb2c40bff5b58d08a105e8b9c6884c02c05d93309f6014371f4ab0e2a3c38dd10cd73ecb3143076828d770031ea6c9aee63f945c15aa85774f3
+AUX remake-4.3.1.1.5-fno-common.patch 2988 BLAKE2B c9d6a4adef35cc51a82b5e625771bede0a13cbca4dfe40483497a9a2bfa6ac0f66c47023ec2d75075cd7c7abde7ccf1bb5eba315bad052ab3d7ac6c263c6ac09 SHA512 509096e2cfa1daefc1a7fd9b69355f21c6fcaf2adf4572bd6742ebb61b5d7ac65c0d8bbc0576c6bb2b3e895bac97d51f1da3008ae15b50e487aa09fe118d8b7a
 DIST remake-4.2.1+dbg-1.4.tar.bz2 1508613 BLAKE2B f83bf8b1154d87d3c729b51797011511c6d9a249dffd212a551602a2af1c874d50d631d0f0e3f00d1b4484db758b7d167c416b0be185ad2a16897a077d04e9f4 SHA512 ffb7d641e0bc99794c17f634fe0aa5bf909c1e1c8eb14873dd27f2950d913db393c3532c34f417307eba351e8732c366131a23e661f5fec9529edc5d778da0d1
+DIST remake-4.3+dbg-1.5.tar.gz 2546056 BLAKE2B c5c1b254d0533e0d9787d408f79e8aba93cab5185de76519dabef7ddca5c9d2021671099f9ff80df345732552f859ce31d1131b89cd56fb185bae4cee676b412 SHA512 90aa9674ed5d88b72fda5a99a103d0b1a643d10b18c1de1186478b026f6b4da73628bff75a180df880157b5cbfff1bfd782f4ee81880e0635d79113fcc0f7497
 EBUILD remake-4.2.1.1.4-r1.ebuild 959 BLAKE2B 483247fef4339d53a5ef98d4d5529930204106bfd49ea2e293d31df4ad45ad21999d3b3ec05bddd8b02f438267c52bcf313e4fb11a6c72d0a4ffd646ab6bc792 SHA512 406017f4e2136046ffcea1b102652a28fb01bc895cdf749e19fea61d0d1b09824018bb10d8f050d9bd9cb8c09f4dd0e6a82cd5be60d520343cedaf7a84b7e21b
-MISC metadata.xml 326 BLAKE2B 4ca7da15d02026b12d85b2329d0096bfc817d29b0618a97a61f54b9c6702b3cc89c4674510286c88b59eaa7142b98ff2fdada61ae5d56856b3e6a9e08116a954 SHA512 69c31da5d0fb8b94548ee398fc937405ae11224a415dc7ad6628c9b66362d43c4e3adcfba05016735298d31eba68faa19dab93f3d792629217660e51c382567c
+EBUILD remake-4.3.1.1.5.ebuild 1088 BLAKE2B 2296a7387ef1f58edcfb59713a7bde883c5ef90f4d3bc4aa6bc5e734ff5918a9df8ebae05e1aae347dabd9cca57fcda02dd61f02631cad142486cbbf4c3c1da8 SHA512 25c38c7b9ce836645533bfe36221b9a5a91e13ae4417a7422390deaf8bb0b5370724c6b3ed015425987c236728b71112a448a978f3c942298e7b1865f1c64f72
+MISC metadata.xml 385 BLAKE2B 8f18b741478f60b3d1ef14fe838e948c04d4266d6aa9e1a5155754a0f86c5cf2f92f9768b96af1e3c47c6f7227d7e546d6c68d9e4b69c42f94bcc65d58d2a91c SHA512 b06a7454d4520da85e422a33ee320a82670796b74010840d077ac972124a3a971555f66d472b67a245dfaf6c2f74226a6a6bac64dc57889ab4e0e2c0d12f33ef
diff --git a/sys-devel/remake/files/remake-4.3.1.1.5-fno-common.patch b/sys-devel/remake/files/remake-4.3.1.1.5-fno-common.patch
new file mode 100644
index 000000000000..6c8650472e4e
--- /dev/null
+++ b/sys-devel/remake/files/remake-4.3.1.1.5-fno-common.patch
@@ -0,0 +1,103 @@
+Adapted version of https://github.com/rocky/remake/commit/08113a28b9be25cf157ace5d63c2d36d7dbefc04
+--- a/src/debugger/file2line.c
++++ b/src/debugger/file2line.c
+@@ -26,6 +26,8 @@ Boston, MA 02111-1307, USA.  */
+ #include "../src/rule.h"
+ #include "./file2line.h"
+ 
++struct hash_table file2lines;
++
+ unsigned long
+ file2lines_hash_1 (const void *key)
+ {
+--- a/src/debugger/file2line.h
++++ b/src/debugger/file2line.h
+@@ -19,15 +19,15 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.  */
+ #ifndef REMAKE_FILE2LINE
+ #define REMAKE_FILE2LINE
+-struct hash_table file2lines;
++extern struct hash_table file2lines;
+ 
+ typedef enum {
+   F2L_TARGET,
+   F2L_PATTERN
+ } f2l_entry_t;
+ 
+-  
+-typedef struct lineo_array_s 
++
++typedef struct lineo_array_s
+ {
+   const char *hname;   /**< Name stored in hash table */
+   unsigned int size;   /**< Number of entries in array */
+@@ -40,13 +40,13 @@ typedef struct lineo_array_s
+   only. So we do this on demand.
+ */
+ extern bool file2lines_init(void);
+-extern file_t *target_for_file_and_line (const char *psz_filename, 
++extern file_t *target_for_file_and_line (const char *psz_filename,
+ 					 unsigned int lineno,
+ 					 /*out*/ f2l_entry_t *entry_type);
+ extern void file2lines_dump(void);
+ #endif
+ 
+-/* 
++/*
+  * Local variables:
+  * eval: (c-set-style "gnu")
+  * indent-tabs-mode: nil
+--- a/src/dep.h
++++ b/src/dep.h
+@@ -139,7 +139,7 @@ struct dep *copy_dep_chain (const struct dep *d);
+ struct goaldep *read_all_makefiles (const char **makefiles);
+ 
+ /*! The chain of makefiles read by read_makefile.  */
+-struct goaldep *read_makefiles;
++extern struct goaldep *read_makefiles;
+ 
+ void eval_buffer (char *buffer, const gmk_floc *floc);
+ enum update_status update_goal_chain (struct goaldep *goals);
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -89,6 +89,6 @@ extern int in_debugger;
+ extern bool b_debugger_preread;
+ 
+ /* Remember the original value of the SHELL variable, from the environment.  */
+-struct variable shell_var;
++extern struct variable shell_var;
+ 
+ #endif /*GLOBALS_H*/
+--- a/src/main.c
++++ b/src/main.c
+@@ -45,6 +45,8 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ # include <fcntl.h>
+ #endif
+ 
++struct goaldep *read_makefiles;
++
+ extern void initialize_stopchar_map ();
+ 
+ #if defined HAVE_WAITPID || defined HAVE_WAIT3
+--- a/src/make.h
++++ b/src/make.h
+@@ -324,7 +324,7 @@ extern int unixy_shell;
+ #endif
+ #ifdef SET_STACK_SIZE
+ # include <sys/resource.h>
+-struct rlimit stack_limit;
++extern struct rlimit stack_limit;
+ #endif
+ 
+ /* We have to have stdarg.h or varargs.h AND v*printf or doprnt to use
+--- a/src/print.h
++++ b/src/print.h
+@@ -39,7 +39,7 @@ void fatal_err (target_stack_node_t *p_call, const char *fmt, ...);
+ 
+ /* Think of the below not as an enumeration but as #defines done in a
+    way that we'll be able to use the value in a gdb. */
+-enum debug_print_enums_e {
++extern enum debug_print_enums_e {
+   MAX_STACK_SHOW = 1000,
+ } debug_print_enums1;
+ 
diff --git a/sys-devel/remake/metadata.xml b/sys-devel/remake/metadata.xml
index ab51d946705e..64318925643e 100644
--- a/sys-devel/remake/metadata.xml
+++ b/sys-devel/remake/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">bashdb</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rocky/remake</remote-id>
+		<remote-id type="sourceforge">bashdb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/remake/remake-4.3.1.1.5.ebuild b/sys-devel/remake/remake-4.3.1.1.5.ebuild
new file mode 100644
index 000000000000..ae495601e9a2
--- /dev/null
+++ b/sys-devel/remake/remake-4.3.1.1.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_MAKE_BASE=$(ver_cut 1-2)
+MY_REMAKE_PATCH=$(ver_cut 4-)
+MY_P="${PN}-${MY_MAKE_BASE}+dbg-${MY_REMAKE_PATCH}"
+
+DESCRIPTION="Patched version of GNU Make with improved error reporting, tracing, and debugging"
+HOMEPAGE="http://bashdb.sourceforge.net/remake/"
+SRC_URI="https://github.com/rocky/remake/releases/download/release_${MY_P/remake-/}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="guile readline"
+
+DEPEND="readline? ( sys-libs/readline:0= )"
+RDEPEND="${DEPEND}
+	guile? ( >=dev-scheme/guile-1.8:= )"
+BDEPEND="guile? ( >=dev-scheme/guile-1.8 )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	use readline || export vl_cv_lib_readline=no
+	econf $(use_with guile)
+}
+
+src_install() {
+	default
+
+	# delete files GNU make owns and remake doesn't care about.
+	rm -r "${ED}"/usr/include || die
+	rm "${ED}"/usr/share/info/make.info* || die
+}
diff --git a/sys-devel/rust-std/Manifest b/sys-devel/rust-std/Manifest
index 7e30200d0ca0..33a6f170f616 100644
--- a/sys-devel/rust-std/Manifest
+++ b/sys-devel/rust-std/Manifest
@@ -1,3 +1,6 @@
+AUX 1.51.0-bootstrap-panic.patch 1508 BLAKE2B c5fec1047e0fd5ec7413a4555edb427f192ab5f7e6012ca52ecb5809034f932c5acc4a2be17cf7ac2e344acfdcbb380dbf208fab45635f264924389ef044c0fc SHA512 9209503c56b56bbc3aaafc7bc5a91b53099f24b21d19a345270ede4963a5cafe82161a419653cf25ee05a3e02a86d0cbfc63947d9c9a78506ab6e516fd94488f
 DIST rustc-1.51.0-src.tar.xz 109596164 BLAKE2B c1ac89655adfe7db8005476d42c748cf1896f52888141229fd6dda43855dbb08c21c8e1f11398d2f1f9dd5f8d508d9158a3bda4f1b282d1b184ea4c701100837 SHA512 ded91468ddf3e6627f00e7ec3d44452aa24eb727a183c0de9d90264f593119a54300d56b09251a88260db480b48554181ae195c538996a32d68d48b6587ac0df
-EBUILD rust-std-1.51.0.ebuild 3376 BLAKE2B 04e3aab94fa92feca1a5486a1e608c08ffbadca0c73b1bf904a817cf5f07b2b916c37ca629125ad45f9f4f9cc0bb106508294ac39d13e66660547f03480bcd24 SHA512 286c95f28e1ec4f284b1d8412b97cfa427d7573b8dac73b7b2b7e9e8ccee07ccf07f4f2c35f3bc4d32bd848907bdce7b38dcf2040ad9e9e31b0a43445d76fed3
+DIST rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a36678b692e1b510920045797ab29f1660f05cda901e19411ff83ec3084c4130034c269976b1056220f3e629cff116d07f0 SHA512 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c
+EBUILD rust-std-1.51.0.ebuild 3432 BLAKE2B 3e1190dea4bcce01f58843ab7ff3577de9b573cbb2b7d5ceaa346c994f0343343740aaea657cb8359c40c1d4e993255ea540ec49fb5168a00a933916848d5ec5 SHA512 d50bef61cd3f49e044612bbee7f52dbb57ae0290e030acf1d1ad56b4d7d166a11fd07766ffde6fbad7fe359e4d36ffb0357b76ef3df8fe5e962076033a4639fc
+EBUILD rust-std-1.52.1.ebuild 3376 BLAKE2B 04e3aab94fa92feca1a5486a1e608c08ffbadca0c73b1bf904a817cf5f07b2b916c37ca629125ad45f9f4f9cc0bb106508294ac39d13e66660547f03480bcd24 SHA512 286c95f28e1ec4f284b1d8412b97cfa427d7573b8dac73b7b2b7e9e8ccee07ccf07f4f2c35f3bc4d32bd848907bdce7b38dcf2040ad9e9e31b0a43445d76fed3
 MISC metadata.xml 818 BLAKE2B 32766ac24fada44b46f8d4ef77164a4e4843b876347056223184ec6fe48af9a6e2fa7d3e1fd48dec299f328f37fbdf4c84225a7450b788ce3e6c92e87bf8f313 SHA512 c1c4a46790dedc83b6890bbb536927148b293eed7f4d3bbd1f602b7664a9b303ca9689d4d1d35ed8047c2c909d64145fc4098efbec279f630b86207b0216ca80
diff --git a/sys-devel/rust-std/files/1.51.0-bootstrap-panic.patch b/sys-devel/rust-std/files/1.51.0-bootstrap-panic.patch
new file mode 100644
index 000000000000..529d5a1f402f
--- /dev/null
+++ b/sys-devel/rust-std/files/1.51.0-bootstrap-panic.patch
@@ -0,0 +1,43 @@
+From 31c93397bde772764cda3058e16f9cef61895090 Mon Sep 17 00:00:00 2001
+From: Joshua Nelson <jyn514@gmail.com>
+Date: Mon, 8 Feb 2021 22:51:21 -0500
+Subject: [PATCH] Use format string in bootstrap panic instead of a string
+ directly
+
+This fixes the following warning when compiling with nightly:
+
+```
+warning: panic message is not a string literal
+    --> src/bootstrap/builder.rs:1515:24
+     |
+1515 |                 panic!(out);
+     |                        ^^^
+     |
+     = note: `#[warn(non_fmt_panic)]` on by default
+     = note: this is no longer accepted in Rust 2021
+help: add a "{}" format string to Display the message
+     |
+1515 |                 panic!("{}", out);
+     |                        ^^^^^
+help: or use std::panic::panic_any instead
+     |
+1515 |                 std::panic::panic_any(out);
+     |                 ^^^^^^^^^^^^^^^^^^^^^^
+```
+---
+ src/bootstrap/builder.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
+index f1a160250dbe1..0f5fcb4af400d 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -1490,7 +1490,7 @@ impl<'a> Builder<'a> {
+                 for el in stack.iter().rev() {
+                     out += &format!("\t{:?}\n", el);
+                 }
+-                panic!(out);
++                panic!("{}", out);
+             }
+             if let Some(out) = self.cache.get(&step) {
+                 self.verbose(&format!("{}c {:?}", "  ".repeat(stack.len()), step));
diff --git a/sys-devel/rust-std/rust-std-1.51.0.ebuild b/sys-devel/rust-std/rust-std-1.51.0.ebuild
index 7ca481644a6a..935388d41a01 100644
--- a/sys-devel/rust-std/rust-std-1.51.0.ebuild
+++ b/sys-devel/rust-std/rust-std-1.51.0.ebuild
@@ -38,6 +38,8 @@ QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
 
 S="${WORKDIR}/${P/-std/c}-src"
 
+PATCHES=( "${FILESDIR}"/1.51.0-bootstrap-panic.patch )
+
 #
 # The cross magic
 #
diff --git a/sys-devel/rust-std/rust-std-1.52.1.ebuild b/sys-devel/rust-std/rust-std-1.52.1.ebuild
new file mode 100644
index 000000000000..7ca481644a6a
--- /dev/null
+++ b/sys-devel/rust-std/rust-std-1.52.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs
+
+DESCRIPTION="Rust standard library, standalone (for crossdev)"
+HOMEPAGE="https://www.rust-lang.org"
+SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable/$(ver_cut 1-2)"
+# please do not keyword
+#KEYWORDS="" #nowarn
+IUSE="debug"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	~dev-lang/rust-${PV}:=
+"
+
+DEPEND="||
+	(
+		>="${CATEGORY}"/gcc-4.7:*
+		>="${CATEGORY}"/clang-3.5:*
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+# need full compiler to run tests
+RESTRICT="test"
+
+QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so"
+
+S="${WORKDIR}/${P/-std/c}-src"
+
+#
+# The cross magic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+toml_usex() {
+	usex "$1" true false
+}
+
+pkg_pretend() {
+	is_cross || die "${PN} should only be used for cross"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	# do the great cleanup
+	strip-flags
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*' '-m32' '-m64'
+	strip-unsupported-flags
+
+	local rust_root x
+	rust_root="$(rustc --print sysroot)"
+	rtarget="$(rust_abi ${CTARGET})"
+	rtarget="${ERUST_STD_RTARGET:-${rtarget}}" # some targets need to be custom.
+	rbuild="$(rust_abi ${CBUILD})"
+	rhost="$(rust_abi ${CHOST})"
+
+	echo
+	for x in CATEGORY rust_root rbuild rhost rtarget RUSTFLAGS CFLAGS CXXFLAGS LDFLAGS; do
+		einfo "$(printf '%10s' ${x^^}:) ${!x}"
+	done
+
+	cat <<- EOF > "${S}"/config.toml
+		[build]
+		build = "${rbuild}"
+		host = ["${rhost}"]
+		target = ["${rtarget}"]
+		cargo = "${rust_root}/bin/cargo"
+		rustc = "${rust_root}/bin/rustc"
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		verbose = 2
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debuginfo-level-rustc = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		dist-src = false
+		remap-debuginfo = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		[target.${rtarget}]
+		cc = "$(tc-getCC ${CTARGET})"
+		cxx = "$(tc-getCXX ${CTARGET})"
+		linker = "$(tc-getCC ${CTARGET})"
+		ar = "$(tc-getAR ${CTARGET})"
+		$(usex elibc_musl 'crt-static = false' '')
+	EOF
+
+	einfo "${PN^} configured with the following settings:"
+	cat "${S}"/config.toml || die
+}
+
+src_compile() {
+	env RUST_BACKTRACE=1 \
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
+		library/std --stage 0 || die
+}
+
+src_test() {
+	ewarn "${PN} can't run tests"
+}
+
+src_install() {
+	local rustlib="lib/rust/${PV}/lib/rustlib"
+	dodir "/usr/${rustlib}"
+	pushd "build/${rhost}/stage0-sysroot/lib/rustlib" > /dev/null || die
+	cp -pPRv "${rtarget}" "${ED}/usr/${rustlib}" || die
+	popd > /dev/null || die
+}