diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r7.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r7.ebuild
index 0c634973f3..55b2457458 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ BDEPEND="
 RDEPEND="
 	${BDEPEND}
 	sys-apps/texinfo
-	>=sys-devel/autoconf-wrapper-13
+	>=dev-build/autoconf-wrapper-13
 "
 
 PATCHES=(
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.ebuild
index 1df0f05de4..8c87a2c23c 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ BDEPEND="
 RDEPEND="
 	${BDEPEND}
 	sys-apps/texinfo
-	>=sys-devel/autoconf-wrapper-13
+	>=dev-build/autoconf-wrapper-13
 "
 
 PATCHES=(
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-perl-5.26.patch
 	"${FILESDIR}"/${P}-K-R-decls-clang.patch
 	"${FILESDIR}"/${P}-Clang-16-fixes-for-various-tests.patch
+	"${FILESDIR}"/${P}-skip-AC_FUNC_GETLOADAVG-test.patch
 )
 
 src_configure() {
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-r9.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-r9.ebuild
index 75df5c300a..68c89dba76 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-r9.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ else
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-m4 )"
 fi
 
-inherit toolchain-autoconf
+inherit toolchain-autoconf multiprocessing
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
@@ -37,7 +37,7 @@ BDEPEND+="
 "
 RDEPEND="
 	${BDEPEND}
-	>=sys-devel/autoconf-wrapper-13
+	>=dev-build/autoconf-wrapper-13
 	!~sys-devel/${P}:2.5
 "
 
@@ -79,3 +79,7 @@ src_prepare() {
 	# We already have an up to date autoconf.info page at this point.
 	touch -r doc/{old_,}autoconf.texi || die
 }
+
+src_test() {
+	emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.ebuild
index a76ab0e28c..5897d97929 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 fi
 
-inherit toolchain-autoconf
+inherit toolchain-autoconf multiprocessing
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
@@ -35,7 +35,7 @@ IUSE="emacs"
 BDEPEND=">=sys-devel/m4-1.4.16
 	>=dev-lang/perl-5.8"
 RDEPEND="${BDEPEND}
-	>=sys-devel/autoconf-wrapper-15
+	>=dev-build/autoconf-wrapper-15
 	sys-devel/gnuconfig
 	!~sys-devel/${P}:2.5"
 [[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
@@ -74,7 +74,7 @@ src_prepare() {
 }
 
 src_test() {
-	emake check
+	emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
 }
 
 src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r7.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r7.ebuild
index fec14a8ce2..2672d89b27 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ else
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
 fi
 
-inherit toolchain-autoconf
+inherit toolchain-autoconf multiprocessing
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
@@ -47,7 +47,7 @@ BDEPEND+="
 "
 RDEPEND="
 	${BDEPEND}
-	>=sys-devel/autoconf-wrapper-15
+	>=dev-build/autoconf-wrapper-15
 	sys-devel/gnuconfig
 	!~sys-devel/${P}:2.5
 "
@@ -89,7 +89,7 @@ src_prepare() {
 }
 
 src_test() {
-	emake check
+	emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
 }
 
 src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.ebuild
index 60238d14cc..7cace3e2a3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Bumping notes:
-# * Remember to modify LAST_KNOWN_VER 'upstream' in sys-devel/autoconf-wrapper
+# * Remember to modify LAST_KNOWN_VER 'upstream' in dev-build/autoconf-wrapper
 # on new autoconf releases, as well as the dependency in RDEPEND below too.
 # * Update _WANT_AUTOCONF and _autoconf_atom case statement in autotools.eclass.
 
@@ -35,7 +35,7 @@ else
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
 fi
 
-inherit toolchain-autoconf
+inherit toolchain-autoconf multiprocessing
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
@@ -50,7 +50,7 @@ BDEPEND+="
 "
 RDEPEND="
 	${BDEPEND}
-	>=sys-devel/autoconf-wrapper-20231224
+	>=dev-build/autoconf-wrapper-20231224
 	sys-devel/gnuconfig
 	!~sys-devel/${P}:2.5
 "
@@ -83,7 +83,7 @@ src_prepare() {
 }
 
 src_test() {
-	emake check
+	emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
 }
 
 src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.ebuild
index 60238d14cc..0fff9c2054 100644
--- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Bumping notes:
-# * Remember to modify LAST_KNOWN_VER 'upstream' in sys-devel/autoconf-wrapper
+# * Remember to modify LAST_KNOWN_VER 'upstream' in dev-build/autoconf-wrapper
 # on new autoconf releases, as well as the dependency in RDEPEND below too.
 # * Update _WANT_AUTOCONF and _autoconf_atom case statement in autotools.eclass.
 
@@ -50,7 +50,7 @@ BDEPEND+="
 "
 RDEPEND="
 	${BDEPEND}
-	>=sys-devel/autoconf-wrapper-20231224
+	>=dev-build/autoconf-wrapper-20231224
 	sys-devel/gnuconfig
 	!~sys-devel/${P}:2.5
 "
diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-skip-AC_FUNC_GETLOADAVG-test.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-skip-AC_FUNC_GETLOADAVG-test.patch
new file mode 100644
index 0000000000..280578ac6b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-skip-AC_FUNC_GETLOADAVG-test.patch
@@ -0,0 +1,20 @@
+The macro itself is broken in autoconf-2.13 but this is caused by newer kernels
+etc rather than anything else. Very, very few packages use autoconf-2.13, let
+alone AC_FUNC_GETLOADAVG, so not going to worry about it much.
+
+Do as Fedora and Debian do and skip the test for it.
+
+https://bugs.gentoo.org/406723
+https://bugs.gentoo.org/677926
+--- a/testsuite/autoconf.s/syntax.exp
++++ b/testsuite/autoconf.s/syntax.exp
+@@ -2,7 +2,8 @@
+ 
+ send_user "Checking for syntax errors in the specific tests...\n"
+ set script {s/^AC_DEFUN(\([^,]*\).*/\1/p}
+-set macros [exec sed -n $script $srcdir/../acspecific.m4]
++# XXX: AC_FUNC_GETLOADAVG skipped for bug #406723, bug #677926
++set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v AC_FUNC_GETLOADAVG]
+ 
+ foreach mac $macros {
+     if { [string match "*F77*" "$mac"] && [catch {exec which g77} ignore_output] } then {