diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild
index b3df473d9d..936757448f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild
@@ -1,20 +1,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 MY_P="autotools-wrappers-at-${PV}"
 
-DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
+DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions"
 HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
-SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
-#SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI=" https://anongit.gentoo.org/git/proj/autotools-wrappers.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
+	#SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
-
-S="${WORKDIR}/${MY_P}"
 
 src_install() {
 	exeinto /usr/$(get_libdir)/misc
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
new file mode 100644
index 0000000000..00ae376153
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="autotools-wrappers-at-${PV}"
+
+DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions"
+HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/autotools-wrappers.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
+	#SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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-2"
+SLOT="0"
+
+src_install() {
+	exeinto /usr/$(get_libdir)/misc
+	doexe ac-wrapper.sh
+
+	dodir /usr/bin
+
+	local x=
+	for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
+		dosym -r /usr/$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x}
+	done
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml
index 73dda144f9..1f8aa323a0 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gentoo">proj/autotools-wrappers</remote-id>
+	</upstream>
 </pkgmetadata>