From 54dc4270865c464ebab433fd63a7c8d27f4a8c34 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:13:59 +0000
Subject: [PATCH 01/30] app-alternatives/awk: Sync with Gentoo

It's from Gentoo commit d4c96a45f9e0c5401a6d4df4867dc85348fd7989.
---
 .../awk/{awk-2.ebuild => awk-3.ebuild}        | 69 +++++++++++--------
 1 file changed, 42 insertions(+), 27 deletions(-)
 rename sdk_container/src/third_party/portage-stable/app-alternatives/awk/{awk-2.ebuild => awk-3.ebuild} (54%)

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-2.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-3.ebuild
similarity index 54%
rename from sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-2.ebuild
rename to sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-3.ebuild
index c76362361b..d722129ee3 100644
--- a/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-3.ebuild
@@ -3,53 +3,68 @@
 
 EAPI=8
 
-DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+	gawk:sys-apps/gawk
+	busybox:sys-apps/busybox
+	mawk:sys-apps/mawk
+	nawk:sys-apps/nawk
+)
 
-LICENSE="CC0-1.0"
-SLOT="0"
+inherit app-alternatives
+
+DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
 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"
-IUSE="busybox +gawk mawk nawk split-usr"
-REQUIRED_USE="^^ ( busybox gawk mawk nawk )"
+IUSE="split-usr"
 
 RDEPEND="
-	busybox? ( sys-apps/busybox )
-	gawk? ( sys-apps/gawk )
-	mawk? ( sys-apps/mawk )
-	nawk? ( sys-apps/nawk )
 	!app-eselect/eselect-awk
 "
 
 src_install() {
+	local alt=$(get_alternative)
 	local root_prefix=
 	use split-usr && root_prefix=../../bin/
 
 	# We could consider setting AWK=... like we do for yacc & lex,
 	# but it would need some testing with a fair amount of packages first,
 	# as autoconf prefers gawk.
-	if use busybox; then
-		dosym "${root_prefix}busybox" /usr/bin/awk
-		newman - awk.1 <<<".so busybox.1"
-	elif use gawk; then
-		dosym gawk /usr/bin/awk
-		newman - awk.1 <<<".so gawk.1"
-	elif use mawk; then
-		dosym mawk /usr/bin/awk
-		newman - awk.1 <<<".so mawk.1"
-	elif use nawk; then
-		dosym nawk /usr/bin/awk
-		newman - awk.1 <<<".so nawk.1"
-	else
-		die "Invalid USE flag combination (broken REQUIRED_USE?)"
-	fi
+	case ${alt} in
+		busybox)
+			dosym "${root_prefix}busybox" /usr/bin/awk
+			;;
+		*)
+			dosym "${alt}" /usr/bin/awk
+			;;
+	esac
+
+	newman - awk.1 <<<".so ${alt}.1"
 
 	if use split-usr; then
 		dosym ../usr/bin/awk /bin/awk
 	fi
 }
 
+pkg_preinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		# if we are upgrading from a new enough version, leftover manpage
+		# symlink cleanup was done already
+		if ver_test "${v}" -ge 3; then
+			return
+		fi
+	done
+
+	# otherwise, remove leftover files/symlinks created by eselect-awk (sic!)
+	shopt -s nullglob
+	local files=( "${EROOT}"/usr/share/man/man1/awk.1* )
+	shopt -u nullglob
+
+	if [[ ${files[@]} ]]; then
+		einfo "Cleaning up leftover manpage symlinks from eselect-awk ..."
+		rm -v "${files[@]}" || die
+	fi
+}
+
 pkg_postrm() {
 	# make sure we don't leave the user without the symlinks, since
 	# they've not been owned by any other package

From d769f45218024c6a0f93f66a4622bb9eb1cb110b Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:13:59 +0000
Subject: [PATCH 02/30] app-alternatives/yacc: Sync with Gentoo

It's from Gentoo commit e773377026c28a1324d074e8af1039cc8c432eb4.
---
 .../app-alternatives/yacc/yacc-1-r2.ebuild    | 56 ++++++++-----------
 1 file changed, 22 insertions(+), 34 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild
index e748c4e0ab..2a3e288c2f 100644
--- a/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -3,54 +3,42 @@
 
 EAPI=8
 
-DESCRIPTION="yacc symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+	"bison:>=sys-devel/bison-3.8.2-r1"
+	byacc:dev-util/byacc
+	"reference:>=dev-util/yacc-1.9.1-r7"
+)
 
-LICENSE="CC0-1.0"
-SLOT="0"
+inherit app-alternatives
+
+DESCRIPTION="yacc symlinks"
 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"
-IUSE="+bison byacc reference"
-REQUIRED_USE="^^ ( bison byacc reference )"
 
 RDEPEND="
-	bison? ( >=sys-devel/bison-3.8.2-r1 )
-	byacc? ( dev-util/byacc )
-	reference? ( >=dev-util/yacc-1.9.1-r7 )
 	!<dev-util/yacc-1.9.1-r7
 	!<sys-devel/bison-3.8.2-r1
 "
 
 src_install() {
-	if use bison; then
+	local alt=$(get_alternative)
+
+	case ${alt} in
 		# bison installs its own small wrapper script 'yacc-bison'
 		# around bison(1).
-		dosym yacc.bison /usr/bin/yacc
-		newman - yacc.1 <<<".so yacc.bison.1"
+		bison) alt=yacc.bison;;
+		reference) alt=yacc-reference;;
+	esac
 
-		# Leaving this for now to be safe, as it's closer to pre-alternatives
-		# status quo to leave it unset and let autoconf probe for Bison by itself
-		# as it prefers it anyway, and might be a CPP-like situation wrt
-		# calling bison or bison -y if YACC is set.
-		#newenvd - 90yacc <<-EOF
-		#	YACC=yacc.bison
-		#EOF
-	elif use byacc; then
-		dosym byacc /usr/bin/yacc
-		newman - yacc.1 <<<".so byacc.1"
+	dosym "${alt}" /usr/bin/yacc
+	newman - yacc.1 <<<".so ${alt}.1"
 
+	# Leaving this for now to be safe, as it's closer to pre-alternatives
+	# status quo to leave it unset and let autoconf probe for Bison by itself
+	# as it prefers it anyway, and might be a CPP-like situation wrt
+	# calling bison or bison -y if YACC is set.
+	if [[ ${alt} != yacc.bison ]]; then
 		newenvd - 90yacc <<-EOF
-			YACC=byacc
+			YACC=${alt}
 		EOF
-	elif use reference; then
-		dosym yacc-reference /usr/bin/yacc
-		newman - yacc.1 <<<".so yacc-reference.1"
-
-		newenvd - 90yacc <<-EOF
-			YACC=yacc
-		EOF
-	else
-		die "Invalid USE flag combination (broken REQUIRED_USE?)"
 	fi
 }

From 28cbbcc92d7bcdcf473bf71d14d4a0d659873caa Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:13:59 +0000
Subject: [PATCH 03/30] app-arch/libarchive: Sync with Gentoo

It's from Gentoo commit bb54c4d5f1b0b8b0beb35d7081e42070dccdb29a.
---
 .../app-arch/libarchive/Manifest              |   2 +
 .../libarchive/libarchive-3.6.1-r1.ebuild     |   2 +-
 .../libarchive/libarchive-3.6.2.ebuild        | 126 ++++++++++++++++++
 3 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.2.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/Manifest
index e3d9a2c0be..53eb2e77ad 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/Manifest
@@ -1,2 +1,4 @@
 DIST libarchive-3.6.1.tar.xz 5241148 BLAKE2B e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf SHA512 2e5a72edc468080c0e8f29e07d9c33826ffb246fa040ec42399bedeecf698b7555f69ffd15057ad79c0f50cd4926d43174599d99632b1b99ec6cd159c43a70b8
 DIST libarchive-3.6.1.tar.xz.asc 833 BLAKE2B 8a1ca13491f3b29b322ab281a80eaef9ca2cca680e18a0ed5ff626e8808b6c9a5eb4cdd6eaf00fb771f361d84d7785c103a9a0665d812f1f27ac66f5d1a2e1da SHA512 0411a9bdc9bb058b289b5cc102a220216420bf01ea213e771a16246ed48e670f3426e8555bac27262b686b40b7b2239907c4eef2bf43d812d73a69ccb2a5b00c
+DIST libarchive-3.6.2.tar.xz 5213196 BLAKE2B 355b5d402e352dee802513485ce7e047af58d6de5b9bf6a49f3fd8d7b94117007598820ac979585c0da79747e8b63b70ab151131182368a11f97a047cf9029d4 SHA512 a12bb6839e13a0be1099f42c650fc90fbfe62d32ce38bcbb4794206d29b2c782ae1115124d0e5f6b9716514213af32b05e4a42eb196447674a5f9a2a32bee043
+DIST libarchive-3.6.2.tar.xz.asc 659 BLAKE2B a4b0035ab2bda4129cdf0c99266cd1e5f4772d90de6e348c75958bc803f369d6abea85d9730c6c9a216466b35697faad8d265fb2c285545887eafde27d828887 SHA512 403e5f7dec14d8b1cc01fad5a249e7b7618a7b45bcb3361ea80d67d76b591b12ce97f2c88b23d5486505dd3b34c1f1643e02235a3e5fc5150ee5735946092efe
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
index 8862528087..98013595c2 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.1-r1.ebuild
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-libarchive )
+	verify-sig? ( <sec-keys/openpgp-keys-libarchive-20221209 )
 "
 
 PATCHES=(
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.2.ebuild
new file mode 100644
index 0000000000..2f4b076f78
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="
+	https://www.libarchive.de/downloads/${P}.tar.xz
+	verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
+"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+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"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc
+
+RDEPEND="
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	kernel_linux? (
+		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	)
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
+	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? (
+		virtual/os-headers
+		e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
+	)
+"
+BDEPEND="
+	verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
+"
+
+multilib_src_configure() {
+	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+	local myconf=(
+		$(use_enable acl)
+		$(use_enable static-libs static)
+		$(use_enable xattr)
+		$(use_with blake2 libb2)
+		$(use_with bzip2 bz2lib)
+		$(use_with expat)
+		$(use_with !expat xml2)
+		$(use_with iconv)
+		$(use_with lz4)
+		$(use_with lzma)
+		$(use_with lzo lzo2)
+		$(use_with nettle)
+		--with-zlib
+		$(use_with zstd)
+
+		# Windows-specific
+		--without-cng
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
+			--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
+		)
+	else
+		myconf+=(
+			--disable-bsdcat
+			--disable-bsdcpio
+			--disable-bsdtar
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake libarchive.la
+	fi
+}
+
+src_test() {
+	mkdir -p "${T}"/bin || die
+	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
+	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+	local -x PATH=${T}/bin:${PATH}
+	multilib-minimal_src_test
+}
+
+multilib_src_test() {
+	# sandbox is breaking long symlink behavior
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+	# some locales trigger different output that breaks tests
+	local -x LC_ALL=C
+	emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		emake DESTDIR="${D}" install
+	else
+		local install_targets=(
+			install-includeHEADERS
+			install-libLTLIBRARIES
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${install_targets[@]}"
+	fi
+
+	# Libs.private: should be used from libarchive.pc instead
+	find "${ED}" -type f -name "*.la" -delete || die
+}

From 8ad866728781129114beb124beec3028b3419167 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:00 +0000
Subject: [PATCH 04/30] app-arch/xz-utils: Sync with Gentoo

It's from Gentoo commit 08fdfad386278271137bdda1eb3d482d51a3e829.
---
 .../portage-stable/app-arch/xz-utils/xz-utils-5.2.9.ebuild      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.9.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.9.ebuild
index 92b43d373c..fb35eaff73 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.9.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.9.ebuild
@@ -28,7 +28,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		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"
+		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
 
 	S="${WORKDIR}/${MY_P}"

From b333307dca0d10852cb87ead1fd4bd728296f9b0 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:01 +0000
Subject: [PATCH 05/30] app-portage/portage-utils: Sync with Gentoo

It's from Gentoo commit bed995908f73ac2603ac9153d0f6274c1f13ee61.
---
 .../app-portage/portage-utils/Manifest        |  1 +
 .../portage-utils/portage-utils-0.94.4.ebuild | 75 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.4.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest
index 6350de83d2..095df425a8 100644
--- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest
@@ -1,2 +1,3 @@
 DIST portage-utils-0.94.1.tar.xz 1871688 BLAKE2B bec5ddd514b397c157c3b1bff70d61730f15804a6751f56eb69c4030a35fc6a6b11fa1e2bde94332772660f02bf9428623210733ae9e2f1290f29aa3b31a1813 SHA512 29fdb4093997eb95703d407da6b00305c949f0a00ae3aa5cfb2c47b66bddc59e034fae114663b40b611f906332066b648018aa4e5bc1b935e61a64f4b4bf1088
 DIST portage-utils-0.94.3.tar.xz 1804720 BLAKE2B b0239a26d878db6dd73c9ee54f586526f8812921775126ef74afbe089186fdc5ca7197847e204c6ecbf9d79b6e2a6173cb0c39d4a26653ed0db2d7f9b10e88c5 SHA512 bf8fcccc26bb985bf7664f6ab0227a5251c3f918199de0c4e4c95b7107eb72eee367d1d524b5d9608b3c7eea9b1fae789456390cbb0d375297b807bb98644e01
+DIST portage-utils-0.94.4.tar.xz 1804252 BLAKE2B 4bdb3dca331eeeaeca34b949aa0228d81df71888fa7cb07f878958939f7820f6887ebb43f0a89d8ed8d787c152a631a731bc53f30c8241ca2530ee9420fea1e2 SHA512 d59a09c9b2dd4de8ed320a5b1c943a1d5dcdef41a057fbfeb00ed136e2ba87375d4562861de5b0e44bad986916d0f58487f3d93deaeb44e96385535d85d74217
diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.4.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.4.ebuild
new file mode 100644
index 0000000000..b07e43f8a4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+	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"
+IUSE="openmp +qmanifest +qtegrity static"
+
+RDEPEND="
+	qmanifest? (
+		!static? (
+			app-crypt/gpgme:=
+			app-crypt/libb2:=
+			dev-libs/openssl:=
+			sys-libs/zlib:=
+		)
+	)
+	qtegrity? (
+		!static? (
+			dev-libs/openssl:=
+		)
+	)"
+DEPEND="${RDEPEND}
+	qmanifest? (
+		static? (
+			app-crypt/gpgme[static-libs]
+			app-crypt/libb2[static-libs]
+			dev-libs/openssl[static-libs]
+			sys-libs/zlib[static-libs]
+		)
+	)
+	qtegrity? (
+		static? (
+			dev-libs/openssl[static-libs]
+		)
+	)"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	econf \
+		--disable-maintainer-mode \
+		--with-eprefix="${EPREFIX}" \
+		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
+		$(use_enable openmp)
+}

From e6613dff2e2721ca68c4238842a828e72c39543e Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:02 +0000
Subject: [PATCH 06/30] dev-lang/python: Sync with Gentoo

It's from Gentoo commit 4ff0f9bdbf50fa1b729a3d5335f9cae63ff66a7f.
---
 .../portage-stable/dev-lang/python/Manifest   |  33 +-
 ...-3.10.8_p3.ebuild => python-3.10.9.ebuild} |  14 +-
 ...-3.11.0_p2.ebuild => python-3.11.1.ebuild} |  14 +-
 .../python/python-3.12.0_alpha1_p2.ebuild     | 494 ------------------
 ...ha2.ebuild => python-3.12.0_alpha3.ebuild} |  12 +-
 ...-3.8.15_p3.ebuild => python-3.8.16.ebuild} |  14 +-
 ...-3.9.15_p3.ebuild => python-3.9.16.ebuild} |  14 +-
 7 files changed, 69 insertions(+), 526 deletions(-)
 rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.10.8_p3.ebuild => python-3.10.9.ebuild} (95%)
 rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.11.0_p2.ebuild => python-3.11.1.ebuild} (95%)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha1_p2.ebuild
 rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.12.0_alpha2.ebuild => python-3.12.0_alpha3.ebuild} (96%)
 rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.8.15_p3.ebuild => python-3.8.16.ebuild} (94%)
 rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.9.15_p3.ebuild => python-3.9.16.ebuild} (95%)

diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest
index 021caf766a..eb56253211 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest
@@ -1,21 +1,18 @@
 DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8
-DIST Python-3.10.8.tar.xz 19619508 BLAKE2B 8bbfbae34fbc517c4a746e5e4c360efc57aca175c50fe46a378aa9d6d023a3d90c7df816149e4cca0c9b64ca0142267d8df552e8f8dc53a04b5251e8848dce74 SHA512 40e3e77d79618c81d6fc57c5d119b99c2959dcf932f40aad6b26f2ec39c5e713e6ff298f7597b4fad2ab94680db3732483b5ca0a45e6ae58c14580b3ea44cb0f
-DIST Python-3.10.8.tar.xz.asc 833 BLAKE2B 1e94822a57d055f5db1a5d2915df24be9d6fd9e6b301d148919a7643285a93ca1c8a16db7d74e0adabe7d2a21678b5126e3df7fffb253b35f8db6f74284a0aba SHA512 0c2ef09d898257ba5e9ec7c5bb224a7e50e5ebca96843b4d9e25be6cdd2f17144772aafc92280af20c21491e3c8cedc697414688ece613c93b28ff7ecddcf93f
-DIST Python-3.11.0.tar.xz 19819768 BLAKE2B 3a9852b8973e0e6ce414742f08f17f2c239d20a4e437e95656a325e151d04f4751f07fce955e55f2818af6810b767f2438b3d14e9f2313fe607bab31c47a2fca SHA512 314eef88ae0d68760f34d7a32f238fd2ecb27c50963baa7357c42ad8159026ec50229a0b31d83c39710a472904a06422afc082f9658a90a1dc83ccb74c08039d
-DIST Python-3.11.0.tar.xz.asc 833 BLAKE2B 7133f390ff8e7d856466c8d310903ef694196f5d945d6b753dcd7bf3e5416d69ef0e2320252ecce419ecce07ac5e2a37ad1657e2ded393d0c38a6521a65cebc2 SHA512 d20fb152c5b16cfef1f59af588f7576eb45c903d9e15fd4ad0e15fd32bef7ffd951b99a062d2944234ecffcf29eb9266544e92d2f6584710cbb20ba38f8ac224
-DIST Python-3.12.0a1.tar.xz 19776600 BLAKE2B 035e75c5713f9ff139f6df50329d9b74ade3b255f5413311d7012b2298dd3cb6d71ed11f5855d01e79d6bac334f80bd6a3340591fc3654d9723fd1c5f80eb750 SHA512 fa69dddf36dfe89b869d4de71cb8e878ef1e8be2b96ddfe2d58286710dd09b64db67c130d0438e3cea6679f6e9cd6bb83633691c8b7d6f346b730668866a28f7
-DIST Python-3.12.0a1.tar.xz.asc 963 BLAKE2B 5027ce705b80ad2d186f45c27d00542df1090dcaa30e9d97e483d7debdaeb35b5bf94c9f0cd000715a8ccf6dc5f752e0129bb42e48bfd6b308754bd73ee26090 SHA512 4db7946d27505da9c9b358a3b0fc2f47bb79b10bbcdb8f3ce2f918d1b74665e41a51600de3b94d50b126b66c72f191f8532f4030af184698c32430c35ef8d821
-DIST Python-3.12.0a2.tar.xz 19633668 BLAKE2B 03c5b5637d43bd324f3dce2d16d8d12a585b2bbed82e165c1491e798f9a321547ab035372fe775b28098c6b8f65fc115f77d9ef677ec34da65cbf882689d6181 SHA512 0f830fdb514078c5403727b31fd81912382eca4decb52ae9bfb0f00b8a007be9f8e29bad349034ec97e2229f60fe0baae417227413350485d747d31f4567d5c1
-DIST Python-3.12.0a2.tar.xz.asc 963 BLAKE2B a5508457e61db805cbadcef66ebb92d6e62a797704827483cca616d6441a60f99ec7a826ad3ebdaa7c92865a9aa2e5b41fde248467d5b9e1c57fb4295f7910b4 SHA512 f0c22e071c68d648c8cf2823647f0c807db41b81b94b8100b50d2049a47f19475a4323c5ac488eb5a3798f942978054f358090c1e460804232bb46093fb3fd55
-DIST Python-3.8.15.tar.xz 19038408 BLAKE2B 4ce84171b2f7ca8c9cf1d130adf70f16a0899766cea98965c3e7afcb84b73c482bcb400b59b91736d20e31c57be79edc178f6eeecd775a1f8920a8fbfdd90c24 SHA512 4fb3827b13c2452faa75e5ed18dddf381e80b4fffcfde046e289b4629cff0bb87fba1d09916b9b8a6f8039dc422c952293ebdb381c49f8ca7e7893ae4be6c28d
-DIST Python-3.8.15.tar.xz.asc 833 BLAKE2B bff055e28f4a2e59bb9e6d131ed39f954b729ac791279a6ac618521b545ace16e4eba3aaab629ca1c155d973c0c255b3d184b38fd82ee943d59a328d0603b1b6 SHA512 8ed69db7773a111e7b356848e18fc35b8835426e8d2cb8f311644d511682960c97740232c32c92196391adaecebc0ff842c2f918aad07e5dd46b168e8277ac04
-DIST Python-3.9.15.tar.xz 19712208 BLAKE2B a8490c998c89ed4e3e87ef48e3b5d622e5d06ebd7b8b79db564d668cd1f0c7fe89e0ef37ec4481ff82b30778e2be1a96c1b16199b9dce1f82de32f73b4343ddd SHA512 9310d263bc7a7925f73a6f66fd254ae61f377f43011a6bc5c58e57c8b170c2da4f197a646927ab9d05f8912ed8be4369c09576063931a3f93c3b0228ccb33a39
-DIST Python-3.9.15.tar.xz.asc 833 BLAKE2B c325fb52fae254153456c24c1039b07c9ccf8734df3665640215d35219ccacb705f99d94c9f8b644d15d4ea4612f5ac0da599814f68f7d3b6fc1fdc175db9002 SHA512 722625091731536757b9db447590c31620665133d45076367a3281f2ee3add23a781b10ce5cea582d65caabb18814583c1a347689d2b396214e36a6771182f38
+DIST Python-3.10.9.tar.xz 19612112 BLAKE2B ef2d063a9fbaf234aa4a47149cb184a0379dc403515df10249104a5092750cdaf22ad47916d34e17dd68fff1c30338c0375f4e4e3cc9bde33e0896c1c3ba655b SHA512 d66ea8adeb6dc4951e612175f8838b3092967ff275b7a3470f2d86f470036aa2221e722c3144d90bcd230b88efd53dde204213f72f703e524e4b833e2ccc68e2
+DIST Python-3.10.9.tar.xz.asc 833 BLAKE2B 8895c6cb5031b2463cc6ba3e0dc56bee40c2e99117c062f9c72f2b7adb0d5a49782b968abfc764117e8513bd12816915245677c25b1710e3dae3c9e26937c2b9 SHA512 525e166ede6836086de814c26fc880f41eaf1ed4bff6118f00342e42f7ab1c47148447ced1b565e146d3125fa06b5cd6b394a256bc61096766b26e07f18bbf10
+DIST Python-3.11.1.tar.xz 19856648 BLAKE2B 2a8942e7a145cfcc5b6932865ff9a1afd300bf2e6c4c915e88d0e849441196a3a4cacf94f3db87eaa7538872059085cf7eeff91c436f424448f85d4b180a6f24 SHA512 5edd70c881e083c96199c60471f18f9ebc4c97a2d45dc66f89e16d7c3638d8a5d2cbf2e84b1be3d7f1178ce9f7fa4197884385c1ee3618ff66a538f872f318ed
+DIST Python-3.11.1.tar.xz.asc 833 BLAKE2B 27c6101b2022cb7bea3e6082f1554b31cceb8cabe720e4b19391f550e870588c4defd1552c580a7e063638b80e8b8f415e54a11cf40ae3b0f449500c2e9babc6 SHA512 81ed05c2adf38552bdc5ac761704f2720a646d56681a919a6bfa51f1a4b42cd14edb9c84d58664dbc8e7b561cd78d82ae6b10dda423e1fae543bc7fa4bf3f78e
+DIST Python-3.12.0a3.tar.xz 19695444 BLAKE2B c869e68612b7b32a3a9cdb5accd1fec3453abbea68ca6993e7ce6d5f8deead50902ee6026c3bf2a3faf92e5a571b6b71fbcfc85d49fa03b4ac12ab5dba3f486a SHA512 82d88adda53a1e5c16fc7165ac0d55f3828bae9249d361fbf7237d8826bd5acd941befb9b2c74f815a251b216d377f416831fbd233f1bfef31c2cab73b6554d1
+DIST Python-3.12.0a3.tar.xz.asc 963 BLAKE2B ff0a4eb7a3e27281494450dca7f23f4e1816e18d0487e09b6a9f58d441b766f32e8653b7e01753c8353bb34a235b8296cbe975ee7a917ae4a24e5b8875b4ff5f SHA512 e25a42982f3cab6e38ef7a4f5bfd71ad25811f52dffeffbb827ee9f48bf45003edad14ffdd3289bfda113a34b7ef818d04a413d0da7e8ca52d0c47f9b4475dbb
+DIST Python-3.8.16.tar.xz 19046724 BLAKE2B cbdeec7961d39cb9ab4960760b5d4c7ae71675c174156aa9f6fca55ee92a93a937ef39defe86e423237a25e0e24703233ce4b91dc97005b6ffc1f342ddd9e22c SHA512 d206e80806409410c00ef8acd8c3d90e3cc9553f996d0a57faa63802f2415e9d7591542b2e84b5e8e79245f40f6478790b5ba2acf1da98ebbc9495999183f7fd
+DIST Python-3.8.16.tar.xz.asc 833 BLAKE2B 678dabc558d013b104bf9e65d4319076c4730a67093a66fefc073b429c640d4facb31a0d6b7238deb08b265586a0cfb2c345051fe4df7bf5001d7317e6c06c9b SHA512 e93c394c0c5afcaaab625a3bd540dcc8e0ab946803d212343b8d1d6d5e6b89b09b6a20607bab0d858b30389a03305d57e14548605a65277d053c7817f32f4546
+DIST Python-3.9.16.tar.xz 19738796 BLAKE2B 70dedeb70d9d8f27e4f6db5106623e087c61d451c7a04639cf8d3503ad02d4d43f1b36d0cdf1131aefc9bf6e677e561227dd4baef2c2c3d2dbf6d3e7dc36bd94 SHA512 b5fd0afe131c82bbce6ddf887c59eef6945910d6a9a2bc87c0927f4e4a096bf9ca4d25bcb729c40f6ebb8a65fbe8bf7b0b97a7c4a8c9e551240eb4f34b878653
+DIST Python-3.9.16.tar.xz.asc 833 BLAKE2B 416b4a4be06e101c5971c12a6f21229c425bcabaea58487e0d1b24d6dea318c58806ee43892fc704df8252670451bd6a4a2610c25672d3983ddb081fed34b92d SHA512 468959c36a3ec6136f57a39475fff4745a25be0cb5d3d58cf3e5faf0b9ce2d2a8b89f1f9fea1479c4c6ad12ac49e97c1cfd4291c978bb3d30df5a582ec315210
 DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f
-DIST python-gentoo-patches-3.10.8_p3-r1.tar.xz 16468 BLAKE2B be00739bdfc78623781139b8218d5173f13f252d3394482c38aeda8efd9b6bb4988a8dbec1b521a028448a0a92c7dce8b979eb2c38fdd6749bd9be682847d719 SHA512 094a058d2b956dfe017ae8b1da4c8da0a6aad82b70eebe9cdeb8d86bfe8b625aba57526186c97a805392c6baa62e5daaf005b54864e096f946f40ef3ce703bda
-DIST python-gentoo-patches-3.11.0_p2-r1.tar.xz 9140 BLAKE2B 3fa95d054c2702ec04f92493c1a721064a5119bfe555dc413f54977d2349d513c00586ec379ee3719e8c5a213c1c43b8702e945d1f6b746ba71dc53d70d98d9c SHA512 2372b40f5e5d391193c8560430c21d6b1d8d9aaefd8ea77aff68decc08addaea17c34ae3b3f754b6069bbab797f06361438585411276d680da2a18d6361be1fd
-DIST python-gentoo-patches-3.12.0a1_p2-r1.tar.xz 9168 BLAKE2B c2f1018c7890518c66051a3470bb4bec45342c0656a143e0a25ea5b2ec5c27a1285345f8f6fbc7eaea5e216ae1bd2462ecd6ad251851368921cb3fe816652d43 SHA512 7c5436768e3e4de8bafe16f0709115901c90892b127e6f81c06a6da4a3a35c973cb38542180c714d0f2848972db18a0f70e33f0a4dce9b037ea0d15ace045f5a
-DIST python-gentoo-patches-3.12.0a2.tar.xz 6164 BLAKE2B 734068ed87dae1bb30b61f42436664936f27c2507e89fde6da0ce10f791d444b54e8298810717e461b60b7fe572a8fbf2cc9c787e59f01aa0eb5fd1360b212bd SHA512 96e060dc6f2cf412cb1a1be251a6cdd2c30cd2706bfc669dfb920815bcc768b712ed53cc43ee6a1606504a19fdcd9492e7d88bf7e334e1dde2769aa7f1e6ed2d
-DIST python-gentoo-patches-3.8.15_p3-r1.tar.xz 30604 BLAKE2B 68ddeff291a70dfe22e8a0276b30db5a37d7e53dfc5d52c311573136f6fc322cddc65478684ed6339cd8156170588fe8ea3a454a5ec18e0bb91a898dc7c99f1e SHA512 ce9c73cd2b53c5c7f8bb27c65d5ea02bb7c38bfc1b25c972203fcea52bd1ffe4afcb65eedc8556b026a2faf0fc402f566c38b91ee54d6580bc958c0322e90e0a
-DIST python-gentoo-patches-3.9.15_p3-r1.tar.xz 26400 BLAKE2B 27198acf3e9087b96ef15328b9da6d80837a459c62b21c9785fde77dc6f4a5c8c4ccbc3cb48e5af684a253a978c5562fb1a342e6a554d2247aa968fd5890d6f5 SHA512 d658dc89ca29070de2a39d643cc9585ae7f66232dececfd7007cb57a6c6ededd30ae030dbe9226686b8517c48fdb5ed7e681decb64b207e41173a0993f461aea
+DIST python-gentoo-patches-3.10.9.tar.xz 12216 BLAKE2B ced4f951089c51ddaab6c62ade9d2c84f69e7e1baf2acf5247559534c7d0fb0e88dca1222f5bd2209b4e61f5aca17279b8054f269535dbc10de0786c2c5779f5 SHA512 2d01f0f3831beeba004517bb82f7d616f25f08e5c755409ecff79cd68e0a619b5bf6802fffd0e5f7f39f1d9d93e65b018b91cdeb337a5e47f1651f36bea0e96e
+DIST python-gentoo-patches-3.11.1.tar.xz 7076 BLAKE2B 3ec45f7529d34eabc9d9ba7fa7f8dd51d8754d9758a605b61857a9fd80386a0357837c925263ad7b0e207ff916944b94cc0e03c0f59921f839d5e51d92f0e47e SHA512 4253dbfa057a91db584b92550e2d39d87986f33041233bc400dd0254cbd95415b33fc47b0fe997bb84192c755bc16d3d31941bba4c216ee4d65facf0b48c7862
+DIST python-gentoo-patches-3.12.0a3.tar.xz 6152 BLAKE2B 6c8c88100d184440cf27a4b9baf4f192310f62960b2061adca8dd423745836048f3f8489c434c51ab7572320356bc889498d68f3635f174194d6009e1b9277e4 SHA512 7b0dbcbefeafbdb2a822bb06950844ff21336ba1685a2af6bf2bd32b1ecde7c17591d01b2a018105b8c094149a9804d709c3ca17af67378644ad40fd5e02c012
+DIST python-gentoo-patches-3.8.16.tar.xz 28716 BLAKE2B 28ccad9d77a89f80f72dd12eb89d657825e80061eaa069d4c491736bffd87b235f483b9d079b9f383377ea4bc6c19471bb6a4869a37fc0401abe28e2444fd9d2 SHA512 fe94ee2851af5c87c64ea3af5c1a744a53dcb03743f824a7726803daf454f38511894e24fe68be9de4ab59d1798161a3c320748309d04afd1e77906df353a246
+DIST python-gentoo-patches-3.9.16.tar.xz 23348 BLAKE2B 26b66e57530d167776d2aee60fd4620fc8e6c229f371616fdaa74aa2f03fd5a50b61653a5f34e0f2659901ba167af7c2aadbb0d2db773ab08bac8b3125c84b77 SHA512 8260369d96a6328ad8498359ecc56f48cb02015547065cdaec28a6bb2293bef420cb12764fae9fdd13f4a6faa60c4c402e804a22cbed7dca031ac1679032f9f6
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.8_p3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.9.ebuild
similarity index 95%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.8_p3.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.9.ebuild
index e7125a5118..bb4dfcde3e 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.8_p3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.9.ebuild
@@ -10,7 +10,7 @@ inherit python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}-r1"
+PATCHSET="python-gentoo-patches-${MY_PV}"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -230,6 +230,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -241,6 +244,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross.
 			--without-lto
@@ -253,7 +258,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -276,7 +284,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the Python it was pointed to
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.0_p2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.1.ebuild
similarity index 95%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.0_p2.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.1.ebuild
index 6888041b80..57e49df5e3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.0_p2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.1.ebuild
@@ -10,7 +10,7 @@ inherit python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}-r1"
+PATCHSET="python-gentoo-patches-${MY_PV}"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -219,6 +219,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -230,6 +233,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross to satisfy --with-build-python.
 			--without-lto
@@ -245,7 +250,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -268,7 +276,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the --with-build-python value
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha1_p2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha1_p2.ebuild
deleted file mode 100644
index 9c5e7029b3..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha1_p2.ebuild
+++ /dev/null
@@ -1,494 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_alpha/a}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}-r1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="
-	bluetooth build +ensurepip examples gdbm hardened libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	!!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	app-alternatives/awk
-	virtual/pkgconfig
-	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	# TODO: Makefile has annoying deps on expat headers
-	#rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-x test_gdb
-			-u-network
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha3.ebuild
similarity index 96%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha2.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha3.ebuild
index ec1c57a295..6a27753566 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha3.ebuild
@@ -215,6 +215,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -226,6 +229,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross to satisfy --with-build-python.
 			--without-lto
@@ -241,7 +246,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -264,7 +272,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the --with-build-python value
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.15_p3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16.ebuild
similarity index 94%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.15_p3.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16.ebuild
index 5f5bccbf66..6469ad3212 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.15_p3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16.ebuild
@@ -10,7 +10,7 @@ inherit python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}-r1"
+PATCHSET="python-gentoo-patches-${MY_PV}"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -184,6 +184,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -195,6 +198,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross.
 			--without-lto
@@ -207,7 +212,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -230,7 +238,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the Python it was pointed to
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.15_p3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16.ebuild
similarity index 95%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.15_p3.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16.ebuild
index 4ab4f51b7f..e6b2792925 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.15_p3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16.ebuild
@@ -10,7 +10,7 @@ inherit python-utils-r1 toolchain-funcs verify-sig
 MY_PV=${PV/_rc/rc}
 MY_P="Python-${MY_PV%_p*}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}-r1"
+PATCHSET="python-gentoo-patches-${MY_PV}"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="
@@ -224,6 +224,9 @@ src_configure() {
 	local -x OPT=
 
 	if tc-is-cross-compiler ; then
+		# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+		local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
 		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
 		# propagated to sysconfig for built extensions
 		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
@@ -235,6 +238,8 @@ src_configure() {
 		local myeconfargs_cbuild=(
 			"${myeconfargs[@]}"
 
+			--libdir="${cbuild_libdir:2}"
+
 			# As minimal as possible for the mini CBUILD Python
 			# we build just for cross.
 			--without-lto
@@ -247,7 +252,10 @@ src_configure() {
 
 		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
 		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+		# We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross.
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \
+			ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
 
 		# Avoid as many dependencies as possible for the cross build.
 		cat >> Makefile <<-EOF || die
@@ -270,7 +278,7 @@ src_configure() {
 		# not in src_compile, because CHOST configure for Python
 		# will check the existence of the Python it was pointed to
 		# immediately.
-		emake
+		PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake
 		popd &> /dev/null || die
 	fi
 

From 7de0e5f8a977fe88aa665b0d6d4f35cb6d92bb00 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:02 +0000
Subject: [PATCH 07/30] dev-libs/boost: Sync with Gentoo

It's from Gentoo commit ad6496f10ac3e6101a9886d73997245f7ff0a69b.
---
 .../files/boost-1.79.0-CVE-2012-2677.patch    | 121 ------------------
 .../boost-1.79.0-disable_icu_rpath.patch      |  29 -----
 .../boost-1.79.0-fix-mips1-transition.patch   |  39 ------
 3 files changed, 189 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch

diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch
deleted file mode 100644
index 5dfbf85bc6..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-CVE-2012-2677.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-https://src.fedoraproject.org/rpms/boost/raw/master/f/boost-1.58.0-pool.patch
-https://bugzilla.redhat.com/show_bug.cgi?id=828856
-https://bugs.gentoo.org/620468
-https://svn.boost.org/trac10/ticket/6701
-
---- a/boost/pool/pool.hpp
-+++ b/boost/pool/pool.hpp
-@@ -27,4 +27,6 @@
- #include <boost/pool/poolfwd.hpp>
- 
-+// std::numeric_limits
-+#include <boost/limits.hpp>
- // boost::integer::static_lcm
- #include <boost/integer/common_factor_ct.hpp>
-@@ -356,4 +358,11 @@
-     }
- 
-+    size_type max_chunks() const
-+    { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
-+      size_type partition_size = alloc_size();
-+      size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
-+      return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
-+    }
-+
-     static void * & nextof(void * const ptr)
-     { //! \returns Pointer dereferenced.
-@@ -375,5 +384,7 @@
-       //!   the first time that object needs to allocate system memory.
-       //!   The default is 32. This parameter may not be 0.
--      //! \param nmax_size is the maximum number of chunks to allocate in one block.
-+      //! \param nmax_size is the maximum number of chunks to allocate in one block.			
-+      set_next_size(nnext_size);
-+      set_max_size(nmax_size);
-     }
- 
-@@ -398,7 +409,7 @@
-     }
-     void set_next_size(const size_type nnext_size)
--    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
--      //! \returns nnext_size.
--      next_size = start_size = nnext_size;
-+    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.     
-+      BOOST_USING_STD_MIN();
-+      next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
-     }
-     size_type get_max_size() const
-@@ -408,5 +419,6 @@
-     void set_max_size(const size_type nmax_size)
-     { //! Set max_size.
--      max_size = nmax_size;
-+      BOOST_USING_STD_MIN();
-+      max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
-     }
-     size_type get_requested_size() const
-@@ -709,7 +721,7 @@
-   BOOST_USING_STD_MIN();
-   if(!max_size)
--    next_size <<= 1;
-+    set_next_size(next_size << 1);
-   else if( next_size*partition_size/requested_size < max_size)
--    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
-+    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
- 
-   //  initialize it,
-@@ -749,7 +761,7 @@
-   BOOST_USING_STD_MIN();
-   if(!max_size)
--    next_size <<= 1;
-+    set_next_size(next_size << 1);
-   else if( next_size*partition_size/requested_size < max_size)
--    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
-+    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
- 
-   //  initialize it,
-@@ -793,4 +805,6 @@
-   //! \returns Address of chunk n if allocated ok.
-   //! \returns 0 if not enough memory for n chunks.
-+  if (n > max_chunks())
-+    return 0;
- 
-   const size_type partition_size = alloc_size();
-@@ -841,7 +855,7 @@
-   BOOST_USING_STD_MIN();
-   if(!max_size)
--    next_size <<= 1;
-+    set_next_size(next_size << 1);
-   else if( next_size*partition_size/requested_size < max_size)
--    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
-+    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
- 
-   //  insert it into the list,
---- a/libs/pool/test/test_bug_6701.cpp
-+++ b/libs/pool/test/test_bug_6701.cpp
-@@ -0,0 +1,27 @@
-+/* Copyright (C) 2012 Étienne Dupuis
-+* 
-+* Use, modification and distribution is subject to the 
-+* Boost Software License, Version 1.0. (See accompanying
-+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
-+*/
-+
-+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
-+
-+#include <boost/pool/object_pool.hpp>
-+#include <boost/limits.hpp>
-+
-+int main()
-+{
-+  boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
-+
-+  void *x = p.malloc();
-+  BOOST_ASSERT(!x);
-+  
-+  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
-+  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
-+
-+  void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
-+  BOOST_ASSERT(!y);
-+
-+  return 0;
-+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch
deleted file mode 100644
index 32faf8d0eb..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-disable_icu_rpath.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/libs/locale/build/Jamfile.v2
-+++ b/libs/locale/build/Jamfile.v2
-@@ -65,8 +65,8 @@
- 
- if $(ICU_LINK)
- {
--    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
--    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
-+    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
-+    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
- }
- else
- {
-@@ -124,7 +124,6 @@
-       <library>icuuc/<link>shared/<runtime-link>shared 
-       <library>icudt/<link>shared/<runtime-link>shared 
-       <library>icuin/<link>shared/<runtime-link>shared
--      <dll-path>$(ICU_PATH)/bin
-         <runtime-link>shared ;
- 
- 
-@@ -183,7 +182,6 @@
-       <library>icuuc_64/<link>shared/<runtime-link>shared 
-       <library>icudt_64/<link>shared/<runtime-link>shared 
-       <library>icuin_64/<link>shared/<runtime-link>shared
--      <dll-path>$(ICU_PATH)/bin64
-         <runtime-link>shared ;
-  
-     
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch
deleted file mode 100644
index 81b29ac6ca..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://github.com/boostorg/boost/commit/791442bf1ed7a3b14893ed9e73ef2ab32b2a6026, and
-https://github.com/boostorg/config/commit/1a55d1d9c6d1cf7739645080bdd92fe903b4211e without the file renaming.
-
---- a/boostcpp.jam
-+++ b/boostcpp.jam
-@@ -634,7 +634,7 @@ rule address-model ( )
-     return <conditional>@boostcpp.deduce-address-model ;
- }
- 
--local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ;
-+local deducable-architectures = arm mips power riscv s390x sparc x86 combined ;
- feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ;
- for a in $(deducable-architectures)
- {
-@@ -645,10 +645,10 @@ rule deduce-architecture ( properties * )
- {
-     local result ;
-     local filtered = [ toolset-properties $(properties) ] ;
--    local names = arm mips1 power riscv s390x sparc x86 combined ;
-+    local names = arm mips power riscv s390x sparc x86 combined ;
-     local idx = [ configure.find-builds "default architecture" : $(filtered)
-         : /boost/architecture//arm
--        : /boost/architecture//mips1
-+        : /boost/architecture//mips
-         : /boost/architecture//power
-         : /boost/architecture//riscv
-         : /boost/architecture//s390x
---- a/libs/config/checks/architecture/Jamfile.jam
-+++ b/libs/config/checks/architecture/Jamfile.jam
-@@ -18,7 +18,8 @@ obj 64 : 64.cpp ;
- 
- obj arm      : arm.cpp ;
- obj combined : combined.cpp ;
--obj mips1    : mips1.cpp ;
-+obj mips     : mips1.cpp ;
-+alias mips1  : mips ; # Backwards compatibility
- obj power    : power.cpp ;
- obj riscv    : riscv.cpp ;
- obj sparc    : sparc.cpp ;

From 1a83b327421fcb285dcf5ac05ce50e20c1903201 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:05 +0000
Subject: [PATCH 08/30] dev-libs/libltdl: Sync with Gentoo

It's from Gentoo commit 22cafa1b14162e5b0441bc7f3a0d81552f0e3901.
---
 .../portage-stable/dev-libs/libltdl/Manifest  |  1 -
 .../dev-libs/libltdl/libltdl-2.4.6.ebuild     | 39 -------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.6.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/Manifest
index 123e05bfb2..d36ba6c576 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/Manifest
@@ -1,2 +1 @@
-DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.6.ebuild
deleted file mode 100644
index 31fd0f9499..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-MY_P="libtool-${PV}"
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-IUSE="static-libs"
-# libltdl doesn't have a testsuite.
-RESTRICT="test"
-
-RDEPEND="!<sys-devel/libtool-2.4.3-r2:2"
-BDEPEND="app-arch/xz-utils"
-
-S="${WORKDIR}/${MY_P}/libltdl"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-ltdl-install \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# While the libltdl.la file is not used directly, the m4 ltdl logic
-	# keys off of its existence when searching for ltdl support. #293921
-	#use static-libs || find "${D}" -name libltdl.la -delete
-}

From 3d07340f66ac620b8e3ceea5fac703671ad0c8cc Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:05 +0000
Subject: [PATCH 09/30] dev-libs/libpcre2: Sync with Gentoo

It's from Gentoo commit 087a2d2ec18b57f889c5e0d1ddf94b91057efd99.
---
 .../portage-stable/dev-libs/libpcre2/Manifest |  2 +
 .../libpcre2-10.10-000-Fix-multilib.patch     | 37 ++++++++
 .../libpcre2-10.41-pcre2posix-header.patch    | 66 +++++++++++++
 .../libpcre2/libpcre2-10.40-r1.ebuild         |  2 +-
 .../libpcre2/libpcre2-10.41-r1.ebuild         | 94 +++++++++++++++++++
 5 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.41-r1.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest
index a2a57687a4..2289724390 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest
@@ -1,3 +1,5 @@
 DIST libpcre2-10.36-patchset-01.tar.xz 1364 BLAKE2B bfef3c876a092e06972107b44794c23b758a030181f3040c8b722db166789eac794783169b468fc71334fd660bc2f1c31422a8cb8e5bdc18a69b72654b1b59b2 SHA512 04324d1efa6d155fa3ffbc328638e4674bea305fef7f57d4369ab4a6399a0f489b4c0ecfb49643feff310d91872e1673e965c48a5c60f1bf54a319f0d275c306
 DIST pcre2-10.40.tar.bz2 1765440 BLAKE2B 627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b SHA512 00e7b48a6554b9127cb6fe24c5cacf72783416a9754ec88f62f73c52f46ed72c86c1869e62c91a31b2ff2cbafbbedabca44b3f1eb7670bc92f49d8401c7374e8
 DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc30b9288e52753785ddcab37cc3e169d0f117d94e4ad7d7ff897a6ba0a574c9a2e529c3c7e171f5a1bc6f64fe23 SHA512 faa4b47fdac1543cd323651f251b8abb94b31b5966b42d445b8cbb38c441df4742e3c3517c2bc6c0a4464e9fb5feab5d5beda1250a03d56bec2d8383be2f63ab
+DIST pcre2-10.41.tar.bz2 1799126 BLAKE2B 4335eae8e8a327c32092a1a9f8214fa86a2d016deb7450938c4ddc38214b72dfa8c6f9c85a03bb36b3686390d378d74fdd991563f92611c42a54915310604559 SHA512 328f331a56f152424f6021b37f8dcf660842c55d43ff39f1b49115f0d05ed651d0bbb66b43c0ed61d65022030615768b92ce5e6218a54e4e17152ec473cca68d
+DIST pcre2-10.41.tar.bz2.sig 310 BLAKE2B 4ee3f9327bf568e38d1c072a4be93cdab4209e7b0cc0d183b978553cd7413ba9f292318ddf815cf44bc24872f685ee4ff9bceddd7d0e915b7be67c43fd8bf8f7 SHA512 4127258f17011be7c82d9412728863a9121c5b780514ec836769ab64ccd4cd5349a84fc85b8fdc4abb2e6fe08f4610b2a3e926116e7f1451d90d9afaa888661c
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch
new file mode 100644
index 0000000000..c216aa62d2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.10-000-Fix-multilib.patch
@@ -0,0 +1,37 @@
+From 8b6b10229201e5b148979a24e06c640dbbcfbad9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 20 Feb 2015 14:34:26 +0100
+Subject: [PATCH] Fix multilib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Do not set RPATH nor add explicit -L path to compiler.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+--- a/pcre2-config.in
++++ b/pcre2-config.in
+@@ -28,19 +28,7 @@ if test $# -eq 0; then
+ fi
+ 
+ libR=
+-case `uname -s` in
+-  *SunOS*)
+-  libR=" -R@libdir@"
+-  ;;
+-  *BSD*)
+-  libR=" -Wl,-R@libdir@"
+-  ;;
+-esac
+-
+ libS=
+-if test @libdir@ != /usr/lib ; then
+-  libS=-L@libdir@
+-fi
+ 
+ while test $# -gt 0; do
+   case "$1" in
+-- 
+2.1.0
+
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch
new file mode 100644
index 0000000000..12d8bb6093
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.41-pcre2posix-header.patch
@@ -0,0 +1,66 @@
+https://github.com/PCRE2Project/pcre2/commit/cd8dc40b901bdedf5bcc0b3acdd9eede16802f39
+https://github.com/PCRE2Project/pcre2/issues/173
+https://bugs.gentoo.org/884705
+
+From cd8dc40b901bdedf5bcc0b3acdd9eede16802f39 Mon Sep 17 00:00:00 2001
+From: Philip Hazel <Philip.Hazel@gmail.com>
+Date: Fri, 9 Dec 2022 09:40:52 +0000
+Subject: [PATCH] Move default of PCRE2_CALL_CONVENTION from pcre2posix.c to
+ pcre2posix.h
+
+--- a/src/pcre2posix.c
++++ b/src/pcre2posix.c
+@@ -92,20 +92,6 @@ changed. This #define is a copy of the one in pcre2_internal.h. */
+ #include "pcre2.h"
+ #include "pcre2posix.h"
+ 
+-/* When compiling with the MSVC compiler, it is sometimes necessary to include
+-a "calling convention" before exported function names. (This is secondhand
+-information; I know nothing about MSVC myself). For example, something like
+-
+-  void __cdecl function(....)
+-
+-might be needed. In order to make this easy, all the exported functions have
+-PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not
+-set, we ensure here that it has no effect. */
+-
+-#ifndef PCRE2_CALL_CONVENTION
+-#define PCRE2_CALL_CONVENTION
+-#endif
+-
+ /* Table to translate PCRE2 compile time error codes into POSIX error codes.
+ Only a few PCRE2 errors with a value greater than 23 turn into special POSIX
+ codes: most go to REG_BADPAT. The second table lists, in pairs, those that
+--- a/src/pcre2posix.h
++++ b/src/pcre2posix.h
+@@ -9,7 +9,7 @@ POSIX wrapper interface.
+ 
+                        Written by Philip Hazel
+      Original API code Copyright (c) 1997-2012 University of Cambridge
+-          New API code Copyright (c) 2016-2019 University of Cambridge
++          New API code Copyright (c) 2016-2022 University of Cambridge
+ 
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+@@ -116,6 +116,20 @@ typedef struct {
+   regoff_t rm_eo;
+ } regmatch_t;
+ 
++/* When compiling with the MSVC compiler, it is sometimes necessary to include
++a "calling convention" before exported function names. (This is secondhand
++information; I know nothing about MSVC myself). For example, something like
++
++  void __cdecl function(....)
++
++might be needed. In order to make this easy, all the exported functions have
++PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not
++set, we ensure here that it has no effect. */
++
++#ifndef PCRE2_CALL_CONVENTION
++#define PCRE2_CALL_CONVENTION
++#endif
++
+ /* When an application links to a PCRE2 DLL in Windows, the symbols that are
+ imported have to be identified as such. When building PCRE2, the appropriate
+ export settings are needed, and are set in pcre2posix.c before including this
+
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
index 552ef634d9..ade92b68ce 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
-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"
+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"
 IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.41-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.41-r1.ebuild
new file mode 100644
index 0000000000..e4703e3a15
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.41-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/philiphazel.asc
+inherit libtool multilib-minimal usr-ldscript verify-sig
+
+MY_P="pcre2-${PV/_rc/-RC}"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2
+		https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2
+		verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )"
+else
+	SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0/3" # libpcre2-posix.so version
+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"
+IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-philiphazel )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre2-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch
+	"${FILESDIR}"/${P}-pcre2posix-header.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-pcre2-8
+		--enable-shared
+		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+		$(multilib_native_use_enable libedit pcre2test-libedit)
+		$(multilib_native_use_enable readline pcre2test-libreadline)
+		$(multilib_native_use_enable zlib pcre2grep-libz)
+		$(use_enable jit)
+		$(use_enable jit pcre2grep-jit)
+		$(use_enable pcre16 pcre2-16)
+		$(use_enable pcre32 pcre2-32)
+		$(use_enable static-libs static)
+		$(use_enable unicode)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_test() {
+	emake check VERBOSE=yes
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
+}

From 07e5de6b538f4c42e550c837520ab6ff0cf51497 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:05 +0000
Subject: [PATCH 10/30] dev-libs/libxslt: Sync with Gentoo

It's from Gentoo commit 01b65c1ab8739171aa41a3ff28bc1c2fef2f8f46.
---
 .../{libxslt-1.1.37.ebuild => libxslt-1.1.37-r1.ebuild}     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 rename sdk_container/src/third_party/portage-stable/dev-libs/libxslt/{libxslt-1.1.37.ebuild => libxslt-1.1.37-r1.ebuild} (93%)

diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild
similarity index 93%
rename from sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild
index 2c7268bf94..151e80a2ac 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Note: Please bump this in sync with dev-libs/libxml2.
 
 PYTHON_COMPAT=( python3_{8..11} )
-inherit python-r1 multilib-minimal
+inherit flag-o-matic python-r1 multilib-minimal
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
@@ -53,6 +53,10 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Remove this after upstream merge request to add AC_SYS_LARGEFILE lands:
+	# https://gitlab.gnome.org/GNOME/libxslt/-/merge_requests/55
+	append-lfs-flags
+
 	libxslt_configure() {
 		ECONF_SOURCE="${S}" econf \
 			--without-python \

From 8392df7499c345919a106a06b6464e648835d856 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:07 +0000
Subject: [PATCH 11/30] dev-util/b2: Sync with Gentoo

It's from Gentoo commit a7764bed64842d82a4bcfa787c2d60896c20d269.
---
 .../portage-stable/dev-util/b2/Manifest       |  1 +
 .../dev-util/b2/b2-4.9.2.ebuild               |  2 +-
 .../dev-util/b2/b2-4.9.3.ebuild               | 66 +++++++++++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.3.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest
index 1879967af9..488992304b 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest
@@ -1 +1,2 @@
 DIST b2-4.9.2.tar.gz 975882 BLAKE2B 83c2ef85c9f1ae20922541ca8c344316f1660ee069426e3a9907c0a19e1c94db470c67d0c29a1f31788eddb86ab414ab06b9713f8ea53d974d1d8f0ca29f4aa5 SHA512 eab180770608b863dcf6a5fbc626e1733cf4353cf62f4189bd28258a03591fdb7853f5dddb4d3dad60f1bb06db5415025b792a30c2c65f7b1278f61e33f903e3
+DIST b2-4.9.3.tar.gz 975934 BLAKE2B 8d16e7227676786408f0d84efb577806e304a9181b89656dad1243b5b0b48e67d4226fa51ea97d4ea10110e4ea86f3ae2884d711fa4b04e36bdaa68dff0a4710 SHA512 8f861074a50720ad5469277a469523ef5f87ef2aab65d745f4c5e6af0ed8f40af91c43cd42b7845982c065974026ce1ecc77a831cd0c698c7e22fa848cc81009
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild
index 3adfbfd963..14e6346af9 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="Boost-1.0"
 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"
+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"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.3.ebuild
new file mode 100644
index 0000000000..f1a5c248ac
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://www.bfgroup.xyz/b2/"
+SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="Boost-1.0"
+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"
+IUSE="examples"
+RESTRICT="test"
+
+RDEPEND="!dev-util/boost-build"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch
+	"${FILESDIR}"/${PN}-4.9.2-odr.patch
+)
+
+src_configure() {
+	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
+	append-lfs-flags
+}
+
+src_compile() {
+	cd engine || die
+
+	# upstream doesn't want separate flags for CPPFLAGS/LDFLAGS
+	# https://github.com/bfgroup/b2/pull/187#issuecomment-1335688424
+	edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" -d+2 --without-python
+}
+
+src_test() {
+	# Forget tests, b2 is a lost cause
+	:
+}
+
+src_install() {
+	dobin engine/b2
+
+	insinto /usr/share/b2/src
+	doins -r "${FILESDIR}/site-config.jam" \
+		bootstrap.jam build-system.jam ../example/user-config.jam \
+		build kernel options tools util
+
+	find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}

From 8eccb08b66954c1aa847f979e34a7b2efbd4deb0 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:11 +0000
Subject: [PATCH 12/30] dev-util/gperf: Sync with Gentoo

It's from Gentoo commit 2ea07b25e4bdcbf5af59008efddf89e0e7525711.
---
 .../files/gperf-3.1-clang-16-wregister.patch  | 21 +++++++++++++++++++
 .../dev-util/gperf/gperf-3.1-r1.ebuild        |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/gperf/files/gperf-3.1-clang-16-wregister.patch

diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gperf/files/gperf-3.1-clang-16-wregister.patch b/sdk_container/src/third_party/portage-stable/dev-util/gperf/files/gperf-3.1-clang-16-wregister.patch
new file mode 100644
index 0000000000..4bbcca6d57
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-util/gperf/files/gperf-3.1-clang-16-wregister.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/882787
+https://git.savannah.gnu.org/gitweb/?p=gperf.git;a=commit;h=a63b830554920476881837eeacd4a6b507632b19
+
+From a63b830554920476881837eeacd4a6b507632b19 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sun, 30 Aug 2020 12:36:15 +0200
+Subject: [PATCH] Make the code C++17 compliant.
+
+* lib/getline.cc (getstr): Don't use the 'register' keyword.
+
+--- a/lib/getline.cc
++++ b/lib/getline.cc
+@@ -55,7 +55,7 @@ getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset)
+ 
+   for (;;)
+     {
+-      register int c = getc (stream);
++      int c = getc (stream);
+ 
+       /* We always want at least one char left in the buffer, since we
+          always (unless we get an error while reading the first char)
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild
index bdabce4d84..093d0f549a 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
 
 PATCHES=(
 	"${FILESDIR}"/${P}-strncmp-decl-mismatch.patch
+	"${FILESDIR}"/${P}-clang-16-wregister.patch
 )
 
 src_prepare() {

From ebc37402dcd5035cc59e0f3b797ac58751c2327a Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:12 +0000
Subject: [PATCH 13/30] dev-util/meson: Sync with Gentoo

It's from Gentoo commit 867748f9941c20e9d369311d3ae67d7b9de0409e.
---
 .../portage-stable/dev-util/meson/Manifest    |   2 -
 .../dev-util/meson/meson-0.63.2-r1.ebuild     | 117 -----------------
 .../dev-util/meson/meson-0.64.0.ebuild        | 120 ------------------
 3 files changed, 239 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.2-r1.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.0.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest
index d32c8f907f..a03f39fdf8 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest
@@ -1,4 +1,2 @@
-DIST meson-0.63.2.tar.gz 2063397 BLAKE2B 765ef8994168bb149cce4dbbbdab4a5531b1c1119db5dace1a66c2728241830c7de075d586187d3f987fcc99e4181176a5910da56552ba735dda110a641d2541 SHA512 770d8d82502c5cd419123e09f6a445d2cbaea4463c5fa79f1497c868bf5defc5e5779a6e550ef5fcf75d57322d2b25b61574f4df0cbf001c4325c6abdbbc30b4
 DIST meson-0.63.3.tar.gz 2067612 BLAKE2B aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8 SHA512 6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
-DIST meson-0.64.0.tar.gz 2090162 BLAKE2B 85fe35cba3b2b966a8ba818b305e6e75437af4315f8ce9b6bdc26324dc4a51e5ef3cbb16e23552db1d6191b8d08b1086640eb87e03a1dcfee794de492a0fa237 SHA512 0656515e983d98350081dc7cd726bff4a83ed1e24d414c022ea804317f2ff86052b53bbbc36e00847541f2cbe19ebe4c87bb35a174bf6321864363512a4cf6b0
 DIST meson-0.64.1.tar.gz 2089752 BLAKE2B e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07 SHA512 4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.2-r1.ebuild
deleted file mode 100644
index 8c8f381c95..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.2-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	MY_P=${P/_/}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-	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
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
-)
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" unittests/*.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# 'test cases/unit/73 summary' expects 80 columns
-		export COLUMNS=80
-
-		# If JAVA_HOME is not set, meson looks for javac in PATH.
-		# If javac is in /usr/bin, meson assumes /usr/include is a valid
-		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodetection. If no JDK is installed, we should end up with an empty
-		# value in JAVA_HOME, and the tests should get skipped.
-		export JAVA_HOME=$(java-config -O 2>/dev/null)
-
-		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
-		python3 run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-
-	dobashcomp data/shell-completions/bash/meson
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.0.ebuild
deleted file mode 100644
index 7eaa764dfc..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	MY_P=${P/_/}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		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
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
-)
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" unittests/*.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# 'test cases/unit/73 summary' expects 80 columns
-		export COLUMNS=80
-
-		# If JAVA_HOME is not set, meson looks for javac in PATH.
-		# If javac is in /usr/bin, meson assumes /usr/include is a valid
-		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodetection. If no JDK is installed, we should end up with an empty
-		# value in JAVA_HOME, and the tests should get skipped.
-		export JAVA_HOME=$(java-config -O 2>/dev/null)
-
-		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
-		python3 run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-
-	dobashcomp data/shell-completions/bash/meson
-}

From 13b6075d8ab1dbc804aea3e2289030088d3033ba Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:20 +0000
Subject: [PATCH 14/30] dev-vcs/git: Sync with Gentoo

It's from Gentoo commit d7aff30faa0328c8cc4097d99ca88fa7b5e95b1b.
---
 .../portage-stable/dev-vcs/git/Manifest       |   9 +-
 .../dev-vcs/git/git-2.38.2.ebuild             | 657 ++++++++++++++++++
 ....39.0_rc1.ebuild => git-2.39.0_rc2.ebuild} |   0
 3 files changed, 663 insertions(+), 3 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.38.2.ebuild
 rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.39.0_rc1.ebuild => git-2.39.0_rc2.ebuild} (100%)

diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest
index 4c565450b0..08609f6ee3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest
@@ -1,9 +1,12 @@
 DIST git-2.37.4.tar.xz 6990080 BLAKE2B 731ae7ff4247fd9d300b2b2b27074cce2d62b6333051bbdb161cdf644b4b40247963a978e1ed25a4f8fc9b544b52aa94ef97abf16db46ffcb688efab380efaec SHA512 f13a25548f6463ee0c3e662819a4af13dfafa8d18108534aeaebafd9a36c84dbea913402d781f7bc1436560c9937d76fd78b39cafa5864f576a1278ed96a9a80
 DIST git-2.38.1.tar.xz 7088208 BLAKE2B 50e4e9ef04d9eef7c10aba1f0d53d5d15f50ea9a8c344733e7a7865e2f2a833edb4f4b5882f47dd39389dfdedf22a813cfe3d35ab950d6543d21e0294ce17f2d SHA512 e62ca6f54f01d2e4ccffb5f94e8e5cd2f3e098b766d909c694a8daf4d00d5cdeb9cc5ff8e9bc55d888406f292ba99433d334d4da9689c0ce5d7299a3c67c90e0
-DIST git-2.39.0.rc1.tar.xz 7146844 BLAKE2B 02d457b2c05290de9bd47e85ce55f2bc7e4b649f898bbda971aa447881ba4da3cf750d065a3bb431c974bf4602403c99af92089467a1b7c9d8c6b95c11d6beb1 SHA512 c90496689cf4ef5bd0efe85ac1f52b53527603596bef064470bd6c30f6b5d067e001d4a2f2cbe10f57235f8a74b733d59bc8cd8051f6fa9475b6dfb4df67577e
+DIST git-2.38.2.tar.xz 7090572 BLAKE2B 80c72541c6cd7362ab5c8e92a2b81fbe80f5fcb3fac26680309ab30250a35f3bf3f1d613cc58bd570e52c81739a212969e28af4b7611ec8e08b8f15f5c9c4b8a SHA512 797c1cee61ff07b6f8502b1819d9797282aa82e33d023dffb4d395376b7a621d518017eaf38d05c6e5aba1372f2731985c53fcb46d43168b67b5bc8febedc6bc
+DIST git-2.39.0.rc2.tar.xz 7146628 BLAKE2B a33e1bf569fc946a68071506e53b74dc9006c468df43b4cdfd776329b476034c8504cdf295d9c696a447cb3ed7f0aabb195bc24bd5397f3b708e98f9152f01cd SHA512 31b6fda1fcbed027f20140066f77283bae1179da015fd01b3bee61ab4b313603b229b13b84680030ca65c4b9435133f209b9cc832caf9cff30824da816c3f687
 DIST git-htmldocs-2.37.4.tar.xz 1448376 BLAKE2B 2414b2f18e3c75c377400623f9e804b6fd5623724834ce52d2680cc10839466d52a8407cac9ed0c8c5928d65058963fe62e9ae2e31f1b695ea3a6fc18ea1938a SHA512 638feee014498af63ea083540b065778d3e3b7fdec9bb7f6e915bbc524e1525e0c4056f8af7d859376b60fcc936cb0ac1e6f83ff940e09f822dfa11570465db4
 DIST git-htmldocs-2.38.1.tar.xz 1479360 BLAKE2B 72d33a04c94ccb250def2136a2967fd333f3704f8e525f065b508cee890058546fec4e5b1349285b83768a7bd1513c0fac8d9ca287e5e964e6f1ec0d055ef7de SHA512 740da4546bdc0e9c4131e9dd0775662525aeb30a468fc4be63bb09c728da2903d479da5b7ef25d5ee029690ff5c9640de0271c7defcba1fadfa4a21f96d0aa8b
-DIST git-htmldocs-2.39.0.rc1.tar.xz 1503072 BLAKE2B fe8beca129e7bc1dfc2198ad304adf92d88d43a6e50609831f8974dd3cc1e76e0317be8fa5fe2172aae930b622de7870e52f7faeb2b0f4715927745631c10be0 SHA512 e9de3cd8fb84d2bbe38b6185f732c9167b375fd12554f92b00d13cf9d772d9b9970fd83d61546251ff984c61c91565942157c32a3f49ebc57d77cbc3ece9ca34
+DIST git-htmldocs-2.38.2.tar.xz 1479720 BLAKE2B 270454b0692e9ef678ec5ba5a8bbf5b119230981a29928dd256c5851beb5db0db1c12084f091e57bf7cfe011a7c166f5e341be03d98fade7d848cd069fcf6f0e SHA512 9e505f38658384381c22ff7b0502313b2ac842f89d2f8c27d3a03cb0a51fe23f06541fbdd0e5729a056baafc06689fa9faa40f74d8a456d00d5c5c7ef9b39dd0
+DIST git-htmldocs-2.39.0.rc2.tar.xz 1503264 BLAKE2B cc6e70fc6c7bf620c76da7f4651165cb2e06ae3c4c9dae9da6696a9bacb460d08629f837e9b62fa7be54ea1d7342894dc33bb12c5fff305627581130261f2c1f SHA512 92bb44dc85ed878c1a11fffafae0b8889d03f48c1a7a7f2fd70797f0af1dd9ed33f14c1969247cc18e4671af90a57cf5d8786ef1e60a818c6e8b333fc33368fa
 DIST git-manpages-2.37.4.tar.xz 510016 BLAKE2B 03cba56a27039547429eca6a3dfda600d2b1332a6b0da321a1abc8bb311b03e46c389fdbbd7aafc8b5863730e9417ebbd3195ce04408e3f229e646d134a2ac13 SHA512 8cf5ae54ae3e86929f375ea2d229ecda7d8b5c8a7f7fbe790334fcd38069285b58636320b1886030402ac9d46ed324c1d26784fff14077f661c43ef98b5f5ec7
 DIST git-manpages-2.38.1.tar.xz 553484 BLAKE2B 991e7f3916106e346921f6ae281df803b663b7fb4584f98f48f61a121030db8e5a1a97ecb147bf1559408893d3c9692c58b2890ff5a5a00bd451d8f20b73efdb SHA512 d2c75efc497ec62733be0ae0092a256dedb2a24b765e516218c9d96466aef34a0f2a118f68618ea457bf0fb39f5986c52022870116de974b21f541e0994c7d67
-DIST git-manpages-2.39.0.rc1.tar.xz 557232 BLAKE2B 5bc878cccda24dee906f1c7e4f286539f8c8db29dd5d4b5eee111e45d2eb02c380be6cea1c01e34fdd7c9336bd0c476edba3f32121c3c042c938c4e178a9a5f3 SHA512 f43cb08eb00371995e98336f99db6fd0551d6abc069c0db5a1293a8cc4a0d426ea1c2d7f6b7bd4e38db9d82ee0aad24e7e5ff15ed3e2a4cec30e81503c7eb5ec
+DIST git-manpages-2.38.2.tar.xz 553556 BLAKE2B 781b50a011d1c329fcdf3c01a94fecf5a388a03ca39e71aac07908e02982ed472d27a581184d894acbad441c945457c32dcb359ee0bcf70671af893e10c8bde4 SHA512 3214887045a6b3ff734794d67f17914324de401badae86ca40e16935f81cca183b3d762519922fa03a260dae218acc407896335ae96a17f433a3115e71512fbf
+DIST git-manpages-2.39.0.rc2.tar.xz 557304 BLAKE2B 0db29a436c709b7cdb45abd5e10d26aba2136b5fa7a501b4313083780ece66d846cc4012b14061ed1f31f368c8407fde021cc092693a64763067fab852f2a7f4 SHA512 d30b27251de23053afe2c34ba7b18c8ab7beaf33278d3dcb90aec76147f289b3844eaa1da2dd08950f2398b8541f1538025ecd502b9efc37deadb9b3e8ddea17
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.38.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.38.2.ebuild
new file mode 100644
index 0000000000..f68fb68b1f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.38.2.ebuild
@@ -0,0 +1,657 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+
+	inherit git-r3
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case ${PVR} in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+
+	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
+
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		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
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	dev-libs/openssl:=
+	sys-libs/zlib
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	iconv? ( virtual/libiconv )
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:= )
+"
+RDEPEND="
+	${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	gnome-keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Avoid automagic CVS, bug #350330
+	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned!"
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+
+		$(usev elibc_musl NO_REGEX=YesPlease)
+		$(usev !cvs NO_CVS=YesPlease)
+		$(usev !iconv NO_ICONV=YesPlease)
+		$(usev !nls NO_GETTEXT=YesPlease)
+		$(usev !perforce NO_PYTHON=YesPlease)
+		$(usev !subversion NO_SVN_TESTS=YesPlease)
+		$(usev !tk NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# Broken assumptions because of static build system
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# Can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+
+		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	myopts+=( ASCIIDOC8=YesPlease )
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
+	fi
+
+}
+
+src_prepare() {
+	# Add experimental patches to improve mediawiki support,
+	# see patches for origin.
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	if ! use safe-directory ; then
+		# This patch neuters the "safe directory" detection.
+		# bugs #838271, #838223
+		PATCHES+=(
+			"${FILESDIR}"/git-2.37.2-unsafe-directory.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+
+	local mymakeargs=(
+		${MY_MAKEOPTS}
+
+		prefix="${EPREFIX}"/usr
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
+		sysconfdir="${EPREFIX}"/etc
+
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+		# TODO: --verbose?
+		GIT_TEST_OPTS="--no-color"
+
+		OPTAR="$(tc-getAR)"
+		OPTCC="$(tc-getCC)"
+		OPTCFLAGS="${CFLAGS}"
+		OPTLDFLAGS="${LDFLAGS}"
+
+		PERL_PATH="${EPREFIX}/usr/bin/perl"
+		PERL_MM_OPT=""
+
+		PYTHON_PATH="${PYTHON_PATH}"
+
+		V=1
+		"$@"
+	)
+
+	emake "${mymakeargs[@]}"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake
+
+	if use perl && use cgi ; then
+		git_emake gitweb
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		git_emake -C contrib/credential/osxkeychain
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man
+		if use doc ; then
+			git_emake info html
+		fi
+	else
+		if use doc ; then
+			git_emake info
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		git_emake -C contrib/credential/libsecret
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	git_emake -C contrib/diff-highlight
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git
+	fi
+}
+
+src_test() {
+	local disabled=(
+		# We make safe-directory optional
+		t0033-safe-directory.sh
+	)
+
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - removed upstream
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+		elog "completion."
+		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+		elog "Note that the prompt bash code is now in that separate script"
+	fi
+
+	optfeature_header "Some scripts require additional dependencies:"
+	optfeature git-quiltimport dev-util/quilt
+	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
+
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.0_rc1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.0_rc2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.0_rc1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.0_rc2.ebuild

From a592757f930905ed79c17513f8724a397cbbb099 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:23 +0000
Subject: [PATCH 15/30] eclass/cmake: Sync with Gentoo

It's from Gentoo commit b75eb1da707e7917830e37b4f4319ef52fc30d53.
---
 .../src/third_party/portage-stable/eclass/cmake.eclass       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass
index bd7e64cfe6..094b6d706b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass
@@ -15,8 +15,7 @@
 # @DESCRIPTION:
 # The cmake eclass makes creating ebuilds for cmake-based packages much easier.
 # It provides all inherited features (DOCS, HTML_DOCS, PATCHES) along with
-# out-of-source builds (default), in-source builds and an implementation of the
-# well-known use_enable function for CMake.
+# out-of-source builds (default) and in-source builds.
 
 case ${EAPI} in
 	7|8) ;;
@@ -355,7 +354,7 @@ cmake_src_prepare() {
 
 	default_src_prepare
 
-	# check if CMakeLists.txt exist and if no then die
+	# check if CMakeLists.txt exists and if not then die
 	if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
 		eerror "Unable to locate CMakeLists.txt under:"
 		eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""

From cbe659043fd6c93e4033bebefd3e686a664c2011 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:26 +0000
Subject: [PATCH 16/30] eclass/flag-o-matic: Sync with Gentoo

It's from Gentoo commit 0af9e8d12524b8ce286bcdad23a0a3d8d8ae9b40.
---
 .../src/third_party/portage-stable/eclass/flag-o-matic.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass b/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass
index 365741a6dd..a4e8f19e00 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass
@@ -986,7 +986,7 @@ append-atomic-flags() {
 	# fails because -latomic is actually needed or if we have a
 	# broken toolchain (like due to bad FLAGS)
 	read -r -d '' code <<- EOF
-		int main()
+		int main(void)
 		{
 			return 0;
 		}
@@ -1007,7 +1007,7 @@ append-atomic-flags() {
 		# https://github.com/buildroot/buildroot/commit/6856e417da4f3aa77e2a814db2a89429af072f7d
 		read -r -d '' code <<- EOF
 			#include <stdint.h>
-			int main()
+			int main(void)
 			{
 				uint$((${bytesize} * 8))_t a = 0;
 				__atomic_add_fetch(&a, 3, __ATOMIC_RELAXED);

From f598342f7f531902a963371b8efb7abbbb636ec9 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:38 +0000
Subject: [PATCH 17/30] eclass/linux-mod: Sync with Gentoo

It's from Gentoo commit f59498ed6e49ef1c6e87392e71680877f8a705ca.
---
 .../src/third_party/portage-stable/eclass/linux-mod.eclass      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass
index 7e99938928..ff2294f1e4 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass
@@ -186,7 +186,6 @@ RDEPEND="
 	${MODULES_OPTIONAL_USE:+)}"
 DEPEND="${RDEPEND}
     ${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (}
-	sys-apps/sed
 	kernel_linux? ( virtual/linux-sources virtual/libelf )
 	${MODULES_OPTIONAL_USE:+)}"
 
@@ -653,6 +652,7 @@ linux-mod_src_compile() {
 			einfo "Preparing ${modulename} module"
 			if [[ -n ${ECONF_PARAMS} ]]
 			then
+				eqawarn "This package relies on the deprecated functionality of econf being called in linux-mod_src_compile (ECONF_PARAMS), which will go away in 30 days (20230107) (https://bugs.gentoo.org/340597)"
 				econf ${ECONF_PARAMS} || \
 				die "Unable to run econf ${ECONF_PARAMS}"
 			fi

From d72742215e8318fd39d9318034a63d2f39eda292 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:14:38 +0000
Subject: [PATCH 18/30] eclass/llvm: Sync with Gentoo

It's from Gentoo commit 8599d81ad63fc46bf04061c99292f1814e022333.
---
 .../portage-stable/eclass/llvm.eclass         | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass b/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass
index 16596ec2ea..7657de4bc5 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass
@@ -87,11 +87,11 @@ DEPEND="!!sys-devel/llvm:0"
 # Correct values of LLVM slots, newest first.
 declare -g -r _LLVM_KNOWN_SLOTS=( {16..8} )
 
-# @FUNCTION: get_llvm_prefix
+# @FUNCTION: get_llvm_slot
 # @USAGE: [-b|-d] [<max_slot>]
 # @DESCRIPTION:
 # Find the newest LLVM install that is acceptable for the package,
-# and print an absolute path to it.
+# and print its major version number (i.e. slot).
 #
 # If -b is specified, the checks are performed relative to BROOT,
 # and BROOT-path is returned.  This is appropriate when your package
@@ -114,7 +114,7 @@ declare -g -r _LLVM_KNOWN_SLOTS=( {16..8} )
 # is acceptable, false otherwise. If llvm_check_deps() is not defined,
 # the function defaults to checking whether sys-devel/llvm:${LLVM_SLOT}
 # is installed.
-get_llvm_prefix() {
+get_llvm_slot() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	local hv_switch=-d
@@ -126,23 +126,12 @@ get_llvm_prefix() {
 		shift
 	done
 
-	local prefix=
-	if [[ ${EAPI} != 6 ]]; then
-		case ${hv_switch} in
-			-b)
-				prefix=${BROOT}
-				;;
-			-d)
-				prefix=${ESYSROOT}
-				;;
-		esac
-	else
+	if [[ ${EAPI} == 6 ]]; then
 		case ${hv_switch} in
 			-b)
 				die "${FUNCNAME} -b is not supported in EAPI ${EAPI}"
 				;;
 			-d)
-				prefix=${EPREFIX}
 				hv_switch=
 				;;
 		esac
@@ -168,7 +157,7 @@ get_llvm_prefix() {
 			has_version ${hv_switch} "sys-devel/llvm:${slot}" || continue
 		fi
 
-		echo "${prefix}/usr/lib/llvm/${slot}"
+		echo "${slot}"
 		return
 	done
 
@@ -180,6 +169,31 @@ get_llvm_prefix() {
 	die "No LLVM slot${1:+ <= ${1}} satisfying the package's dependencies found installed!"
 }
 
+# @FUNCTION: get_llvm_prefix
+# @USAGE: [-b|-d] [<max_slot>]
+# @DESCRIPTION:
+# Find the newest LLVM install that is acceptable for the package,
+# and print an absolute path to it.
+#
+# The options and behavior is the same as for get_llvm_slot.
+get_llvm_prefix() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local prefix=${EPREFIX}
+	if [[ ${EAPI} != 6 ]]; then
+		case ${1} in
+			-b)
+				prefix=${BROOT}
+				;;
+			*)
+				prefix=${ESYSROOT}
+				;;
+		esac
+	fi
+
+	echo "${prefix}/usr/lib/llvm/$(get_llvm_slot "${@}")"
+}
+
 # @FUNCTION: llvm_fix_clang_version
 # @USAGE: <variable-name>...
 # @DESCRIPTION:
@@ -256,12 +270,16 @@ llvm_pkg_setup() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${MERGE_TYPE} != binary ]]; then
+		LLVM_SLOT=$(get_llvm_slot "${LLVM_MAX_SLOT}")
+
 		llvm_fix_clang_version CC CPP CXX
 		# keep in sync with profiles/features/llvm/make.defaults!
 		llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
 		llvm_fix_tool_path READELF STRINGS STRIP
 
-		local llvm_path=$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin
+		local prefix=${EPREFIX}
+		[[ ${EAPI} != 6 ]] && prefix=${ESYSROOT}
+		local llvm_path=${prefix}/usr/lib/llvm/${LLVM_SLOT}/bin
 		local IFS=:
 		local split_path=( ${PATH} )
 		local new_path=()

From 04ae6b27c838e72443578b568a85e1c9ad6f2357 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:15:00 +0000
Subject: [PATCH 19/30] eclass/toolchain-funcs: Sync with Gentoo

It's from Gentoo commit 65f7023eaf9b4456a018a2e973df0b7f067a2600.
---
 .../portage-stable/eclass/toolchain-funcs.eclass    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
index 32e446cb23..61a29d1b6e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
@@ -442,7 +442,8 @@ tc-env_build() {
 # @CODE
 econf_build() {
 	local CBUILD=${CBUILD:-${CHOST}}
-	tc-env_build econf --build=${CBUILD} --host=${CBUILD} "$@"
+	econf_env() { CHOST=${CBUILD} econf "$@"; }
+	tc-env_build econf_env "$@"
 }
 
 # @FUNCTION: tc-ld-is-gold
@@ -466,7 +467,7 @@ tc-ld-is-gold() {
 	# options and not CFLAGS/CXXFLAGS.
 	local base="${T}/test-tc-gold"
 	cat <<-EOF > "${base}.c"
-	int main() { return 0; }
+	int main(void) { return 0; }
 	EOF
 	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
 	rm -f "${base}"*
@@ -499,7 +500,7 @@ tc-ld-is-lld() {
 	# options and not CFLAGS/CXXFLAGS.
 	local base="${T}/test-tc-lld"
 	cat <<-EOF > "${base}.c"
-	int main() { return 0; }
+	int main(void) { return 0; }
 	EOF
 	out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1)
 	rm -f "${base}"*
@@ -538,7 +539,7 @@ tc-ld-force-bfd() {
 	# to its value (like multilib).  #545218
 	local ld=$(tc-getLD "$@")
 	local bfd_ld="${ld%% *}.bfd"
-	local path_ld=$(which "${bfd_ld}" 2>/dev/null)
+	local path_ld=$(type -P "${bfd_ld}" 2>/dev/null)
 	[[ -e ${path_ld} ]] && export LD=${bfd_ld}
 
 	# Set up LDFLAGS to select bfd based on the gcc / clang version.
@@ -583,7 +584,7 @@ _tc-has-openmp() {
 	local base="${T}/test-tc-openmp"
 	cat <<-EOF > "${base}.c"
 	#include <omp.h>
-	int main() {
+	int main(void) {
 		int nthreads, tid, ret = 0;
 		#pragma omp parallel private(nthreads, tid)
 		{
@@ -1083,7 +1084,7 @@ gen_usr_ldscript() {
 		# If they're using gold, manually invoke the old bfd. #487696
 		local d="${T}/bfd-linker"
 		mkdir -p "${d}"
-		ln -sf $(which ${CHOST}-ld.bfd) "${d}"/ld
+		ln -sf $(type -P ${CHOST}-ld.bfd) "${d}"/ld
 		flags+=( -B"${d}" )
 	fi
 	output_format=$($(tc-getCC) "${flags[@]}" 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')

From 2cdaf14981adfdace495062d78610a417bea3e61 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:15:06 +0000
Subject: [PATCH 20/30] licenses: Sync with Gentoo

It's from Gentoo commit e31085dbd2d920a435b1bebc7f132d4d8f20ea63.
---
 .../third_party/portage-stable/licenses/AOM   | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/licenses/AOM

diff --git a/sdk_container/src/third_party/portage-stable/licenses/AOM b/sdk_container/src/third_party/portage-stable/licenses/AOM
new file mode 100644
index 0000000000..1de4dd7531
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/licenses/AOM
@@ -0,0 +1,107 @@
+**Alliance for Open Media Patent License 1.0**
+
+ 1. **License Terms.**
+
+    **Patent License.** Subject to the terms and conditions of this License, each
+     Licensor, on behalf of itself and successors in interest and assigns,
+     grants Licensee a non-sublicensable, perpetual, worldwide, non-exclusive,
+     no-charge, royalty-free, irrevocable (except as expressly stated in this
+     License) patent license to its Necessary Claims to make, use, sell, offer
+     for sale, import or distribute any Implementation.
+
+     **Conditions.**
+
+    *Availability.* As a condition to the grant of rights to Licensee to make,
+       sell, offer for sale, import or distribute an Implementation under
+       Section 1.1, Licensee must make its Necessary Claims available under
+       this License, and must reproduce this License with any Implementation
+       as follows:
+
+          a. For distribution in source code, by including this License in the
+          root directory of the source code with its Implementation.
+
+          b. For distribution in any other form (including binary, object form,
+          and/or hardware description code (e.g., HDL, RTL, Gate Level Netlist,
+          GDSII, etc.)), by including this License in the documentation, legal
+          notices, and/or other written materials provided with the
+          Implementation.
+
+    *Additional Conditions.* This license is directly from Licensor to
+       Licensee.  Licensee acknowledges as a condition of benefiting from it
+       that no rights from Licensor are received from suppliers, distributors,
+       or otherwise in connection with this License.
+
+    **Defensive Termination**. If any Licensee, its Affiliates, or its agents
+     initiates patent litigation or files, maintains, or voluntarily
+     participates in a lawsuit against another entity or any person asserting
+     that any Implementation infringes Necessary Claims, any patent licenses
+     granted under this License directly to the Licensee are immediately
+     terminated as of the date of the initiation of action unless 1) that suit
+     was in response to a corresponding suit regarding an Implementation first
+     brought against an initiating entity, or 2) that suit was brought to
+     enforce the terms of this License (including intervention in a third-party
+     action by a Licensee).
+
+    **Disclaimers.** The Reference Implementation and Specification are provided
+     "AS IS" and without warranty. The entire risk as to implementing or
+     otherwise using the Reference Implementation or Specification is assumed
+     by the implementer and user. Licensor expressly disclaims any warranties
+     (express, implied, or otherwise), including implied warranties of
+     merchantability, non-infringement, fitness for a particular purpose, or
+     title, related to the material. IN NO EVENT WILL LICENSOR BE LIABLE TO
+     ANY OTHER PARTY FOR LOST PROFITS OR ANY FORM OF INDIRECT, SPECIAL,
+     INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER FROM ANY CAUSES OF
+     ACTION OF ANY KIND WITH RESPECT TO THIS LICENSE, WHETHER BASED ON BREACH
+     OF CONTRACT, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE, AND WHETHER OR
+     NOT THE OTHER PARTRY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+2. **Definitions.**
+
+     **Affiliate.**  "Affiliate" means an entity that directly or indirectly
+     Controls, is Controlled by, or is under common Control of that party.
+
+    **Control.** "Control" means direct or indirect control of more than 50% of
+     the voting power to elect directors of that corporation, or for any other
+     entity, the power to direct management of such entity.
+
+    **Decoder.**  "Decoder" means any decoder that conforms fully with all
+     non-optional portions of the Specification.
+
+    **Encoder.**  "Encoder" means any encoder that produces a bitstream that can
+     be decoded by a Decoder only to the extent it produces such a bitstream.
+
+    **Final Deliverable.**  "Final Deliverable" means the final version of a
+     deliverable approved by the Alliance for Open Media as a Final
+     Deliverable.
+
+    **Implementation.**  "Implementation" means any implementation, including the
+     Reference Implementation, that is an Encoder and/or a Decoder. An
+     Implementation also includes components of an Implementation only to the
+     extent they are used as part of an Implementation.
+
+    **License.** "License" means this license.
+
+    **Licensee.** "Licensee" means any person or entity who exercises patent
+     rights granted under this License.
+
+    **Licensor.**  "Licensor" means (i) any Licensee that makes, sells, offers
+     for sale, imports or distributes any Implementation, or (ii) a person
+     or entity that has a licensing obligation to the Implementation as a
+     result of its membership and/or participation in the Alliance for Open
+     Media working group that developed the Specification.
+
+    **Necessary Claims.**  "Necessary Claims" means all claims of patents or
+      patent applications, (a) that currently or at any time in the future,
+      are owned or controlled by the Licensor, and (b) (i) would be an
+      Essential Claim as defined by the W3C Policy as of February 5, 2004
+      (https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential)
+      as if the Specification was a W3C Recommendation; or (ii) are infringed
+      by the Reference Implementation.
+
+     **Reference Implementation.** "Reference Implementation" means an Encoder
+      and/or Decoder released by the Alliance for Open Media as a Final
+      Deliverable.
+
+     **Specification.** "Specification" means the specification designated by
+      the Alliance for Open Media as a Final Deliverable for which this
+      License was issued.

From 07bcf8ae606a1986c924e8873826b97e20b992b1 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:15:06 +0000
Subject: [PATCH 21/30] net-analyzer/nmap: Sync with Gentoo

It's from Gentoo commit 350458ecda5f78ef834191b50029b1e48548f188.
---
 .../nmap/files/nmap-9999-python3.patch        | 103 ++++++++++++++++++
 .../net-analyzer/nmap/metadata.xml            |   2 +
 .../net-analyzer/nmap/nmap-9999.ebuild        |  74 +++++++++----
 3 files changed, 157 insertions(+), 22 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/nmap/files/nmap-9999-python3.patch

diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/files/nmap-9999-python3.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/files/nmap-9999-python3.patch
new file mode 100644
index 0000000000..3d740d759b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/files/nmap-9999-python3.patch
@@ -0,0 +1,103 @@
+https://github.com/nmap/nmap/pull/2580
+
+From 14f8e230a61748b1cde86d13a2cf2353d7ad1fa7 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 9 Dec 2022 15:58:35 +0000
+Subject: [PATCH] zenmap: further Python 3 compatibility fixes
+
+Without this, we get:
+```
+Traceback (most recent call last):
+  File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 584, in <module>
+    setup(**setup_args)
+  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 185, in setup
+    return run_commands(dist)
+  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/core.py", line 201, in run_commands
+    dist.run_commands()
+  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 969, in run_commands
+    self.run_command(cmd)
+  File "/usr/lib/python3.10/site-packages/setuptools/dist.py", line 1208, in run_command
+    super().run_command(command)
+  File "/usr/lib/python3.10/site-packages/setuptools/_distutils/dist.py", line 988, in run_command
+    cmd_obj.run()
+  File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 188, in run
+    self.write_installed_files()
+  File "/var/tmp/portage/net-analyzer/nmap-9999/work/nmap-9999/zenmap/setup.py", line 419, in write_installed_files
+    print >> f, output
+TypeError: unsupported operand type(s) for >>: 'builtin_function_or_method' and '_io.TextIOWrapper'. Did you mean "print(<message>, file=<output_stream>)"?
+make: *** [Makefile:372: install-zenmap] Error 1
+```
+
+This is because Python 3 doesn't support Python 2-style print without
+parentheses, or specifying the output file in that manner.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/zenmap/setup.py
++++ b/zenmap/setup.py
+@@ -215,13 +215,13 @@ def create_uninstaller(self):
+ #!/usr/bin/env python3
+ import errno, os, os.path, sys
+ 
+-print 'Uninstall %(name)s %(version)s'
++print('Uninstall %(name)s %(version)s')
+ 
+ answer = raw_input('Are you sure that you want to uninstall '
+     '%(name)s %(version)s? (yes/no) ')
+ 
+ if answer != 'yes' and answer != 'y':
+-    print 'Not uninstalling.'
++    print('Not uninstalling.')
+     sys.exit(0)
+ 
+ """ % {'name': APP_DISPLAY_NAME, 'version': VERSION}
+@@ -237,8 +237,8 @@ def create_uninstaller(self):
+                     # This should never happen (everything gets installed
+                     # inside the root), but if it does, be safe and don't
+                     # delete anything.
+-                    uninstaller += ("print '%s was not installed inside "
+-                        "the root %s; skipping.'\n" % (output, self.root))
++                    uninstaller += ("print('%s was not installed inside "
++                        "the root %s; skipping.')\n" % (output, self.root))
+                     continue
+                 output = path_strip_prefix(output, self.root)
+                 assert os.path.isabs(output)
+@@ -262,24 +262,24 @@ def create_uninstaller(self):
+         dirs.append(path)
+ # Delete the files.
+ for file in files:
+-    print "Removing '%s'." % file
++    print("Removing '%s'." % file)
+     try:
+         os.remove(file)
+     except OSError as e:
+-        print >> sys.stderr, '  Error: %s.' % str(e)
++        print('  Error: %s.' % str(e), file=sys.stderr)
+ # Delete the directories. First reverse-sort the normalized paths by
+ # length so that child directories are deleted before their parents.
+ dirs = [os.path.normpath(dir) for dir in dirs]
+ dirs.sort(key = len, reverse = True)
+ for dir in dirs:
+     try:
+-        print "Removing the directory '%s'." % dir
++        print("Removing the directory '%s'." % dir)
+         os.rmdir(dir)
+     except OSError as e:
+         if e.errno == errno.ENOTEMPTY:
+-            print "Directory '%s' not empty; not removing." % dir
++            print("Directory '%s' not empty; not removing." % dir)
+         else:
+-            print >> sys.stderr, str(e)
++            print(str(e), file=sys.stderr)
+ """
+ 
+         uninstaller_file = open(uninstaller_filename, 'w')
+@@ -419,7 +419,7 @@ def write_installed_files(self):
+         with open(INSTALLED_FILES_NAME, "w") as f:
+             for output in self.get_installed_files():
+                 assert "\n" not in output
+-                print >> f, output
++                print(output, file=f)
+ 
+ 
+ class my_uninstall(Command):
+
diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/metadata.xml b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/metadata.xml
index 25a7096118..92acf338fc 100644
--- a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/metadata.xml
@@ -16,10 +16,12 @@
 	<use>
 		<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="ncat">Install the ncat utility</flag>
+		<flag name="ndiff">Install the ndiff utility</flag>
 		<flag name="nping">Install the nping utility</flag>
 		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
 		<flag name="symlink">Install symlink to nc</flag>
 		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
+		<flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nmap/nmap</remote-id>
diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-9999.ebuild
index 7fc911c6d8..4588e1d360 100644
--- a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-9999.ebuild
@@ -6,7 +6,9 @@ EAPI=8
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{8..11} )
-inherit autotools lua-single python-any-r1 toolchain-funcs
+PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
+PLOCALE_BACKUP="en"
+inherit autotools lua-single plocale python-single-r1 toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
@@ -27,8 +29,9 @@ fi
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap"
 REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	system-lua? ( nse ${LUA_REQUIRED_USE} )
 	symlink? ( ncat )
 "
@@ -37,12 +40,14 @@ RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap
+	ndiff? ( ${PYTHON_DEPS} )
 	libssh2? (
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
+	nls? ( virtual/libintl )
 	nse? ( sys-libs/zlib )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( dev-libs/openssl:= )
 	symlink? (
 		ncat? (
 			!net-analyzer/netcat
@@ -50,11 +55,18 @@ RDEPEND="
 		)
 	)
 	system-lua? ( ${LUA_DEPS} )
+	zenmap? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
 "
 
 if [[ ${PV} != *9999* ]] ; then
@@ -72,20 +84,30 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
 	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
 	"${FILESDIR}"/${PN}-9999-netutil-else.patch
+	"${FILESDIR}"/${PN}-9999-python3.patch
 )
 
 pkg_setup() {
-	python-any-r1_pkg_setup
+	python-single-r1_pkg_setup
 
 	use system-lua && lua-single_pkg_setup
 }
 
 src_prepare() {
+	default
+
+	# Drop bundled libraries
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
 	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
 
-	default
+	delete_disabled_locale() {
+		# Force here as PLOCALES contains supported locales for man
+		# pages and zenmap doesn't have all of those
+		rm -rf zenmap/share/zenmap/locale/${1} || die
+		rm -f zenmap/share/zenmap/locale/${1}.po || die
+	}
+	plocale_for_each_disabled_locale delete_disabled_locale
 
 	sed -i \
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
@@ -105,23 +127,27 @@ src_configure() {
 	export ac_cv_path_PYTHON="${PYTHON}"
 	export am_cv_pathless_PYTHON="${EPYTHON}"
 
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_with libssh2) \
-		$(use_with ncat) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
-		$(usex nse --with-zlib) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre="${ESYSROOT}"/usr \
-		--without-dpdk \
-		--without-ndiff \
-		--without-zenmap
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_with libssh2)
+		$(use_with ncat)
+		$(use_with ndiff)
+		$(use_with nping)
+		$(use_with ssl openssl)
+		$(use_with zenmap)
+		$(usex libssh2 --with-zlib)
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua)
+		$(usex nse --with-zlib)
+		--cache-file="${S}"/config.cache
+		# The bundled libdnet is incompatible with the version available in the
+		# tree, so we cannot use the system library here.
+		--with-libdnet=included
+		--with-pcre="${ESYSROOT}"/usr
+		--without-dpdk
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -146,5 +172,9 @@ src_install() {
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
 
+	if use ndiff || use zenmap ; then
+		python_optimize
+	fi
+
 	use symlink && dosym /usr/bin/ncat /usr/bin/nc
 }

From 621d33532904aff33acfba4b43705a6fa371b673 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:15:11 +0000
Subject: [PATCH 22/30] net-misc/curl: Sync with Gentoo

It's from Gentoo commit bc57bee3e73decce0bce78f3636228969749b1cc.
---
 .../net-misc/curl/curl-7.86.0-r3.ebuild        | 18 ++++++++++++++----
 .../portage-stable/net-misc/curl/metadata.xml  |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild
index 50c94270b5..fb34199c73 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild
@@ -13,8 +13,8 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
 LICENSE="curl"
 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"
-IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
+IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls"
 IUSE+=" nghttp3 quiche"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
 
@@ -26,6 +26,7 @@ REQUIRED_USE="
 			curl_ssl_mbedtls
 			curl_ssl_nss
 			curl_ssl_openssl
+			curl_ssl_rustls
 		)
 	)"
 
@@ -52,6 +53,9 @@ RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
 			dev-libs/nss-pem
 			app-misc/ca-certificates
 		)
+		rustls? (
+			net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+		)
 	)
 	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
 	nghttp3? (
@@ -116,7 +120,7 @@ multilib_src_configure() {
 	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
 	#myconf+=( --without-default-ssl-backend )
 	if use ssl ; then
-		myconf+=( --without-gnutls --without-mbedtls --without-nss )
+		myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls )
 
 		if use gnutls || use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
@@ -134,6 +138,10 @@ multilib_src_configure() {
 			einfo "SSL provided by openssl"
 			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
 		fi
+		if use rustls || use curl_ssl_rustls; then
+			einfo "SSL provided by rustls"
+			myconf+=( --with-rustls )
+		fi
 
 		if use curl_ssl_gnutls; then
 			einfo "Default SSL provided by gnutls"
@@ -147,6 +155,9 @@ multilib_src_configure() {
 		elif use curl_ssl_openssl; then
 			einfo "Default SSL provided by openssl"
 			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_rustls; then
+			einfo "Default SSL provided by rustls"
+			myconf+=( --with-default-ssl-backend=rustls )
 		else
 			eerror "We can't be here because of REQUIRED_USE."
 		fi
@@ -224,7 +235,6 @@ multilib_src_configure() {
 		$(use_with nghttp3 ngtcp2)
 		$(use_with quiche)
 		$(use_with rtmp librtmp)
-		--without-rustls
 		--without-schannel
 		--without-secure-transport
 		$(use_enable websockets)
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml b/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml
index 1ed68e6f53..e33f2001ba 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml
@@ -22,6 +22,7 @@
 		<flag name="pop3">Enable Post Office Protocol 3 support</flag>
 		<flag name="progress-meter">Enable the progress meter</flag>
 		<flag name="rtmp">Enable RTMP Streaming Media support</flag>
+		<flag name="rustls">Enable Rustls ssl backend</flag>
 		<flag name="smtp">Enable Simple Mail Transfer Protocol support</flag>
 		<flag name="ssh">Enable SSH urls in curl using libssh2</flag>
 		<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>

From 59175f199bab9af7b17bb519bf3c838f093007a2 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:15:11 +0000
Subject: [PATCH 23/30] net-misc/iperf: Sync with Gentoo

It's from Gentoo commit b8f2426293071246cf6bb749f16dadfe63c884d6.
---
 .../portage-stable/net-misc/iperf/Manifest    |  1 -
 .../net-misc/iperf/iperf-3.11.ebuild          | 40 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.11.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iperf/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/iperf/Manifest
index 7c2daa431c..0d9153e9aa 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/iperf/Manifest
+++ b/sdk_container/src/third_party/portage-stable/net-misc/iperf/Manifest
@@ -1,3 +1,2 @@
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
-DIST iperf-3.11.tar.gz 638521 BLAKE2B b2981c170aac947c407b0a5686cd9708012282044be30ec7e5f993a9d61d55c4517003024890a194f6e55d342be0e60f1bcab27460541d2b9631a3bb88e094a5 SHA512 4be3e407f77a083d826bddc5ce2939047c85f5b816a6aeb3293eacabf2ea23bf13df4226e629ade3bf390c2eb08d6a1cb96f8cdb0fefb290a0fa4c8331d11a17
 DIST iperf-3.12.tar.gz 648136 BLAKE2B 95753e4fd2b7ca640b17501f6b21b0e63ea0a3df2ba920c672ffcccd991502cacf4bf3641be1ffbbb993c86e6915ceada5745cffe1796bb86b6a6a1dff8811ae SHA512 9b0600a19750311557833b32ca5c4be809ab98643522f125645dd8f83c482017e42fbe5fc9484624731176a59b67203a468eb81eebf1a37b9c1b3eff818857ba
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.11.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.11.ebuild
deleted file mode 100644
index 188df4bf87..0000000000
--- a/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf"
-SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P/_/}
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="sctp"
-
-DEPEND="dev-libs/openssl:=
-	sctp? ( net-misc/lksctp-tools )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
-)
-
-src_configure() {
-	econf $(use_with sctp)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/iperf.confd iperf3
-	newinitd "${FILESDIR}"/iperf3.initd iperf3
-	systemd_dounit contrib/iperf3.service
-
-	find "${ED}" -name '*.la' -delete || die
-}

From c41817e200932b05c78bd6a4ebbe1ba2d4781666 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:15:14 +0000
Subject: [PATCH 24/30] profiles: Sync with Gentoo

It's from Gentoo commit 13c4058a167d8061a2f5615bc19a5333855d8b0c.
---
 .../profiles/arch/amd64/package.use.mask      |  10 ++
 .../arch/amd64/package.use.stable.mask        |   8 +
 .../profiles/arch/arm64/use.mask              |   1 +
 .../profiles/arch/base/package.use.mask       |  10 ++
 .../profiles/arch/ia64/package.use.mask       |   2 +-
 .../profiles/arch/loong/package.mask          |  10 ++
 .../profiles/arch/loong/package.use.mask      |  50 ++++++-
 .../profiles/arch/loong/use.mask              |  11 +-
 .../profiles/arch/x86/package.mask            |   5 -
 .../portage-stable/profiles/base/package.use  |   2 +-
 .../profiles/base/package.use.stable.mask     |   4 +
 .../portage-stable/profiles/base/use.mask     |   4 -
 .../profiles/base/use.stable.mask             |   4 +
 .../systemd => alpha/23.0/desktop}/eapi       |   0
 .../linux/alpha/23.0/desktop/gnome/eapi       |   1 +
 .../linux/alpha/23.0/desktop/gnome/parent     |   2 +
 .../alpha/23.0/desktop/gnome/systemd/eapi     |   1 +
 .../alpha/23.0/desktop/gnome/systemd/parent   |   2 +
 .../default/linux/alpha/23.0/desktop/parent   |   2 +
 .../profiles/default/linux/alpha/23.0/eapi    |   1 +
 .../profiles/default/linux/alpha/23.0/parent  |   2 +
 .../linux/alpha/23.0/split-usr/desktop/eapi   |   1 +
 .../alpha/23.0/split-usr/desktop/gnome/eapi   |   1 +
 .../alpha/23.0/split-usr/desktop/gnome/parent |   2 +
 .../linux/alpha/23.0/split-usr/desktop/parent |   2 +
 .../default/linux/alpha/23.0/split-usr/eapi   |   1 +
 .../default/linux/alpha/23.0/split-usr/parent |   2 +
 .../default/linux/alpha/23.0/systemd/eapi     |   1 +
 .../default/linux/alpha/23.0/systemd/parent   |   2 +
 .../systemd/selinux/merged-usr/eapi           |   1 +
 .../systemd/selinux/merged-usr/parent         |   2 +
 .../17.1/systemd/selinux/merged-usr/eapi      |   1 +
 .../17.1/systemd/selinux/merged-usr/parent    |   2 +
 .../default/linux/amd64/23.0/desktop/eapi     |   1 +
 .../linux/amd64/23.0/desktop/gnome/eapi       |   1 +
 .../linux/amd64/23.0/desktop/gnome/parent     |   2 +
 .../amd64/23.0/desktop/gnome/systemd/eapi     |   1 +
 .../amd64/23.0/desktop/gnome/systemd/parent   |   2 +
 .../default/linux/amd64/23.0/desktop/parent   |   2 +
 .../linux/amd64/23.0/desktop/plasma/eapi      |   1 +
 .../linux/amd64/23.0/desktop/plasma/parent    |   2 +
 .../amd64/23.0/desktop/plasma/systemd/eapi    |   1 +
 .../amd64/23.0/desktop/plasma/systemd/parent  |   2 +
 .../linux/amd64/23.0/desktop/systemd/eapi     |   1 +
 .../{split-usr => desktop}/systemd/parent     |   0
 .../default/linux/amd64/23.0/hardened/eapi    |   1 +
 .../default/linux/amd64/23.0/hardened/parent  |   2 +
 .../linux/amd64/23.0/hardened/selinux/eapi    |   1 +
 .../linux/amd64/23.0/hardened/selinux/parent  |   2 +
 .../amd64/23.0/hardened/selinux/systemd/eapi  |   1 +
 .../23.0/hardened/selinux/systemd/parent      |   2 +
 .../linux/amd64/23.0/hardened/systemd/eapi    |   1 +
 .../linux/amd64/23.0/hardened/systemd/parent  |   2 +
 .../default/linux/amd64/23.0/llvm/eapi        |   1 +
 .../linux/amd64/23.0/llvm/package.use.force   |  16 ++
 .../linux/amd64/23.0/llvm/packages.build      |   9 ++
 .../default/linux/amd64/23.0/llvm/parent      |   2 +
 .../linux/amd64/23.0/llvm/systemd/eapi        |   1 +
 .../linux/amd64/23.0/llvm/systemd/parent      |   2 +
 .../default/linux/amd64/23.0/musl/eapi        |   1 +
 .../linux/amd64/23.0/musl/hardened/eapi       |   1 +
 .../linux/amd64/23.0/musl/hardened/parent     |   2 +
 .../amd64/23.0/musl/hardened/selinux/eapi     |   1 +
 .../amd64/23.0/musl/hardened/selinux/parent   |   2 +
 .../default/linux/amd64/23.0/musl/llvm/eapi   |   1 +
 .../amd64/23.0/musl/llvm/package.use.mask     |   6 +
 .../default/linux/amd64/23.0/musl/llvm/parent |   2 +
 .../linux/amd64/23.0/musl/make.defaults       |  10 ++
 .../linux/amd64/23.0/musl/package.mask        |  11 ++
 .../linux/amd64/23.0/musl/package.use.mask    |   6 +
 .../default/linux/amd64/23.0/musl/parent      |   3 +
 .../default/linux/amd64/23.0/no-multilib/eapi |   1 +
 .../amd64/23.0/no-multilib/hardened/eapi      |   1 +
 .../amd64/23.0/no-multilib/hardened/parent    |   2 +
 .../23.0/no-multilib/hardened/selinux/eapi    |   1 +
 .../23.0/no-multilib/hardened/selinux/parent  |   2 +
 .../no-multilib/hardened/selinux/systemd/eapi |   1 +
 .../hardened/selinux/systemd/parent           |   2 +
 .../23.0/no-multilib/hardened/systemd/eapi    |   1 +
 .../23.0/no-multilib/hardened/systemd/parent  |   2 +
 .../linux/amd64/23.0/no-multilib/parent       |   2 +
 .../linux/amd64/23.0/no-multilib/prefix/eapi  |   1 +
 .../no-multilib/prefix/kernel-2.6.16+/eapi    |   1 +
 .../no-multilib/prefix/kernel-2.6.16+/parent  |   2 +
 .../no-multilib/prefix/kernel-2.6.32+/eapi    |   1 +
 .../no-multilib/prefix/kernel-2.6.32+/parent  |   2 +
 .../23.0/no-multilib/prefix/kernel-3.2+/eapi  |   1 +
 .../no-multilib/prefix/kernel-3.2+/parent     |   2 +
 .../amd64/23.0/no-multilib/prefix/parent      |   1 +
 .../linux/amd64/23.0/no-multilib/selinux/eapi |   1 +
 .../amd64/23.0/no-multilib/selinux/parent     |   2 +
 .../23.0/no-multilib/selinux/systemd/eapi     |   1 +
 .../23.0/no-multilib/selinux/systemd/parent   |   2 +
 .../linux/amd64/23.0/no-multilib/systemd/eapi |   1 +
 .../amd64/23.0/no-multilib/systemd/parent     |   2 +
 .../default/linux/amd64/23.0/readme.txt       | 141 ++++++++++++++++++
 .../linux/amd64/23.0/split-usr/desktop/eapi   |   1 +
 .../amd64/23.0/split-usr/desktop/gnome/eapi   |   1 +
 .../amd64/23.0/split-usr/desktop/gnome/parent |   2 +
 .../linux/amd64/23.0/split-usr/desktop/parent |   2 +
 .../amd64/23.0/split-usr/desktop/plasma/eapi  |   1 +
 .../23.0/split-usr/desktop/plasma/parent      |   2 +
 .../linux/amd64/23.0/split-usr/hardened/eapi  |   1 +
 .../amd64/23.0/split-usr/hardened/parent      |   2 +
 .../23.0/split-usr/hardened/selinux/eapi      |   1 +
 .../23.0/split-usr/hardened/selinux/parent    |   2 +
 .../linux/amd64/23.0/split-usr/llvm/eapi      |   1 +
 .../23.0/split-usr/llvm/package.use.force     |  16 ++
 .../amd64/23.0/split-usr/llvm/packages.build  |   9 ++
 .../linux/amd64/23.0/split-usr/llvm/parent    |   2 +
 .../linux/amd64/23.0/split-usr/musl/eapi      |   1 +
 .../amd64/23.0/split-usr/musl/hardened/eapi   |   1 +
 .../amd64/23.0/split-usr/musl/hardened/parent |   2 +
 .../23.0/split-usr/musl/hardened/selinux/eapi |   1 +
 .../split-usr/musl/hardened/selinux/parent    |   2 +
 .../linux/amd64/23.0/split-usr/musl/llvm/eapi |   1 +
 .../23.0/split-usr/musl/llvm/package.use.mask |   6 +
 .../amd64/23.0/split-usr/musl/llvm/parent     |   2 +
 .../amd64/23.0/split-usr/musl/make.defaults   |  10 ++
 .../amd64/23.0/split-usr/musl/package.mask    |  11 ++
 .../23.0/split-usr/musl/package.use.mask      |   6 +
 .../linux/amd64/23.0/split-usr/musl/parent    |   3 +
 .../amd64/23.0/split-usr/no-multilib/eapi     |   1 +
 .../23.0/split-usr/no-multilib/hardened/eapi  |   1 +
 .../split-usr/no-multilib/hardened/parent     |   2 +
 .../no-multilib/hardened/selinux/eapi         |   1 +
 .../no-multilib/hardened/selinux/parent       |   2 +
 .../amd64/23.0/split-usr/no-multilib/parent   |   2 +
 .../23.0/split-usr/no-multilib/prefix/eapi    |   1 +
 .../no-multilib/prefix/kernel-2.6.16+/eapi    |   1 +
 .../no-multilib/prefix/kernel-2.6.16+/parent  |   2 +
 .../no-multilib/prefix/kernel-2.6.32+/eapi    |   1 +
 .../no-multilib/prefix/kernel-2.6.32+/parent  |   2 +
 .../no-multilib/prefix/kernel-3.2+/eapi       |   1 +
 .../no-multilib/prefix/kernel-3.2+/parent     |   2 +
 .../23.0/split-usr/no-multilib/prefix/parent  |   1 +
 .../23.0/split-usr/no-multilib/selinux/eapi   |   1 +
 .../23.0/split-usr/no-multilib/selinux/parent |   2 +
 .../linux/amd64/23.0/split-usr/x32/eapi       |   1 +
 .../amd64/23.0/split-usr/x32/make.defaults    |   4 +
 .../linux/amd64/23.0/split-usr/x32/parent     |   2 +
 .../default/linux/amd64/23.0/x32/eapi         |   1 +
 .../linux/amd64/23.0/x32/make.defaults        |   4 +
 .../default/linux/amd64/23.0/x32/parent       |   2 +
 .../default/linux/amd64/23.0/x32/systemd/eapi |   1 +
 .../linux/amd64/23.0/x32/systemd/parent       |   2 +
 .../default/linux/arm/23.0/armv4/desktop/eapi |   1 +
 .../linux/arm/23.0/armv4/desktop/gnome/eapi   |   1 +
 .../linux/arm/23.0/armv4/desktop/gnome/parent |   2 +
 .../linux/arm/23.0/armv4/desktop/parent       |   2 +
 .../linux/arm/23.0/armv4/desktop/plasma/eapi  |   1 +
 .../arm/23.0/armv4/desktop/plasma/parent      |   2 +
 .../default/linux/arm/23.0/armv4/eapi         |   1 +
 .../default/linux/arm/23.0/armv4/parent       |   2 +
 .../linux/arm/23.0/armv4t/desktop/eapi        |   1 +
 .../linux/arm/23.0/armv4t/desktop/gnome/eapi  |   1 +
 .../arm/23.0/armv4t/desktop/gnome/parent      |   2 +
 .../linux/arm/23.0/armv4t/desktop/parent      |   2 +
 .../linux/arm/23.0/armv4t/desktop/plasma/eapi |   1 +
 .../arm/23.0/armv4t/desktop/plasma/parent     |   2 +
 .../default/linux/arm/23.0/armv4t/eapi        |   1 +
 .../default/linux/arm/23.0/armv4t/parent      |   2 +
 .../linux/arm/23.0/armv4t/selinux/eapi        |   1 +
 .../linux/arm/23.0/armv4t/selinux/parent      |   2 +
 .../linux/arm/23.0/armv4t/systemd/eapi        |   1 +
 .../linux/arm/23.0/armv4t/systemd/parent      |   2 +
 .../linux/arm/23.0/armv5te/desktop/eapi       |   1 +
 .../linux/arm/23.0/armv5te/desktop/gnome/eapi |   1 +
 .../arm/23.0/armv5te/desktop/gnome/parent     |   2 +
 .../linux/arm/23.0/armv5te/desktop/parent     |   2 +
 .../arm/23.0/armv5te/desktop/plasma/eapi      |   1 +
 .../arm/23.0/armv5te/desktop/plasma/parent    |   2 +
 .../default/linux/arm/23.0/armv5te/eapi       |   1 +
 .../default/linux/arm/23.0/armv5te/parent     |   2 +
 .../linux/arm/23.0/armv5te/selinux/eapi       |   1 +
 .../linux/arm/23.0/armv5te/selinux/parent     |   2 +
 .../linux/arm/23.0/armv5te/systemd/eapi       |   1 +
 .../linux/arm/23.0/armv5te/systemd/parent     |   2 +
 .../linux/arm/23.0/armv6j/desktop/eapi        |   1 +
 .../linux/arm/23.0/armv6j/desktop/gnome/eapi  |   1 +
 .../arm/23.0/armv6j/desktop/gnome/parent      |   2 +
 .../linux/arm/23.0/armv6j/desktop/parent      |   2 +
 .../linux/arm/23.0/armv6j/desktop/plasma/eapi |   1 +
 .../arm/23.0/armv6j/desktop/plasma/parent     |   2 +
 .../default/linux/arm/23.0/armv6j/eapi        |   1 +
 .../linux/arm/23.0/armv6j/hardened/eapi       |   1 +
 .../linux/arm/23.0/armv6j/hardened/parent     |   2 +
 .../arm/23.0/armv6j/hardened/selinux/eapi     |   1 +
 .../arm/23.0/armv6j/hardened/selinux/parent   |   2 +
 .../default/linux/arm/23.0/armv6j/parent      |   2 +
 .../linux/arm/23.0/armv6j/selinux/eapi        |   1 +
 .../linux/arm/23.0/armv6j/selinux/parent      |   2 +
 .../linux/arm/23.0/armv6j/systemd/eapi        |   1 +
 .../linux/arm/23.0/armv6j/systemd/parent      |   2 +
 .../linux/arm/23.0/armv7a/desktop/eapi        |   1 +
 .../linux/arm/23.0/armv7a/desktop/gnome/eapi  |   1 +
 .../arm/23.0/armv7a/desktop/gnome/parent      |   2 +
 .../23.0/armv7a/desktop/gnome/systemd/eapi    |   1 +
 .../23.0/armv7a/desktop/gnome/systemd/parent  |   2 +
 .../linux/arm/23.0/armv7a/desktop/parent      |   2 +
 .../linux/arm/23.0/armv7a/desktop/plasma/eapi |   1 +
 .../arm/23.0/armv7a/desktop/plasma/parent     |   2 +
 .../23.0/armv7a/desktop/plasma/systemd/eapi   |   1 +
 .../23.0/armv7a/desktop/plasma/systemd/parent |   2 +
 .../default/linux/arm/23.0/armv7a/eapi        |   1 +
 .../linux/arm/23.0/armv7a/hardened/eapi       |   1 +
 .../linux/arm/23.0/armv7a/hardened/parent     |   2 +
 .../arm/23.0/armv7a/hardened/selinux/eapi     |   1 +
 .../arm/23.0/armv7a/hardened/selinux/parent   |   2 +
 .../default/linux/arm/23.0/armv7a/parent      |   2 +
 .../default/linux/arm/23.0/armv7a/prefix/eapi |   1 +
 .../arm/23.0/armv7a/prefix/kernel-3.2+/eapi   |   1 +
 .../arm/23.0/armv7a/prefix/kernel-3.2+/parent |   2 +
 .../linux/arm/23.0/armv7a/prefix/parent       |   1 +
 .../linux/arm/23.0/armv7a/selinux/eapi        |   1 +
 .../linux/arm/23.0/armv7a/selinux/parent      |   2 +
 .../linux/arm/23.0/armv7a/systemd/eapi        |   1 +
 .../linux/arm/23.0/armv7a/systemd/parent      |   2 +
 .../default/linux/arm/23.0/desktop/eapi       |   1 +
 .../default/linux/arm/23.0/desktop/gnome/eapi |   1 +
 .../linux/arm/23.0/desktop/gnome/parent       |   2 +
 .../linux/arm/23.0/desktop/gnome/systemd/eapi |   1 +
 .../arm/23.0/desktop/gnome/systemd/parent     |   2 +
 .../default/linux/arm/23.0/desktop/parent     |   2 +
 .../linux/arm/23.0/desktop/plasma/eapi        |   1 +
 .../linux/arm/23.0/desktop/plasma/parent      |   2 +
 .../arm/23.0/desktop/plasma/systemd/eapi      |   1 +
 .../arm/23.0/desktop/plasma/systemd/parent    |   2 +
 .../profiles/default/linux/arm/23.0/eapi      |   1 +
 .../default/linux/arm/23.0/musl/armv6j/eapi   |   1 +
 .../linux/arm/23.0/musl/armv6j/hardened/eapi  |   1 +
 .../arm/23.0/musl/armv6j/hardened/parent      |   2 +
 .../23.0/musl/armv6j/hardened/selinux/eapi    |   1 +
 .../23.0/musl/armv6j/hardened/selinux/parent  |   2 +
 .../linux/arm/23.0/musl/armv6j/make.defaults  |  10 ++
 .../default/linux/arm/23.0/musl/armv6j/parent |   1 +
 .../default/linux/arm/23.0/musl/armv7a/eapi   |   1 +
 .../linux/arm/23.0/musl/armv7a/hardened/eapi  |   1 +
 .../arm/23.0/musl/armv7a/hardened/parent      |   2 +
 .../23.0/musl/armv7a/hardened/selinux/eapi    |   1 +
 .../23.0/musl/armv7a/hardened/selinux/parent  |   2 +
 .../linux/arm/23.0/musl/armv7a/make.defaults  |  10 ++
 .../default/linux/arm/23.0/musl/armv7a/parent |   1 +
 .../profiles/default/linux/arm/23.0/musl/eapi |   1 +
 .../default/linux/arm/23.0/musl/make.defaults |   5 +
 .../default/linux/arm/23.0/musl/parent        |   3 +
 .../profiles/default/linux/arm/23.0/parent    |   2 +
 .../arm/23.0/split-usr/armv4/desktop/eapi     |   1 +
 .../23.0/split-usr/armv4/desktop/gnome/eapi   |   1 +
 .../23.0/split-usr/armv4/desktop/gnome/parent |   2 +
 .../arm/23.0/split-usr/armv4/desktop/parent   |   2 +
 .../23.0/split-usr/armv4/desktop/plasma/eapi  |   1 +
 .../split-usr/armv4/desktop/plasma/parent     |   2 +
 .../linux/arm/23.0/split-usr/armv4/eapi       |   1 +
 .../linux/arm/23.0/split-usr/armv4/parent     |   2 +
 .../arm/23.0/split-usr/armv4t/desktop/eapi    |   1 +
 .../23.0/split-usr/armv4t/desktop/gnome/eapi  |   1 +
 .../split-usr/armv4t/desktop/gnome/parent     |   2 +
 .../arm/23.0/split-usr/armv4t/desktop/parent  |   2 +
 .../23.0/split-usr/armv4t/desktop/plasma/eapi |   1 +
 .../split-usr/armv4t/desktop/plasma/parent    |   2 +
 .../linux/arm/23.0/split-usr/armv4t/eapi      |   1 +
 .../linux/arm/23.0/split-usr/armv4t/parent    |   2 +
 .../arm/23.0/split-usr/armv4t/selinux/eapi    |   1 +
 .../arm/23.0/split-usr/armv4t/selinux/parent  |   2 +
 .../arm/23.0/split-usr/armv5te/desktop/eapi   |   1 +
 .../23.0/split-usr/armv5te/desktop/gnome/eapi |   1 +
 .../split-usr/armv5te/desktop/gnome/parent    |   2 +
 .../arm/23.0/split-usr/armv5te/desktop/parent |   2 +
 .../split-usr/armv5te/desktop/plasma/eapi     |   1 +
 .../split-usr/armv5te/desktop/plasma/parent   |   2 +
 .../linux/arm/23.0/split-usr/armv5te/eapi     |   1 +
 .../linux/arm/23.0/split-usr/armv5te/parent   |   2 +
 .../arm/23.0/split-usr/armv5te/selinux/eapi   |   1 +
 .../arm/23.0/split-usr/armv5te/selinux/parent |   2 +
 .../arm/23.0/split-usr/armv6j/desktop/eapi    |   1 +
 .../23.0/split-usr/armv6j/desktop/gnome/eapi  |   1 +
 .../split-usr/armv6j/desktop/gnome/parent     |   2 +
 .../arm/23.0/split-usr/armv6j/desktop/parent  |   2 +
 .../23.0/split-usr/armv6j/desktop/plasma/eapi |   1 +
 .../split-usr/armv6j/desktop/plasma/parent    |   2 +
 .../linux/arm/23.0/split-usr/armv6j/eapi      |   1 +
 .../arm/23.0/split-usr/armv6j/hardened/eapi   |   1 +
 .../arm/23.0/split-usr/armv6j/hardened/parent |   2 +
 .../split-usr/armv6j/hardened/selinux/eapi    |   1 +
 .../split-usr/armv6j/hardened/selinux/parent  |   2 +
 .../linux/arm/23.0/split-usr/armv6j/parent    |   2 +
 .../arm/23.0/split-usr/armv6j/selinux/eapi    |   1 +
 .../arm/23.0/split-usr/armv6j/selinux/parent  |   2 +
 .../arm/23.0/split-usr/armv7a/desktop/eapi    |   1 +
 .../23.0/split-usr/armv7a/desktop/gnome/eapi  |   1 +
 .../split-usr/armv7a/desktop/gnome/parent     |   2 +
 .../arm/23.0/split-usr/armv7a/desktop/parent  |   2 +
 .../23.0/split-usr/armv7a/desktop/plasma/eapi |   1 +
 .../split-usr/armv7a/desktop/plasma/parent    |   2 +
 .../linux/arm/23.0/split-usr/armv7a/eapi      |   1 +
 .../arm/23.0/split-usr/armv7a/hardened/eapi   |   1 +
 .../arm/23.0/split-usr/armv7a/hardened/parent |   2 +
 .../split-usr/armv7a/hardened/selinux/eapi    |   1 +
 .../split-usr/armv7a/hardened/selinux/parent  |   2 +
 .../linux/arm/23.0/split-usr/armv7a/parent    |   2 +
 .../arm/23.0/split-usr/armv7a/prefix/eapi     |   1 +
 .../split-usr/armv7a/prefix/kernel-3.2+/eapi  |   1 +
 .../armv7a/prefix/kernel-3.2+/parent          |   2 +
 .../arm/23.0/split-usr/armv7a/prefix/parent   |   1 +
 .../arm/23.0/split-usr/armv7a/selinux/eapi    |   1 +
 .../arm/23.0/split-usr/armv7a/selinux/parent  |   2 +
 .../linux/arm/23.0/split-usr/desktop/eapi     |   1 +
 .../arm/23.0/split-usr/desktop/gnome/eapi     |   1 +
 .../arm/23.0/split-usr/desktop/gnome/parent   |   2 +
 .../linux/arm/23.0/split-usr/desktop/parent   |   2 +
 .../arm/23.0/split-usr/desktop/plasma/eapi    |   1 +
 .../arm/23.0/split-usr/desktop/plasma/parent  |   2 +
 .../default/linux/arm/23.0/split-usr/eapi     |   1 +
 .../linux/arm/23.0/split-usr/musl/armv6j/eapi |   1 +
 .../23.0/split-usr/musl/armv6j/hardened/eapi  |   1 +
 .../split-usr/musl/armv6j/hardened/parent     |   2 +
 .../musl/armv6j/hardened/selinux/eapi         |   1 +
 .../musl/armv6j/hardened/selinux/parent       |   2 +
 .../23.0/split-usr/musl/armv6j/make.defaults  |  10 ++
 .../arm/23.0/split-usr/musl/armv6j/parent     |   1 +
 .../linux/arm/23.0/split-usr/musl/armv7a/eapi |   1 +
 .../23.0/split-usr/musl/armv7a/hardened/eapi  |   1 +
 .../split-usr/musl/armv7a/hardened/parent     |   2 +
 .../musl/armv7a/hardened/selinux/eapi         |   1 +
 .../musl/armv7a/hardened/selinux/parent       |   2 +
 .../23.0/split-usr/musl/armv7a/make.defaults  |  10 ++
 .../arm/23.0/split-usr/musl/armv7a/parent     |   1 +
 .../linux/arm/23.0/split-usr/musl/eapi        |   1 +
 .../arm/23.0/split-usr/musl/make.defaults     |   5 +
 .../linux/arm/23.0/split-usr/musl/parent      |   2 +
 .../default/linux/arm/23.0/split-usr/parent   |   2 +
 .../default/linux/arm/23.0/systemd/eapi       |   1 +
 .../default/linux/arm/23.0/systemd/parent     |   2 +
 .../17.0/systemd/selinux/merged-usr/eapi      |   1 +
 .../17.0/systemd/selinux/merged-usr/parent    |   2 +
 .../profiles/desc/curl_ssl.desc               |   3 +-
 .../profiles/features/musl/package.mask       |   1 +
 .../profiles/features/musl/package.use.mask   |   7 +
 .../profiles/features/wd40/package.use.mask   |  30 ++++
 .../portage-stable/profiles/license_groups    |   2 +-
 .../portage-stable/profiles/package.mask      | 125 ++++++++++++++--
 .../darwin/macos/arch/arm64/package.use.mask  |   4 +-
 .../portage-stable/profiles/profiles.desc     |  15 +-
 .../profiles/releases/23.0/package.mask       |   3 +-
 .../portage-stable/profiles/thirdpartymirrors |   2 +-
 .../portage-stable/profiles/updates/4Q-2022   |   1 +
 347 files changed, 1028 insertions(+), 46 deletions(-)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/{amd64/23.0/split-usr/systemd => alpha/23.0/desktop}/eapi (100%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/systemd/eapi
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/{split-usr => desktop}/systemd/parent (100%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/package.use.force
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/packages.build
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/package.use.mask
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.mask
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.use.mask
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.16+/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.16+/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.32+/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.32+/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-3.2+/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-3.2+/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/readme.txt
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/packages.build
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/package.use.mask
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.mask
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.use.mask
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/kernel-3.2+/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/kernel-3.2+/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/kernel-3.2+/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/kernel-3.2+/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/gnome/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/gnome/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/plasma/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/plasma/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/make.defaults
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/systemd/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/systemd/parent
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/eapi
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/parent

diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
index 20f9e7c5b6..1508843cec 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-12-11)
+# net-libs/rustls-ffi is keyworded here
+net-misc/curl -rustls -curl_ssl_rustls
+
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-12-06)
+# Quick Sync Video (through intel-mediasdk or oneVPL) is
+# only keyworded on amd64
+media-video/ffmpeg -qsv
+media-libs/gst-plugins-bad -qsv
+
 # Michał Górny <mgorny@gentoo.org> (2022-12-01)
 # Keyworded here.
 app-alternatives/awk -nawk
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask
index 7411beaa84..06a6b11648 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-12-11)
+# net-libs/rustls-ffi is not yet marked stable
+net-misc/curl rustls curl_ssl_rustls
+
+# Sam James <sam@gentoo.org> (2022-12-07)
+# Needs unstable media-libs/oneVPL
+media-libs/gst-plugins-bad qsv
+
 # Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-23)
 # Dependency media-libs/intel-hybrid-codec-driver is only available on unstable
 # branch
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask
index 57064e39a9..2a39adf174 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask
@@ -119,6 +119,7 @@ lpsol
 zvbi
 gts
 anthy
+snapcast
 
 # Unmask ARM-only video-cards
 -video_cards_exynos
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask
index cfb2085789..b0af11dbc9 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-12-11)
+# Unkeyworded dependencies
+net-misc/curl rustls curl_ssl_rustls
+
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-12-06)
+# Quick Sync Video (through intel-mediasdk or oneVPL) is
+# only keyworded on amd64
+media-video/ffmpeg qsv
+media-libs/gst-plugins-bad qsv
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-01)
 # Only supported on ppc64le.
 sys-devel/gcc ieee-long-double
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask
index b7d40c41c5..7bc44f6310 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask
@@ -496,7 +496,7 @@ x11-wm/fvwm lock
 dev-lisp/clisp hyperspec svm
 
 # missing keywords
-media-plugins/gst-plugins-meta dts dv lame libvisual modplug taglib vcd wavpack
+media-plugins/gst-plugins-meta dts dv lame libvisual modplug jack taglib vcd wavpack
 
 # Marius Brehler <marfbre@linux.sungazer.de> (2015-08-13)
 # missing keyword
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.mask
index 7084783a52..43a925569e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.mask
@@ -1,2 +1,12 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
+# sys-boot/gnu-efi upstream hasn't merged the loong port yet
+app-crypt/efitools
+app-crypt/pesign
+app-crypt/sbsigntools
+sys-apps/fwupd-efi
+sys-boot/elilo
+sys-boot/refind
+sys-kernel/installkernel-systemd-boot
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask
index d57436f307..18cc8a8b6d 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask
@@ -1,6 +1,51 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
+# dev-cpp/glog fails tests, needs checknig
+media-libs/opencv glog contribsfm
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
+# sci-libs/gdal not keyworded yet
+media-libs/opencv gdal
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
+# app-crypt/heimdal not keyworded yet
+net-nds/openldap kerberos
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
+# net-vpn/ocserv fails tests, probably kernel config related but needs
+# further investigation.
+net-vpn/openconnect test
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
+# dev-python/pyside2 not keyworded yet
+dev-python/QtPy pyside2
+dev-python/qtconsole test
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
+# dev-qt/qtwebengine:5 isn't available on loong.
+dev-python/QtPy webengine
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
+# app-arch/p7zip fails one test
+kde-apps/kdeutils-meta 7zip
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
+# <dev-cpp/tbb-2021 fails to build on loong w/ gcc-13
+sci-libs/spqr tbb
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
+# in-tree version of sys-apps/flashrom (1.2) is outdated and cannot build
+# on loong
+sys-apps/fwupd flashrom
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
+# sys-boot/gnu-efi upstream hasn't merged the loong port yet
+sys-apps/fwupd uefi
+sys-apps/systemd gnuefi
+sys-apps/systemd-utils boot
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # The loong port of sys-boot/grub:2 isn't upstreamed yet.
 dev-util/ostree grub
@@ -59,6 +104,7 @@ dev-libs/boost -context
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-02)
 # dev-qt/qtlocation:5 fails to compile with gcc-13 for now.
 dev-python/PyQt5 location
+dev-python/QtPy test
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-01)
 # sys-libs/libhugetlbfs isn't buildable here yet due to arch-specific code.
@@ -111,7 +157,10 @@ mate-base/mate help
 # Sanitizers partially supported on this architecture.
 #
 # ASan: https://reviews.llvm.org/D129418 (LLVM 15 and above)
+# TSan: https://reviews.llvm.org/D139292 (LLVM 16 since 20221208)
+# UBSan: https://reviews.llvm.org/D139292 (LLVM 16 since 20221208)
 >=sys-libs/compiler-rt-sanitizers-15 -asan
+>=sys-libs/compiler-rt-sanitizers-16.0.0_pre20221210 -tsan -ubsan
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-07-08)
 # virtual/{jdk,jre} is not available on loong yet.
@@ -127,7 +176,6 @@ net-libs/libssh mbedtls
 # WANG Xuerui <xen0n@gentoo.org> (2022-04-24)
 # Unmask experimental-loong on packages; we're loong.
 dev-libs/libffi -experimental-loong
-sys-kernel/linux-headers -experimental-loong
 sys-libs/glibc -experimental-loong
 sys-libs/libseccomp -experimental-loong
 
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask
index af5ca8e979..b37c5038ae 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask
@@ -1,6 +1,10 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
+# media-libs/xine-lib not tested
+xine
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # Respective dependency fails to build, pending investigation, mask for the
 # time being
@@ -54,19 +58,12 @@ opencl
 valgrind
 
 # Temporarily masked during initial keywording
-audit
 doc
-efl
 elogind
 emacs
 fam
-gtk4
-gtk-doc
-kde
-latex
 ldap
 mpi
-sctp
 systemtap
 tk
 tpm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask
index 0573742305..65c385e7ab 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask
@@ -1,7 +1,2 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Viorel Munteanu <ceamac@gentoo.org> (2022-11-04)
-# Upstream dropped the x86 build.  Bug #879519
-# Removal on 2022-12-04.
-net-im/mattermost-desktop-bin
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use b/sdk_container/src/third_party/portage-stable/profiles/base/package.use
index a3cbb8f564..b56f43c470 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use
@@ -7,7 +7,7 @@
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2022-06-14)
 # Only python 3.9 supported, bug #835921
-dev-util/kdevelop-python:5 python_single_target_python3_9
+<dev-util/kdevelop-python-22.12.0:5 python_single_target_python3_9
 
 # Patrick McLean <chutzpah@gentoo.org) (2022-05-04)
 # Default to lua 5.4 (upstream requires 5.3 or higher)
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
index decc363f24..a414cf650b 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Sam James <sam@gentoo.org> (2022-12-07)
+# Needs unstable media-libs/oneVPL
+media-libs/gst-plugins-bad qsv
+
 # Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
 # app-text/pandoc is not stable
 net-libs/gssdp man
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask
index 4476441274..6e4d45c144 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask
@@ -10,10 +10,6 @@
 # Bug #875053
 video_cards_nv
 
-# Brian Evans <grknight@gentoo.org> (2022-09-30)
-# PHP 8.2 is in RC
-php_targets_php8-2
-
 # Sam James <sam@gentoo.org> (2022-08-02)
 # Masked for testing. The split of some packages may still
 # change. bug #838970.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask
index 96afc27ef0..9f302287fc 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Brian Evans <grknight@gentoo.org> (2022-12-09)
+# PHP 8.2 is in testing
+php_targets_php8-2
+
 # Alfredo Tupone <tupone@gentoo.org> (2022-12-4)
 # sys-devel/gcc:12 is not stable yet
 ada_target_gcc_12_2_0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/systemd/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/parent
new file mode 100644
index 0000000000..6589a0e014
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/systemd/parent
new file mode 100644
index 0000000000..f5c1ae438d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/parent
new file mode 100644
index 0000000000..ad6c5e126f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/parent
new file mode 100644
index 0000000000..50be433109
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/23.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/gnome/parent
new file mode 100644
index 0000000000..9e06c4505a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/parent
new file mode 100644
index 0000000000..db8ce088c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/parent
new file mode 100644
index 0000000000..598ca888c8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/split-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/systemd/parent
new file mode 100644
index 0000000000..ced72403bd
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/alpha/23.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/parent
new file mode 100644
index 0000000000..1b7f7eef0a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/parent
new file mode 100644
index 0000000000..c8b1675247
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/selinux/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/parent
new file mode 100644
index 0000000000..6589a0e014
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/parent
new file mode 100644
index 0000000000..f5c1ae438d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/parent
new file mode 100644
index 0000000000..ad6c5e126f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/parent
new file mode 100644
index 0000000000..ff3a7b1ec8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/parent
new file mode 100644
index 0000000000..44f88d3e2d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/systemd/parent
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/systemd/parent
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/desktop/systemd/parent
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/parent
new file mode 100644
index 0000000000..0ea564cade
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/hardened/amd64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/parent
new file mode 100644
index 0000000000..2190e9797e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/systemd/parent
new file mode 100644
index 0000000000..44f88d3e2d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/selinux/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/hardened/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/package.use.force
new file mode 100644
index 0000000000..f01a7a3572
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/package.use.force
@@ -0,0 +1,16 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# in a multilib profile we need multilib madness
+dev-libs/libffi abi_x86_32 abi_x86_64
+dev-libs/libxml2 abi_x86_32 abi_x86_64
+sys-devel/clang abi_x86_32 abi_x86_64
+sys-devel/clang-runtime abi_x86_32 abi_x86_64
+sys-devel/llvm abi_x86_32 abi_x86_64
+sys-libs/compiler-rt abi_x86_32 abi_x86_64
+sys-libs/libcxxabi abi_x86_32 abi_x86_64
+sys-libs/libcxx abi_x86_32 abi_x86_64
+sys-libs/libunwind abi_x86_32 abi_x86_64
+sys-libs/llvm-libunwind abi_x86_32 abi_x86_64
+sys-libs/ncurses abi_x86_32 abi_x86_64
+sys-libs/zlib abi_x86_32 abi_x86_64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/packages.build b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/packages.build
new file mode 100644
index 0000000000..9ffb08757b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/packages.build
@@ -0,0 +1,9 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# we use glibc here, so we still need these in stage1
+# later stages should pull them in as BDEPEND anyway
+sys-devel/gcc
+sys-devel/gcc-config
+sys-devel/binutils
+sys-devel/binutils-config
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/parent
new file mode 100644
index 0000000000..929f409fcc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/llvm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/llvm/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/parent
new file mode 100644
index 0000000000..45a355b0be
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/amd64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/package.use.mask
new file mode 100644
index 0000000000..3435fc7a7d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-10-15)
+# Undo the general musl mask
+www-client/firefox -clang
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/parent
new file mode 100644
index 0000000000..845cedb73f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/llvm/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/llvm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/make.defaults
new file mode 100644
index 0000000000..96ce023a7e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-gentoo-linux-musl"
+
+# Anthony G. Basile <blueness@gentoo.org> (2014-07-01)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="amd64"
+CHOST_amd64="${CHOST}"
+LIBDIR_amd64="lib"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.mask
new file mode 100644
index 0000000000..25a5df5e91
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.mask
@@ -0,0 +1,11 @@
+# Copyright 2020-2022 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-10-08)
+# openjdk-bin is available on amd64 musl
+-dev-java/openjdk-bin
+dev-java/openjdk-bin:8
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-28)
+# rust-bin is available on amd64 musl
+-dev-lang/rust-bin
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.use.mask
new file mode 100644
index 0000000000..08d81656b7
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-28)
+# upstream does not provide docs in musl tarball
+dev-lang/rust-bin doc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/parent
new file mode 100644
index 0000000000..0e86ace1a7
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../arch/amd64/no-multilib
+../../../../../features/musl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/parent
new file mode 100644
index 0000000000..f0b99fe026
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/amd64/no-multilib
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd/parent
new file mode 100644
index 0000000000..f7739b4058
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/systemd/parent
new file mode 100644
index 0000000000..44f88d3e2d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/hardened/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/parent
new file mode 100644
index 0000000000..7f1f3bc017
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/amd64/no-multilib
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.16+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.16+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.16+/parent
new file mode 100644
index 0000000000..665aafbea8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.32+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.32+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.32+/parent
new file mode 100644
index 0000000000..7eed652658
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-3.2+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-3.2+/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-3.2+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-3.2+/parent
new file mode 100644
index 0000000000..b3da232ba5
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/parent
new file mode 100644
index 0000000000..f3229c5b98
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/parent
new file mode 100644
index 0000000000..2190e9797e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/parent
new file mode 100644
index 0000000000..44f88d3e2d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/selinux/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/no-multilib/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/readme.txt b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/readme.txt
new file mode 100644
index 0000000000..a4fb52c03b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/readme.txt
@@ -0,0 +1,141 @@
+
+WARNING - the 23.0 profile tree is still experimental.
+
+Recommended upgrade path:
+(please make sure to read the annotations like [*] if applicable)
+
+default/linux/amd64/17.1
+==> default/linux/amd64/23.0/split-usr
+
+default/linux/amd64/17.1/selinux
+==> default/linux/amd64/23.0/split-usr/hardened/selinux [%]
+
+default/linux/amd64/17.1/hardened
+==> default/linux/amd64/23.0/split-usr/hardened
+
+default/linux/amd64/17.1/hardened/selinux
+==> default/linux/amd64/23.0/split-usr/hardened/selinux
+
+default/linux/amd64/17.1/desktop
+==> default/linux/amd64/23.0/split-usr/desktop
+
+default/linux/amd64/17.1/desktop/gnome
+==> default/linux/amd64/23.0/split-usr/desktop/gnome
+
+default/linux/amd64/17.1/desktop/gnome/systemd
+==> default/linux/amd64/23.0/desktop/gnome/systemd  [*]
+
+default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr
+==> default/linux/amd64/23.0/desktop/gnome/systemd
+
+default/linux/amd64/17.1/desktop/plasma
+==> default/linux/amd64/23.0/split-usr/desktop/plasma
+
+default/linux/amd64/17.1/desktop/plasma/systemd
+==> default/linux/amd64/23.0/desktop/plasma/systemd  [*]
+
+default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr
+==> default/linux/amd64/23.0/desktop/plasma/systemd
+
+default/linux/amd64/17.1/desktop/systemd
+==> default/linux/amd64/23.0/desktop/systemd  [*]
+
+default/linux/amd64/17.1/desktop/systemd/merged-usr
+==> default/linux/amd64/23.0/desktop/systemd
+
+default/linux/amd64/17.1/developer
+==> default/linux/amd64/23.0  [*,#]
+
+default/linux/amd64/17.1/no-multilib
+==> default/linux/amd64/23.0/split-usr/no-multilib
+
+default/linux/amd64/17.1/no-multilib/hardened
+==> default/linux/amd64/23.0/split-usr/no-multilib/hardened
+
+default/linux/amd64/17.1/no-multilib/hardened/selinux
+==> default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux
+
+default/linux/amd64/17.1/no-multilib/systemd
+==> default/linux/amd64/23.0/no-multilib/systemd  [*]
+
+default/linux/amd64/17.1/no-multilib/systemd/merged-usr
+==> default/linux/amd64/23.0/no-multilib/systemd
+
+default/linux/amd64/17.1/no-multilib/systemd/selinux
+==> default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd  [*,%]
+
+default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr
+==> default/linux/amd64/23.0/no-multilib/hardened/selinux/systemd  [%]
+
+default/linux/amd64/17.1/systemd
+==> default/linux/amd64/23.0/systemd  [*]
+
+default/linux/amd64/17.1/systemd/merged-usr
+==> default/linux/amd64/23.0/systemd
+
+default/linux/amd64/17.1/systemd/selinux
+==> default/linux/amd64/23.0/hardened/selinux/systemd  [*,%]
+
+default/linux/amd64/17.1/systemd/selinux/merged-usr
+==> default/linux/amd64/23.0/hardened/selinux/systemd  [%]
+
+default/linux/amd64/17.1/clang
+==> default/linux/amd64/23.0/split-usr/llvm
+
+default/linux/amd64/17.1/systemd/clang
+==> default/linux/amd64/23.0/llvm/systemd  [*]
+
+default/linux/amd64/17.1/systemd/clang/merged-usr
+==> default/linux/amd64/23.0/llvm/systemd
+
+default/linux/amd64/17.0/x32
+==> default/linux/amd64/23.0/split-usr/x32
+
+default/linux/amd64/17.0/x32/systemd
+==> default/linux/amd64/23.0/x32/systemd  [*]
+
+default/linux/amd64/17.0/x32/systemd/merged-usr
+==> default/linux/amd64/23.0/x32/systemd
+
+default/linux/amd64/17.0/musl
+==> default/linux/amd64/23.0/split-usr/musl
+
+default/linux/amd64/17.0/musl/clang
+==> default/linux/amd64/23.0/split-usr/musl/llvm
+
+default/linux/amd64/17.0/musl/hardened
+==> default/linux/amd64/23.0/split-usr/musl/hardened
+
+default/linux/amd64/17.0/musl/hardened/selinux
+==> default/linux/amd64/23.0/split-usr/musl/hardened/selinux
+
+default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+  [&]
+
+default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+  [&]
+
+default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+  [&]
+
+default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+
+
+default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+
+
+default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+
+
+
+
+[*] This upgrade switches from split-usr to merged-usr layout since
+    the corresponding profile is not available anymore.
+    Please follow the migration guide.
+
+[#] The developer profiles are gone. Please migrate eventual settings
+    to your make.conf.
+
+[&] You will have to do the symlink migration from 17.0 to 17.1 first.
+
+[%] There are no standalone selinux profiles anymore, only hardened/selinux.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/gnome/parent
new file mode 100644
index 0000000000..9e06c4505a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/parent
new file mode 100644
index 0000000000..db8ce088c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/plasma/parent
new file mode 100644
index 0000000000..00b252f479
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/parent
new file mode 100644
index 0000000000..45a355b0be
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/amd64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
new file mode 100644
index 0000000000..f01a7a3572
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/package.use.force
@@ -0,0 +1,16 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# in a multilib profile we need multilib madness
+dev-libs/libffi abi_x86_32 abi_x86_64
+dev-libs/libxml2 abi_x86_32 abi_x86_64
+sys-devel/clang abi_x86_32 abi_x86_64
+sys-devel/clang-runtime abi_x86_32 abi_x86_64
+sys-devel/llvm abi_x86_32 abi_x86_64
+sys-libs/compiler-rt abi_x86_32 abi_x86_64
+sys-libs/libcxxabi abi_x86_32 abi_x86_64
+sys-libs/libcxx abi_x86_32 abi_x86_64
+sys-libs/libunwind abi_x86_32 abi_x86_64
+sys-libs/llvm-libunwind abi_x86_32 abi_x86_64
+sys-libs/ncurses abi_x86_32 abi_x86_64
+sys-libs/zlib abi_x86_32 abi_x86_64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/packages.build b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/packages.build
new file mode 100644
index 0000000000..9ffb08757b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/packages.build
@@ -0,0 +1,9 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# we use glibc here, so we still need these in stage1
+# later stages should pull them in as BDEPEND anyway
+sys-devel/gcc
+sys-devel/gcc-config
+sys-devel/binutils
+sys-devel/binutils-config
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/parent
new file mode 100644
index 0000000000..845cedb73f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/llvm/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/llvm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/parent
new file mode 100644
index 0000000000..01f0844ffc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened/amd64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/selinux/parent
new file mode 100644
index 0000000000..23c5fe07a2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/package.use.mask
new file mode 100644
index 0000000000..3435fc7a7d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-10-15)
+# Undo the general musl mask
+www-client/firefox -clang
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/parent
new file mode 100644
index 0000000000..63a4f9547e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/llvm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/make.defaults
new file mode 100644
index 0000000000..96ce023a7e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-gentoo-linux-musl"
+
+# Anthony G. Basile <blueness@gentoo.org> (2014-07-01)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="amd64"
+CHOST_amd64="${CHOST}"
+LIBDIR_amd64="lib"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.mask
new file mode 100644
index 0000000000..25a5df5e91
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.mask
@@ -0,0 +1,11 @@
+# Copyright 2020-2022 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-10-08)
+# openjdk-bin is available on amd64 musl
+-dev-java/openjdk-bin
+dev-java/openjdk-bin:8
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-28)
+# rust-bin is available on amd64 musl
+-dev-lang/rust-bin
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.use.mask
new file mode 100644
index 0000000000..08d81656b7
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-28)
+# upstream does not provide docs in musl tarball
+dev-lang/rust-bin doc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/parent
new file mode 100644
index 0000000000..35626ceeb3
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../arch/amd64/no-multilib
+../../../../../../features/musl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/parent
new file mode 100644
index 0000000000..438d8b3766
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened/amd64/no-multilib
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux/parent
new file mode 100644
index 0000000000..23c5fe07a2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/parent
new file mode 100644
index 0000000000..c559a75bb0
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/amd64/no-multilib
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+/parent
new file mode 100644
index 0000000000..ca2bf4c92b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+/parent
new file mode 100644
index 0000000000..6d5495a6cf
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+/parent
new file mode 100644
index 0000000000..df2c40188f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/prefix/standalone
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/parent
new file mode 100644
index 0000000000..f3229c5b98
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/no-multilib/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/make.defaults
new file mode 100644
index 0000000000..4fdae91f3d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2013 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-pc-linux-gnux32"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/parent
new file mode 100644
index 0000000000..9e204d6e17
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/x32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/amd64/x32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/make.defaults
new file mode 100644
index 0000000000..4fdae91f3d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2013 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-pc-linux-gnux32"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/parent
new file mode 100644
index 0000000000..cf0023cf48
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/amd64/x32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/x32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/gnome/parent
new file mode 100644
index 0000000000..9e06c4505a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/parent
new file mode 100644
index 0000000000..db8ce088c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/plasma/parent
new file mode 100644
index 0000000000..00b252f479
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/parent
new file mode 100644
index 0000000000..06fe2e606c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm/armv4
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/gnome/parent
new file mode 100644
index 0000000000..9e06c4505a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/parent
new file mode 100644
index 0000000000..db8ce088c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/plasma/parent
new file mode 100644
index 0000000000..00b252f479
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/parent
new file mode 100644
index 0000000000..8ab37175d9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm/armv4t
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/selinux/parent
new file mode 100644
index 0000000000..2190e9797e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv4t/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/gnome/parent
new file mode 100644
index 0000000000..9e06c4505a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/parent
new file mode 100644
index 0000000000..db8ce088c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/plasma/parent
new file mode 100644
index 0000000000..00b252f479
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/parent
new file mode 100644
index 0000000000..8036085b37
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm/armv5te
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/selinux/parent
new file mode 100644
index 0000000000..2190e9797e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv5te/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/gnome/parent
new file mode 100644
index 0000000000..9e06c4505a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/parent
new file mode 100644
index 0000000000..db8ce088c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/plasma/parent
new file mode 100644
index 0000000000..00b252f479
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/parent
new file mode 100644
index 0000000000..b7aa1e7120
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/arm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/parent
new file mode 100644
index 0000000000..f61eccdfba
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm/armv6j
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/selinux/parent
new file mode 100644
index 0000000000..2190e9797e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv6j/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/parent
new file mode 100644
index 0000000000..9e06c4505a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/systemd/parent
new file mode 100644
index 0000000000..2122741fb8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/parent
new file mode 100644
index 0000000000..db8ce088c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/parent
new file mode 100644
index 0000000000..00b252f479
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/systemd/parent
new file mode 100644
index 0000000000..f7739b4058
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/parent
new file mode 100644
index 0000000000..b7aa1e7120
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/hardened/arm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/parent
new file mode 100644
index 0000000000..873750b15e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/parent
@@ -0,0 +1,2 @@
+..
+../../../../../arch/arm/armv7a
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/kernel-3.2+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/kernel-3.2+/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/kernel-3.2+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/kernel-3.2+/parent
new file mode 100644
index 0000000000..b3da232ba5
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/parent
new file mode 100644
index 0000000000..f3229c5b98
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/selinux/parent
new file mode 100644
index 0000000000..2190e9797e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/armv7a/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/parent
new file mode 100644
index 0000000000..6589a0e014
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/systemd/parent
new file mode 100644
index 0000000000..f5c1ae438d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/parent
new file mode 100644
index 0000000000..ad6c5e126f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/parent
new file mode 100644
index 0000000000..ff3a7b1ec8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/systemd/parent
new file mode 100644
index 0000000000..44f88d3e2d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/parent
new file mode 100644
index 0000000000..3e3d7782ba
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/parent
new file mode 100644
index 0000000000..23c5fe07a2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/make.defaults
new file mode 100644
index 0000000000..e110341f12
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv6j-unknown-linux-musleabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/parent
new file mode 100644
index 0000000000..f3229c5b98
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv6j/parent
@@ -0,0 +1 @@
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/parent
new file mode 100644
index 0000000000..3e3d7782ba
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/parent
new file mode 100644
index 0000000000..23c5fe07a2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/make.defaults
new file mode 100644
index 0000000000..608aa101c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv7a-unknown-linux-musleabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/parent
new file mode 100644
index 0000000000..f3229c5b98
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/armv7a/parent
@@ -0,0 +1 @@
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/make.defaults
new file mode 100644
index 0000000000..52e98be483
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="arm-unknown-linux-musleabi"
+CHOST_arm="${CHOST}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/parent
new file mode 100644
index 0000000000..468c1fa0a9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../arch/arm
+../../../../../features/musl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/parent
new file mode 100644
index 0000000000..50be433109
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/parent
@@ -0,0 +1,2 @@
+..
+../../../../releases/23.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/gnome/parent
new file mode 100644
index 0000000000..d5a56a13f6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/parent
new file mode 100644
index 0000000000..fae96e8d36
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/plasma/parent
new file mode 100644
index 0000000000..0317df26cc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/parent
new file mode 100644
index 0000000000..83a5915080
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/arm/armv4
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/gnome/parent
new file mode 100644
index 0000000000..d5a56a13f6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/parent
new file mode 100644
index 0000000000..fae96e8d36
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/plasma/parent
new file mode 100644
index 0000000000..0317df26cc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/parent
new file mode 100644
index 0000000000..326a4a498b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/arm/armv4t
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv4t/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/gnome/parent
new file mode 100644
index 0000000000..d5a56a13f6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/parent
new file mode 100644
index 0000000000..fae96e8d36
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/plasma/parent
new file mode 100644
index 0000000000..0317df26cc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/parent
new file mode 100644
index 0000000000..de09636f07
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/arm/armv5te
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv5te/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/gnome/parent
new file mode 100644
index 0000000000..d5a56a13f6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/parent
new file mode 100644
index 0000000000..fae96e8d36
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/plasma/parent
new file mode 100644
index 0000000000..0317df26cc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/parent
new file mode 100644
index 0000000000..448e8b0705
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened/arm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/parent
new file mode 100644
index 0000000000..23c5fe07a2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/parent
new file mode 100644
index 0000000000..7648ec7e7c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/arm/armv6j
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv6j/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/gnome/parent
new file mode 100644
index 0000000000..d5a56a13f6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/parent
new file mode 100644
index 0000000000..fae96e8d36
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/plasma/parent
new file mode 100644
index 0000000000..0317df26cc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/parent
new file mode 100644
index 0000000000..448e8b0705
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/hardened/arm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/selinux/parent
new file mode 100644
index 0000000000..23c5fe07a2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/parent
new file mode 100644
index 0000000000..b70a1c7bef
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/arm/armv7a
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/kernel-3.2+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/kernel-3.2+/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/kernel-3.2+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/kernel-3.2+/parent
new file mode 100644
index 0000000000..df2c40188f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/prefix/standalone
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/parent
new file mode 100644
index 0000000000..f3229c5b98
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/selinux/parent
new file mode 100644
index 0000000000..23c64bb443
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/armv7a/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/gnome/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/gnome/parent
new file mode 100644
index 0000000000..9e06c4505a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/gnome
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/parent
new file mode 100644
index 0000000000..db8ce088c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/plasma/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/plasma/parent
new file mode 100644
index 0000000000..00b252f479
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop/plasma
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/parent
new file mode 100644
index 0000000000..de4036bb81
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/parent
new file mode 100644
index 0000000000..d148b9ae67
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/make.defaults
new file mode 100644
index 0000000000..e110341f12
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv6j-unknown-linux-musleabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/parent
new file mode 100644
index 0000000000..f3229c5b98
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv6j/parent
@@ -0,0 +1 @@
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/parent
new file mode 100644
index 0000000000..de4036bb81
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/hardened
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/parent
new file mode 100644
index 0000000000..d148b9ae67
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/hardened/selinux/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/selinux
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/make.defaults
new file mode 100644
index 0000000000..608aa101c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="armv7a-unknown-linux-musleabihf"
+CHOST_arm="${CHOST}"
+
+CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/parent
new file mode 100644
index 0000000000..f3229c5b98
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/armv7a/parent
@@ -0,0 +1 @@
+..
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/make.defaults
new file mode 100644
index 0000000000..52e98be483
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="arm-unknown-linux-musleabi"
+CHOST_arm="${CHOST}"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/parent
new file mode 100644
index 0000000000..5bbe8700f1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/musl/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/musl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/parent
new file mode 100644
index 0000000000..598ca888c8
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/split-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../features/split-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/systemd/parent
new file mode 100644
index 0000000000..ced72403bd
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm/23.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/parent
new file mode 100644
index 0000000000..c8b1675247
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/selinux/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/curl_ssl.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/curl_ssl.desc
index f52579304a..5f30da4450 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/curl_ssl.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/curl_ssl.desc
@@ -8,4 +8,5 @@ gnutls - Use GnuTLS
 mbedtls - Use mbed TLS
 nss - Use Mozilla's Network Security Services 
 openssl - Use OpenSSL
-winssl - Use WinSSL (only with elibc_Winnt) 
+rustls - Use Rustls
+winssl - Use WinSSL (only with elibc_Winnt)
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask
index b0f0111282..b8acfcc4b5 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask
@@ -220,6 +220,7 @@ sci-electronics/labone
 sci-mathematics/gimps
 sci-misc/jupyterlab-desktop-bin
 sci-misc/netlogo-bin
+sci-libs/mkl
 sys-apps/ipmicfg
 sys-apps/tas
 sys-block/hpssacli
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask
index cfe51a434c..948bfb2552 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask
@@ -1,6 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-12-10)
+# sci-libs/mkl is binary only and links to glibc
+sci-chemistry/gromacs mkl
+sci-libs/armadillo mkl
+sci-libs/dlib mkl
+sci-libs/trilinos mkl
+
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2022-10-04)
 # Mask loguru until fixed upstream #873601
 sci-libs/vtk logging
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask
index 4dd5915ab8..a61e763465 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask
@@ -1,6 +1,36 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-12-11)
+# net-libs/rustls-ffi needs Rust.
+net-misc/curl rustls curl_ssl_rustls
+
+# matoro <matoro_gentoo@matoro.tk> (2022-12-01)
+# tree-sitter-grammar.eclass adds dev-util/tree-sitter-cli as test dep
+dev-libs/tree-sitter-bash test
+dev-libs/tree-sitter-c test
+dev-libs/tree-sitter-c-sharp test
+dev-libs/tree-sitter-cpp test
+dev-libs/tree-sitter-css test
+dev-libs/tree-sitter-embedded-template test
+dev-libs/tree-sitter-go test
+dev-libs/tree-sitter-haskell test
+dev-libs/tree-sitter-html test
+dev-libs/tree-sitter-java test
+dev-libs/tree-sitter-javascript test
+dev-libs/tree-sitter-jsdoc test
+dev-libs/tree-sitter-json test
+dev-libs/tree-sitter-julia test
+dev-libs/tree-sitter-ocaml test
+dev-libs/tree-sitter-php test
+dev-libs/tree-sitter-python test
+dev-libs/tree-sitter-ql test
+dev-libs/tree-sitter-ruby test
+dev-libs/tree-sitter-rust test
+dev-libs/tree-sitter-scala test
+dev-libs/tree-sitter-tsq test
+dev-libs/tree-sitter-typescript test
+
 # Sam James <sam@gentoo.org> (2022-11-19)
 # GNOME packages pulling in e.g. gjs which then needs Rust.
 dev-util/glade gjs
diff --git a/sdk_container/src/third_party/portage-stable/profiles/license_groups b/sdk_container/src/third_party/portage-stable/profiles/license_groups
index bb239d02fa..44388deb08 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/license_groups
+++ b/sdk_container/src/third_party/portage-stable/profiles/license_groups
@@ -32,7 +32,7 @@ OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Ar
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE AIFFWriter.m Allegro alternate AMPAS BEER-WARE boehm-gc BSD-1 BSD-2-with-patent BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 CAOSL CDDL-1.1 CDDL-Schily CMake coldspringharbor CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLGPL-2.1 LPPL-1.3 lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-AMD NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA RtMidi rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
+MISC-FREE AIFFWriter.m AOM Allegro alternate AMPAS BEER-WARE boehm-gc BSD-1 BSD-2-with-patent BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 CAOSL CDDL-1.1 CDDL-Schily CMake coldspringharbor CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLGPL-2.1 LPPL-1.3 lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-AMD NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA RtMidi rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
diff --git a/sdk_container/src/third_party/portage-stable/profiles/package.mask b/sdk_container/src/third_party/portage-stable/profiles/package.mask
index 44138e0192..d59f43600f 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask
@@ -33,6 +33,114 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2022-12-11)
+# ruby27-only package. No reverse dependencies.
+# Last release in 2012. Removal in 30 days.
+dev-ruby/log_buddy
+
+# Hans de Graaff <graaff@gentoo.org> (2022-12-11)
+# ruby27-only slot. No reverse dependencies.
+# Use a newer mime-types slot.
+# Removal in 30 days.
+dev-ruby/mime-types:2
+
+# Hans de Graaff <graaff@gentoo.org> (2022-12-11)
+# ruby27-only package. No reverse dependencies.
+# Last release in 2013. Removal in 30 days.
+dev-ruby/nagios_analyzer
+
+# Hans de Graaff <graaff@gentoo.org> (2022-12-11)
+# ruby27-only package. No reverse dependencies.
+# Last release in 2009. Removal in 30 days.
+dev-ruby/ntlm-http
+
+# Hans de Graaff <graaff@gentoo.org> (2022-12-11)
+# ruby27-only package. No reverse dependencies.
+# Removal in 30 days.
+dev-ruby/posix-spawn
+
+# Jonas Stein <jstein@gentoo.org> (2022-12-11)
+# Unfetchable and mirror-restricted.
+# Upstream discontinued
+# Removal after 2023-02-01.  Bug #884715.
+dev-cpp/sourcetrail
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-12-10)
+# Fails to build with recent perl. No maintainer, no revdeps.
+# Removal in 30 days. Bug 849518
+net-p2p/opendchub
+
+# Sam James <sam@gentoo.org> (2022-12-09)
+# Breaks compilation of reverse dependencies with broken pkgconfig (pc) file
+# bug #885075, https://github.com/libarchive/libarchive/issues/1766
+=app-arch/libarchive-3.6.2
+
+# Sam James <sam@gentoo.org> (2022-12-09)
+# mpc.h breaks compilation of reverse dependencies, reported upstream to ML
+=dev-libs/mpc-1.3.0
+
+# Michał Górny <mgorny@gentoo.org> (2022-12-09)
+# Unfetchable as the upstream homepage is gone, and mirror-restricted.
+# No package activity since 2018.
+# Removal on 2023-01-08.  Bug #668090.
+games-strategy/netherearth
+
+# Michał Górny <mgorny@gentoo.org> (2022-12-08)
+# Seems to break some logic in pkg_resources.  Masked for the time being
+# to prevent breakage.
+>=dev-python/packaging-22.0
+
+# Ionen Wolkens <ionen@gentoo.org> (2022-12-07)
+# Formerly added to apply binary git patches to wine-staging without git, but
+# has not been used since 2017 and stuck on EAPI-6. Alternatives: dev-vcs/git
+# Removal: 2023-01-06.
+dev-util/patchbin
+
+# Sam James <sam@gentoo.org> (2022-12-07)
+# HOMEPAGE & remote-id are for a different project, SRC_URI is gone,
+# only results on Google are for Gentoo mirrors, EAPI 6. Removal on 2023-01-07.
+# bug #630264, bug #655964, bug #750071.
+dev-vcs/git-pimp
+
+# Sam James <sam@gentoo.org> (2022-12-07)
+# These versions have been masked for testing since 2014(!). These versions
+# had a controversial licence change and therefore had limited adoption.
+# See also the old 2021-05-30-deprecate-old-bdb-slots news item for
+# additional context.
+# Removal on 2023-01-07.
+=sys-libs/db-6.1*
+=sys-libs/db-6.2*
+=sys-libs/db-18.1*
+
+# Naohiro Aota <naota@gentoo.org> (2022-12-07)
+# Masked for removal in 30 days. Depends on gnome-base/gconf. Last release
+# in 2011. See bug #873880.
+sys-apps/gpet
+
+# David Seifert <soap@gentoo.org> (2022-12-06)
+# EAPI 6, untouched for years, no revdeps. Removal on 2023-01-05.
+media-video/nvidia-video-codec
+
+# Sam James <sam@gentoo.org> (2022-12-06)
+# Broke C++ reverse dependencies. Please upgrade to 1.1.0-r1. See bug #884369.
+=x11-libs/libICE-1.1.0
+
+# Hans de Graaff <graaff@gentoo.org> (2022-12-05)
+# ruby27-only package. No longer maintained upstream. Last release in 2017.
+# No reverse dependencies. Removal in 30 days.
+dev-ruby/hipchat
+
+# Hans de Graaff <graaff@gentoo.org> (2022-12-05)
+# This package has been subsumed into its only consumer:
+# dev-ruby/nio4r. It is no longer developed, and its last standalone
+# release was 11 years ago. Removal in 30 days.
+dev-ruby/iobuffer
+
+# Marek Szuba <marecki@gentoo.org> (2022-12-05)
+# No releases since 2003 (!), upstream effectively dead, no Unicode support,
+# EAPI 6. Removal in 30 days (#884429)
+app-editors/elvis
+
 # Robin H. Johnson <robbat2@gentoo.org> (2022-12-04)
 # sys-boot/mbr-gpt was a bizzare package extremely sensitive to compiler &
 # linker changes. I don't know of any remaining consumers other than one weird
@@ -114,6 +222,7 @@ dev-util/cucumber-core:3.2
 dev-util/cucumber-expressions
 dev-util/cucumber-tag_expressions
 dev-util/cucumber-wire:0
+dev-util/protobuf-cucumber
 
 # Hans de Graaff <graaff@gentoo.org> (2022-12-01)
 # Old slot without dependencies on it. Blocks removal of
@@ -508,11 +617,6 @@ x11-drivers/xf86-video-nv
 =sys-apps/portage-3.0.37
 =sys-apps/portage-3.0.38
 
-# Brian Evans <grknight@gentoo.org> (2022-09-30)
-# Mask RC versions for initial testing
-<dev-lang/php-8.2.0:8.2
-virtual/httpd-php:8.2
-
 # John Helmert III <ajak@gentoo.org> (2022-09-18)
 # Unfixed root privilege escalation, bug #631552
 sys-cluster/slurm
@@ -786,7 +890,7 @@ app-office/texmacs
 # If you still use one of these old toolchain packages, please upgrade (and
 # switch the compiler / the binutils) ASAP. If you need them for a specific
 # (isolated) use case, feel free to unmask them on your system.
-<sys-libs/glibc-2.33
+<sys-libs/glibc-2.36-r5
 <sys-devel/binutils-2.38
 
 # Michael Orlitzky <mjo@gentoo.org> (2017-01-07)
@@ -795,15 +899,6 @@ app-office/texmacs
 # use. See bugs 603346 and 604998 for more information.
 app-admin/amazon-ec2-init
 
-# Robin H. Johnson <robbat2@gentoo.org> (2014-08-04)
-# Masked for testing, presently fails upstream testsuite:
-# FAIL:07:02:35 (00:00:00) db_dump/db_load(./TESTDIR.3/recd001.db:child killed: kill signal): expected 0, got 1
-# FAIL:07:02:35 (00:00:00) Dump/load of ./TESTDIR.3/recd001.db failed.
-# FAIL:07:02:35 (00:00:00) db_verify_preop: expected 0, got 1
-=sys-libs/db-6.1*
-=sys-libs/db-6.2*
-=sys-libs/db-18.1*
-
 # Mike Gilbert <floppym@gentoo.org> (2014-03-04)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/arm64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
index 6cc70f2fb1..5ccad25049 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2021-11-09)
 # Older GMP releases have a bug in their arm64 Darwin ASM
 # 6.2.2 isn't released but this will catch any releases we know are broken
 # like 6.2.1, and it's already fixed in git upstream.
-<dev-libs/gmp-6.2.2 asm
+<dev-libs/gmp-6.2.2 asm cpudetection
diff --git a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
index 6369bcb7a2..04783d940c 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
@@ -43,9 +43,11 @@ amd64		default/linux/amd64/17.1/no-multilib/hardened/selinux		stable
 amd64		default/linux/amd64/17.1/no-multilib/systemd			dev
 amd64		default/linux/amd64/17.1/no-multilib/systemd/merged-usr		dev
 amd64		default/linux/amd64/17.1/no-multilib/systemd/selinux		exp
+amd64		default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr		exp
 amd64		default/linux/amd64/17.1/systemd				stable
 amd64		default/linux/amd64/17.1/systemd/merged-usr			stable
 amd64		default/linux/amd64/17.1/systemd/selinux			exp
+amd64		default/linux/amd64/17.1/systemd/selinux/merged-usr			exp
 amd64		default/linux/amd64/17.1/clang					exp
 amd64		default/linux/amd64/17.1/systemd/clang				exp
 amd64		default/linux/amd64/17.1/systemd/clang/merged-usr		exp
@@ -129,6 +131,7 @@ arm64		default/linux/arm64/17.0/developer				exp
 arm64		default/linux/arm64/17.0/systemd				stable
 arm64		default/linux/arm64/17.0/systemd/merged-usr			stable
 arm64		default/linux/arm64/17.0/systemd/selinux			exp
+arm64		default/linux/arm64/17.0/systemd/selinux/merged-usr			exp
 arm64		default/linux/arm64/17.0/llvm					exp
 arm64		default/linux/arm64/17.0/systemd/llvm				exp
 arm64		default/linux/arm64/17.0/systemd/llvm/merged-usr		exp
@@ -162,12 +165,12 @@ ia64		default/linux/ia64/17.0/systemd/merged-usr			exp
 
 # LoongArch Profiles
 # @MAINTAINER: loong@gentoo.org
-loong		default/linux/loong/22.0/la64v100/lp64d					exp
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop				exp
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd			exp
-loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr	exp
-loong		default/linux/loong/22.0/la64v100/lp64d/systemd				exp
-loong		default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr		exp
+loong		default/linux/loong/22.0/la64v100/lp64d					stable
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop				dev
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd			dev
+loong		default/linux/loong/22.0/la64v100/lp64d/desktop/systemd/merged-usr	dev
+loong		default/linux/loong/22.0/la64v100/lp64d/systemd				stable
+loong		default/linux/loong/22.0/la64v100/lp64d/systemd/merged-usr		stable
 
 # M68K Profiles
 # @MAINTAINER: m68k@gentoo.org
diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/package.mask b/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/package.mask
index 206ab70bd1..3269696951 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/package.mask
@@ -1,5 +1,6 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# DT_RELR needs glibc-2.36
+# DT_RELR needs glibc-2.36 or musl-1.2.4(?)
 <sys-libs/glibc-2.36
+<sys-libs/musl-1.2.4
diff --git a/sdk_container/src/third_party/portage-stable/profiles/thirdpartymirrors b/sdk_container/src/third_party/portage-stable/profiles/thirdpartymirrors
index eec4afcd6e..a5174aec58 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/thirdpartymirrors
+++ b/sdk_container/src/third_party/portage-stable/profiles/thirdpartymirrors
@@ -1,4 +1,4 @@
-apache		https://dlcdn.apache.org/ https://apache.lauf-forum.at/ https://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://apache.mirrors.hoobly.com/ http://www.gtlib.gatech.edu/pub/apache/ https://apache.osuosl.org/
+apache		https://dlcdn.apache.org/ https://apache.lauf-forum.at/ https://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://apache.mirrors.hoobly.com/ https://apache.osuosl.org/
 cpan		https://cpan.metacpan.org https://www.cpan.org
 cran		https://cran.r-project.org https://cran.us.r-project.org
 debian		https://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022
index fd98594f3e..712b637216 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022
@@ -12,3 +12,4 @@ move dev-lang/open-cobol dev-lang/gnucobol
 move dev-python/miniupnpc dev-python/python-miniupnpc
 move virtual/awk app-alternatives/awk
 move virtual/yacc app-alternatives/yacc
+slotmove sys-devel/autoconf-dickey 2.52_p20210509 2.52

From 168409ac2f8523fd5ff5be809300fe3c87a4c4f1 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:15:19 +0000
Subject: [PATCH 25/30] sys-devel/autoconf-wrapper: Sync with Gentoo

It's from Gentoo commit 17cd20efce18f133cfb0977703bd1a5027c6a607.
---
 .../sys-devel/autoconf-wrapper/Manifest       |  1 +
 .../autoconf-wrapper-20221207.ebuild          | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest
index 92ba4e2d8d..4c4633a505 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest
@@ -1,2 +1,3 @@
 DIST autotools-wrappers-at-20220130.tar.gz 3625 BLAKE2B c587d778a0c3331d14498308ae720dabdbcf27349ef0a3a2d5db56bb0ef597a5b1ab43388f1456e7888b40f043d68b0d89b420ac7404008f9a813ef78ae7e96f SHA512 700204b6024636dc808339aac15fb19bb645b654d4777ba8bf0febded5eb6af98659d04ed23819a8a638b6ee905e62292995bf2f838c30dedacb1a6bc0d04f1a
 DIST autotools-wrappers-at-20221118.tar.gz 3625 BLAKE2B 713e4b581baf6b5c0756f8bd026566e113eb6e8f54a594f132aa952277f68c7a9da28c93a191b8ad4279952ebcfcf7a5d679d4bb7a831b14af208ff2172ee15c SHA512 1409c890fa3450195868536bb8c1bdcfb52c11f412ab0b99652e39b7ea4eeec1807611e4fa89c8289c162c7de8ff5c2864a86d6637ea24088b3125f8db895663
+DIST autotools-wrappers-at-20221207.tar.gz 3646 BLAKE2B 82bec40e03ae5ec133252fd3c05c3fed537bb415e800918df9c9d783d48a9d76cbe60c53dd7daf6d94653d79fc52be8c089183dda996e8a72dd03ffa83098613 SHA512 12ea99721e6fc60a3ed7351d6c228aaf6e4eef0bd0444eda8cd742f74fa91150ef07bb52f6bcad4a350269e8032f5d4e204d2f2108b0d9c441ddd7f9755862b7
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild
new file mode 100644
index 0000000000..936757448f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild
@@ -0,0 +1,34 @@
+# 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
+	newexe ac-wrapper.sh ac-wrapper.sh
+
+	dodir /usr/bin
+	local x=
+	for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
+		dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x}
+	done
+}

From 835e1dd756b0eda6810385b928571859b2aaf2e6 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:15:23 +0000
Subject: [PATCH 26/30] sys-devel/gcc: Sync with Gentoo

It's from Gentoo commit 7a15ea9bb126f10a499fe6eed806d7c19418b44b.
---
 .../portage-stable/sys-devel/gcc/Manifest     | 20 ++-----
 .../sys-devel/gcc/gcc-10.4.1_p20221124.ebuild | 58 -------------------
 .../sys-devel/gcc/gcc-10.4.1_p20221201.ebuild | 58 -------------------
 ...006.ebuild => gcc-10.4.1_p20221208.ebuild} |  4 +-
 .../sys-devel/gcc/gcc-11.3.1_p20221007.ebuild | 52 -----------------
 .../sys-devel/gcc/gcc-11.3.1_p20221125.ebuild | 52 -----------------
 ...202.ebuild => gcc-11.3.1_p20221209.ebuild} |  0
 .../sys-devel/gcc/gcc-12.2.1_p20221126.ebuild | 52 -----------------
 .../sys-devel/gcc/gcc-12.2.1_p20221203.ebuild |  2 +-
 ...008.ebuild => gcc-12.2.1_p20221210.ebuild} |  2 +-
 .../gcc/gcc-13.0.0_pre20221106.ebuild         | 53 -----------------
 ...7.ebuild => gcc-13.0.0_pre20221211.ebuild} |  0
 .../portage-stable/sys-devel/gcc/metadata.xml |  1 -
 13 files changed, 9 insertions(+), 345 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221124.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221201.ebuild
 rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-10.4.1_p20221006.ebuild => gcc-10.4.1_p20221208.ebuild} (92%)
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221007.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221125.ebuild
 rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-11.3.1_p20221202.ebuild => gcc-11.3.1_p20221209.ebuild} (100%)
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
 rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-12.2.1_p20221008.ebuild => gcc-12.2.1_p20221210.ebuild} (99%)
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221106.ebuild
 rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.0.0_pre20221127.ebuild => gcc-13.0.0_pre20221211.ebuild} (100%)

diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest
index a753f8eb02..37184006cf 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest
@@ -1,33 +1,23 @@
-DIST gcc-10-20221006.tar.xz 71755692 BLAKE2B 0099821e5fcd5e1a069369a72f105607cb7f20fbef3d627a598d8c7a6439491e050533d6577b4f7953aabb52daf926ffc8eb9cecd8853833a14c90bd878e1ad9 SHA512 3fc1dceff31ec8a84babe31d88a312d9d3d30450ff0c42730b9a9fe45c0fc9509216fb95cd84df7477faebe2b9b7d8f7e269c9e76cecc05417dc6192e3b96c67
-DIST gcc-10-20221124.tar.xz 71781080 BLAKE2B ec7f4f140102d25a7469f7931df7b87b4b91c1c94fc263ecd9cc9aca36d120e9f5e09776efefba1099abe5282eb1cc4ec8201bcdca3a13c7b1bbdd6b34ad994d SHA512 b7af71bb2dd594643393b3e4dea4e641dcfad6e5249b6ee05617f0648ef2609b707b18f12f3985b3d13cbee6af0f799d7377c28092420b251b34e93f910e686e
-DIST gcc-10-20221201.tar.xz 72102628 BLAKE2B cfd245eb7c364b1480987d259a2c7b569d08830a3af656e6e493864ceda1eb8b0a8a67c405566a826c0c1bb044dc07a6123e6c53c5eac15882cb02a003e95214 SHA512 87da77d035688e033bb1b0c4f95df411a111d87499b18f3ecfb67d0550860243a58fdd5e4cec2d20535d2e3cc5261267fe26f11d2d03e7eb12b3f306b17eb961
+DIST gcc-10-20221208.tar.xz 72098912 BLAKE2B 8167b3d91fb95c727caa3a76d8bd6d70e0d0bd79eda72305f3005c9f7163dcd425c75386ba55b2d71644ecf83d998a4bccb6fd265bb615dcdd104f27cadb8e76 SHA512 5e49159d86300eaa4c2f34fb3537b5f257931e861a1a1217dbabcfcd5ef9da224d4a6023aaf8d24c8893ecd204ec0cd6e96349ae0dd445d62d92ebb041aeb054
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
 DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6
-DIST gcc-10.5.0-patches-0.tar.xz 16188 BLAKE2B 3fe3163c4960ff02eb792b2d00b9b20e1c2b44ad2d2e79661ffa0a5795b1bb631bce83c506f485765a7b971e6d391ebc1803c327f0d8d06e457610f5d6074c90 SHA512 fde1fec92df535416221827d48daf7d498f675da5697bc15bb4e17ccfedf6e6705dd28f57a3c9ebc8065b49328246fa5aa1fd90bd88bc27fe2b7b3e924f0df15
 DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26
-DIST gcc-11-20221007.tar.xz 75790520 BLAKE2B de52f7fc5c7f5f82d9cbaeaa13b216e149a4aac8162188c628007c17ddb40aa838d19f2ca18216e8bfe5df2d21438f10c8e87298b53cbde4359f72c9cff87589 SHA512 b785236a00647041c9ea4552e5ea82a09e23a801b029773ba77bfc03675c530369ad0b5fc279330f3d8dd4b9b40aeaa9de84a39b6397f73984b7e2fdf8f0bad2
-DIST gcc-11-20221125.tar.xz 76248264 BLAKE2B c2fe15a14c77ce36f117d8d3bb78d38684e237db16db249134dd1e24d1455dfe7ca544fe22155b2c368dc6658b96d626af87d47478aaf94c216eb84b469e43e9 SHA512 3efbd7dc4cbf748d41369bff5bedb586a1c9397fa7fa56be7869e62bd567273b056aeec01a4191783bad737640e163489f1b368fcaac3155ae3ac8f7b33f478d
-DIST gcc-11-20221202.tar.xz 76241508 BLAKE2B 313a73cf579a1899996b35494484debbb3c5aa13cd90f54830e30e962d9df2eee059bb3afd429fb3a3e7cb6a889c8c7d03a22a64e57d8d3e046b0c8c431847e3 SHA512 6c8e4654041d84129d94a7317a125348d2d3db4f1029ad069bd271ae11e51f80adfabf970634f6faca52356891a6a87a503ba9421750d6e0a11527ec7fa7bd91
+DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3
 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
-DIST gcc-11.4.0-patches-2.tar.xz 14224 BLAKE2B d3030c19a7bd8bd082fd39b35c3e80883ae541ab28232513ba60095fe81f5fe1fbdc54829a1556b2d278328033f6eb8a81e9ee268a6020b554388a60842b02e6 SHA512 60aa19f00fb29b7c8a68c73de274e24559dc896f551d47153ea511b202941caa950c0aff62ad28d057a8ed16f2aec2c06e681e7286d65ab3610b6948d7bb840a
 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9
-DIST gcc-12-20221008.tar.xz 79145884 BLAKE2B ff3d684d887e282c79fe95952a449ed5770d4bd74077553baf31c34dbd77177e680b19ac741c04aab26ac2c9bb2b89924f51f63e2f22b440decf2c65274a7640 SHA512 a35a6207e7f4375abca3ae57376c98b082846a88e83522c322d713e759367ceb2b3ad68488bed6f1645e47a106b0bbb2efbca6cb14b077672289acb4373e616f
-DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df
 DIST gcc-12-20221203.tar.xz 79639180 BLAKE2B 5b237eca5934c6ea869d50396279b0bbb72c9377f71c7ad9b457d1e2422337f7ff6c9cd8021f3c9f94f62b1d31348d550ed3afe49f4231099bb889c27c2c23cb SHA512 87ebbf26544e0b4e20fc36dffcb343bc074603e409e204079f3559f4b336da98af7d1c702254a54ad243c230aca60027f80029f14d7c0ff7ee13e31ecf9b73d7
+DIST gcc-12-20221210.tar.xz 79645632 BLAKE2B 063222037d420f356d452d0419fc4621c30393beaca1f2661d7070c087bca88831f27ae96d8fb7433efaeb59cb338495fb210611a1c37931a1d00373cba9812b SHA512 00399148932b5c57dbe442dcde01e856cbb981c7cc6703760ea51b28e0784cbc6e016663f195b69714da8c7e2cdcfbc03cb1939bab3e6b507b64846e1e814fa6
 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
-DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9
-DIST gcc-12.2.0-patches-3.tar.xz 13972 BLAKE2B 46d61854059c190525f26e411273623cc8a89b33fb9387fcd08545e244b244fc7c895eb630bc96ccc63a084c3010801c7b9d0bdb69ea8a70e034daf2d57ca51c SHA512 7e240992c59fade5e35357ebd69c1439dbadcbc1f850dc3b5360765cf899a67c662d4fe8b8eb8cf60186e7009b16dee92bc44424b9d55164d62c3d62fec7ccf4
+DIST gcc-12.2.0-patches-4.tar.xz 19052 BLAKE2B 74027e339125ad412b2e03265d2d797fdf4b794ed37f5d5ed33915f9e1f2592f6f7e1d8edf822700de5300fb39ac45fb3b671c6fac852246057f97f3ec4d411d SHA512 14a26185c96225c2babed80b29ef9897a601862d32cdc116abbd7efb551d1e25f639d5c5059996af53d30bb049f08c66af366a854a8d2eb2967f87ea390a37a0
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
-DIST gcc-13-20221106.tar.xz 80001320 BLAKE2B 4a86b5aedf67725b577a69112ab241b22b3b0eed6c86e2d9ed06e5045a1de1c4bc6f2e7a281f1a034b9b227e5ef72954d17900369bed6015e064f303c89e6cf2 SHA512 bd3160d23bdebd0e423800736212e340eab0a71891d579145d85931fe8fa3c9e196a3422d70a98e17d1990759bf57b3e4eb08b25544db5e4fec8448d1a33ee20
-DIST gcc-13-20221127.tar.xz 80684196 BLAKE2B 6c5bdb5f5f7c624d60a37113c09a1a97a44839849623d860af06dcf2883f7fafde286245aac6e06938ba25a3fd05588c77f73311d246ec08a22260874fb45112 SHA512 aedf3817200ce8a08afa0bd979a660de42d86aabf6c0a9028f5f34ba7d5f5b45bc4abaf35ecd62d1f8d4fac05e8a003ab7358e8a7114b8d0d63d61c1695da4c6
 DIST gcc-13-20221204.tar.xz 80748844 BLAKE2B a5ea8a72b475991602ebff668e50f03e1c9343083e33d3f1a02499fed59cdd6214743567e79d866851ed4506cabc2ff52b6e1634eabfff9deca19d4402382d36 SHA512 b40b800d4369cb899f0a8224d15e7a78f6b182d8490de01ab1520647862263cc478f49f021172c91c2c6d39cbbc4ec92e18644cf3bab5a0df44dabbc3b7c6702
-DIST gcc-13.1.0-patches-2.tar.xz 9924 BLAKE2B 568f8b9e31974f4991bd922436373320118a6fe07b7e9fe0127952894bdebc5e8684f66e645a3a5684717c687e9bb6074508972b61a3eb692c6e5f23e46359cf SHA512 9fed795ce3aa423e223864b750e50419343bbb36f53e938a691f189e954acb3a4efec4aafe466bafb3556a04c78bf68d19e3e60ffd0a2be490ea821d98e92dc9
+DIST gcc-13-20221211.tar.xz 80786948 BLAKE2B e7fc58b53584d5269f889ec2575de6b50d9b9fff9b6e71749979a3e47291465dbc26600790e5ab66993e666cd654d7e4663d0d9ce2b51c7ac7e50b8300a18aa2 SHA512 dcb51c9f6654dd1730943468d72084eed869d8ea09e1645e066cdb3a9ff8be2439082d43de620e045e66b3b894f21163b665166b02942821485b2b06a5180782
 DIST gcc-13.1.0-patches-3.tar.xz 10984 BLAKE2B b032049090732e39c94788f4014a463e82fe186ad9ca5ca7ec1d522dfc4499bd2c229bc3bed7ed1d4e1e5f196444037acdea8b865d62c164d6daf307f949e307 SHA512 940d5f1e7f8cb48e9e6d63b5cd31dc5e4bd1669c78b3adfa6b7c30d3f85d8de4f26c1db4e3727f3789b1d439d07d3eeb9a8120f45693da6c2e6d9ca27e264941
 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221124.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221124.ebuild
deleted file mode 100644
index 1fa3a36015..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221124.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="1"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221201.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221201.ebuild
deleted file mode 100644
index 1fa3a36015..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221201.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="1"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221006.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
similarity index 92%
rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221006.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
index 147a87b613..a1b3257cd3 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221006.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
@@ -7,7 +7,7 @@ TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
 #TOOLCHAIN_GCC_RC=1
 PATCH_GCC_VER="10.5.0"
-PATCH_VER="0"
+PATCH_VER="1"
 MUSL_VER="1"
 MUSL_GCC_VER="10.5.0"
 
@@ -36,7 +36,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	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
 
 RDEPEND=""
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221007.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221007.ebuild
deleted file mode 100644
index e821929d61..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221007.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221125.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221125.ebuild
deleted file mode 100644
index d6ead8b3a5..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221125.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="3"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221202.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221202.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
deleted file mode 100644
index 28a10fb471..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-MUSL_GCC_VER="12.2.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
-elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
-	# Cheesy hack for RCs
-	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-	MY_P=${PN}-${MY_PV}
-	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-	TOOLCHAIN_SET_S=no
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain
-
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-
-# Don't keyword live ebuilds
-#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221203.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221203.ebuild
index 47a0ea215e..942146b854 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221203.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221203.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="3"
+PATCH_VER="4"
 PATCH_GCC_VER="12.2.0"
 MUSL_VER="1"
 MUSL_GCC_VER="12.2.0"
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221210.ebuild
similarity index 99%
rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221210.ebuild
index aa3dfbf98f..942146b854 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221210.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
+PATCH_VER="4"
 PATCH_GCC_VER="12.2.0"
 MUSL_VER="1"
 MUSL_GCC_VER="12.2.0"
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221106.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221106.ebuild
deleted file mode 100644
index 5cdc65a07d..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221106.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="13.1.0"
-MUSL_GCC_VER="13.1.0"
-
-if [[ $(ver_cut 3) == 9999 ]] ; then
-	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
-	if [[ ${MY_PV_2} == 0 ]] ; then
-		MY_PV_2=0
-		MY_PV_3=0
-	else
-		MY_PV_2=$(($(ver_cut 2) - 1))
-	fi
-
-	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
-fi
-
-inherit toolchain
-# Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=master
-
-# Don't keyword live ebuilds
-if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	KEYWORDS="~loong"
-fi
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221127.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221211.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221127.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221211.ebuild
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml
index 8c2257393b..13eb6f59be 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml
@@ -32,6 +32,5 @@
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:gnu:gcc</remote-id>
-		<remote-id type="sourceforge">dgcc</remote-id>
 	</upstream>
 </pkgmetadata>

From 03fda422c6f3e539dffbfab50f235ceb3b30feb6 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 12 Dec 2022 07:15:24 +0000
Subject: [PATCH 27/30] sys-devel/libtool: Sync with Gentoo

It's from Gentoo commit 111847c60008231e6329949ec6ce2c8e18ffe41b.
---
 .../portage-stable/sys-devel/libtool/Manifest |   1 -
 .../files/libtool-2.4.6-darwin20.patch        |  13 -
 .../libtool-2.4.6-libtoolize-delay-help.patch |  53 ----
 .../files/libtool-2.4.6-libtoolize-slow.patch | 118 --------
 .../files/libtool-2.4.6-link-fsanitize.patch  |  46 ----
 .../files/libtool-2.4.6-link-fuse-ld.patch    |  43 ---
 .../files/libtool-2.4.6-link-specs.patch      |  45 ----
 .../libtool-2.4.6-sed-quote-speedup.patch     | 253 ------------------
 .../files/libtool-2.4.7-werror-lto.patch      |  47 ++++
 ....4.6-r6.ebuild => libtool-2.4.7-r1.ebuild} |  37 +--
 .../sys-devel/libtool/libtool-2.4.7.ebuild    |   2 +-
 .../sys-devel/libtool/libtool-9999.ebuild     |   4 +-
 12 files changed, 69 insertions(+), 593 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch
 rename sdk_container/src/third_party/portage-stable/sys-devel/libtool/{libtool-2.4.6-r6.ebuild => libtool-2.4.7-r1.ebuild} (70%)

diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/Manifest
index 123e05bfb2..d36ba6c576 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/Manifest
@@ -1,2 +1 @@
-DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch
deleted file mode 100644
index 02cb1d7eb9..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-macOS Big Sur is 11.0, Darwin 20, after a long line of 10.X releases.
-macOS Monterey is 12.0.
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -1076,7 +1076,7 @@
- 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
- 	10.[[012]][[,.]]*)
- 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
--	10.*)
-+	10.*|11.*|12.*)
- 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-       esac
-     ;;
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch
deleted file mode 100644
index 974cd44d02..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://lists.gnu.org/archive/html/libtool-patches/2016-02/msg00002.html
-
-From 53419307d5b44e5b0cff80d76f88ea02f237b747 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 13 Feb 2016 03:32:20 -0500
-Subject: [PATCH] libtoolize: don't execute automake and autoconf on every
- invocation.
-
-Same fix as applied to libtool in commit 408cfb9c5fa8a666917167ffb806cb
-to delay use of automake/autoconf to when the --help option is actually
-specified.
-
-* libtoolize.in (func_help): Override func_help() from
-gl/build-aux/options-parser to only run automake --version and
-autoconf --version when libtool --help is executed on the command
-line.
----
- libtoolize.in | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/libtoolize.in b/libtoolize.in
-index 3fe61ce..0d4af3d 100644
---- a/libtoolize.in
-+++ b/libtoolize.in
-@@ -94,7 +94,12 @@ usage_message="Options:
- "
- 
- # Additional text appended to 'usage_message' in response to '--help'.
--long_help_message=$long_help_message"
-+func_help ()
-+{
-+    $debug_cmd
-+
-+    func_usage_message
-+    $ECHO "$long_help_message
-        'environment'   show warnings about LIBTOOLIZE_OPTIONS content
-        'file'          show warnings about file copying and linking
- 
-@@ -120,8 +125,9 @@ include the following information:
- 
- Report bugs to <@PACKAGE_BUGREPORT@>.
- GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
--General help using GNU software: <http://www.gnu.org/gethelp/>.
--"
-+General help using GNU software: <http://www.gnu.org/gethelp/>."
-+    exit 0
-+}
- 
- warning_categories='environment file'
- 
--- 
-2.6.2
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch
deleted file mode 100644
index d27f976ccb..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 351a88feee66eda6ce33eb06acdebb8e9c6d6716 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Fri, 18 Sep 2015 23:17:07 +0200
-Subject: [PATCH] libtoolize: fix infinite recursion in m4
-
-Some projects use this construct in configure.ac:
-
-  m4_define([version], m4_include([version]))
-  pkg_version=version
-
-When the m4_include builtin is undefined (as was done in
-libtoolize and extract-trace scripts), the call to this 'version'
-macro enters an infinite recursion (until ENOMEM).  So rather
-re-define all potentially dangerous macros by empty strings,
-suggested by Eric Blake.
-
-While we are on it, merge the macro-"blacklist" with similar list
-implemented in gettext, except for 'm4_esyscmd'.  It's kept
-defined because we already trace AC_INIT macro for package
-version, while it is often specified by
-m4_esyscmd(git-version-gen).  Similarly to m4_include, m4_esyscmd
-might be opt-in-blacklisted in future.
-
-References:
-http://lists.gnu.org/archive/html/libtool/2015-09/msg00000.html
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764580
-
-* gl/build-aux/extract-trace (_G_mini): Redefine trace-breaking
-macros to empty strings rather than undefining those.  Use 'dnl'
-for comments.
-* bootstrap: Likewise, sync with extract-trace.
-* NEWS: Document.
-* NO-THANKS: Mention Hiroyuki Sato.
-
-Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
----
- NEWS                       |  4 ++++
- NO-THANKS                  |  1 +
- bootstrap                  | 42 +++++++++++++++++++++++++++---------------
- build-aux/extract-trace    | 42 +++++++++++++++++++++++++++---------------
- 4 files changed, 59 insertions(+), 30 deletions(-)
-
-diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
-index 315a32a..c6abd21 100755
---- a/build-aux/extract-trace
-+++ b/build-aux/extract-trace
-@@ -329,29 +329,41 @@ func_extract_trace ()
-     # arguments to Autocof functions, but without following
-     # 'm4_s?include' files.
-     _G_mini='
--        # Initialisation.
-+        dnl  Initialisation.
-         m4_changequote([,])
-         m4_define([m4_copy],   [m4_define([$2], m4_defn([$1]))])
-         m4_define([m4_rename], [m4_copy([$1], [$2])m4_undefine([$1])])
- 
--        # Disable these macros.
--        m4_undefine([m4_dnl])
--        m4_undefine([m4_include])
--        m4_undefine([m4_m4exit])
--        m4_undefine([m4_m4wrap])
--        m4_undefine([m4_maketemp])
-+        dnl  Replace macros which may abort m4 with a no-op variant.
-+        m4_pushdef([m4_assert])
-+        m4_pushdef([m4_exit])
-+        m4_pushdef([m4_fatal])
-+        m4_pushdef([m4_m4exit])
- 
--        # Copy and rename macros not handled by "m4 --prefix".
-+        dnl  Replace macros that might break stderr of m4.
-+        m4_pushdef([m4_errprint])
-+        m4_pushdef([m4_errprintn])
-+        m4_pushdef([m4_include])
-+        m4_pushdef([m4_warn])
-+
-+        dnl  Avoid side-effects of tracing by extract-trace.
-+        m4_pushdef([m4_maketemp])
-+        m4_pushdef([m4_mkstemp])
-+
-+        dnl  TODO: reasons for this
-+        m4_pushdef([m4_dnl])
-+        m4_pushdef([m4_m4wrap])
-+
-+        dnl  Copy and rename macros not handled by "m4 --prefix".
-         m4_define([dnl],         [m4_builtin([dnl])])
-         m4_copy([m4_define],     [m4_defun])
-         m4_rename([m4_ifelse],   [m4_if])
--        m4_ifdef([m4_mkstemp],   [m4_undefine([m4_mkstemp])])
-         m4_rename([m4_patsubst], [m4_bpatsubst])
-         m4_rename([m4_regexp],   [m4_bregexp])
- 
--        # "m4sugar.mini" - useful m4-time macros for dynamic arguments.
--        # If we discover packages that need more m4 macros defined in
--        # order to bootstrap correctly, add them here:
-+        dnl  "m4sugar.mini" - useful m4-time macros for dynamic arguments.
-+        dnl  If we discover packages that need more m4 macros defined in
-+        dnl  order to bootstrap correctly, add them here:
-         m4_define([m4_bmatch],
-             [m4_if([$#], 0, [], [$#], 1, [], [$#], 2, [$2],
-                    [m4_if(m4_bregexp([$1], [$2]), -1,
-@@ -362,11 +374,11 @@ func_extract_trace ()
-         m4_define([m4_require], [$1])
-         m4_define([m4_shift3], [m4_shift(m4shift(m4shift($@)))])
- 
--        # "autoconf.mini" - things from autoconf macros we care about.
-+        dnl  "autoconf.mini" - things from autoconf macros we care about.
-         m4_copy([m4_defun], [AC_DEFUN])
- 
--        # Dummy definitions for the macros we want to trace.
--        # AM_INIT_AUTOMAKE at least produces no trace without this.
-+        dnl  Dummy definitions for the macros we want to trace.
-+        dnl  AM_INIT_AUTOMAKE at least produces no trace without this.
-     '
- 
-     _G_save=$IFS
--- 
-2.6.2
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch
deleted file mode 100644
index 853a22eff5..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-fsanitize.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/573744
-
-From a5c6466528c060cc4660ad0319c00740db0e42ba Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
-Date: Sun, 18 Oct 2015 21:55:39 -0700
-Subject: [PATCH] libtool: fix GCC/clang linking with -fsanitize=*
-
-References:
-https://lists.gnu.org/archive/html/libtool/2014-04/msg00026.html
-
-* build-aux/ltmain.in (func_mode_link): Pass -fsanitize=* to the
-linker to allow trivial use of the clang address sanitizer.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
-Copyright-paperwork-exempt: Yes
-
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5362,10 +5362,11 @@
-       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       # -specs=*             GCC specs files
-       # -stdlib=*            select c++ std lib with clang
-+      # -fsanitize=*         Clang/GCC memory and address sanitizer
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
--      -specs=*)
-+      -specs=*|-fsanitize=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"
---- a/build-aux/ltmain.sh
-+++ b/build-aux/ltmain.sh
-@@ -7274,10 +7274,11 @@
-       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       # -specs=*             GCC specs files
-       # -stdlib=*            select c++ std lib with clang
-+      # -fsanitize=*         Clang/GCC memory and address sanitizer
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
--      -specs=*)
-+      -specs=*|-fsanitize=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch
deleted file mode 100644
index f6c0a3dc89..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-fuse-ld.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://lists.gnu.org/archive/html/libtool-patches/2015-03/msg00000.html
-https://lists.gnu.org/archive/html/libtool-patches/2016-02/msg00001.html
-
-From 2f258b87ce4415edede1b2a84a3a7dbcf44555c2 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 16 Mar 2015 18:17:31 -0400
-Subject: [PATCH] libtool: pass through -fuse-ld flags
-
-Starting with gcc-4.8, there's a -fuse-ld flag that can be used to select
-between bfd & gold.  Make sure we pass it through to the linking stage.
-
-* build-aux/ltmain.in (func_mode_link): Pass -fuse-ld=* flags through.
-
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5363,10 +5363,11 @@
-       # -specs=*             GCC specs files
-       # -stdlib=*            select c++ std lib with clang
-       # -fsanitize=*         Clang/GCC memory and address sanitizer
-+      # -fuse-ld=*           Linker select flags for GCC
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
--      -specs=*|-fsanitize=*)
-+      -specs=*|-fsanitize=*|-fuse-ld=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"
---- a/build-aux/ltmain.sh
-+++ b/build-aux/ltmain.sh
-@@ -7275,10 +7275,11 @@
-       # -specs=*             GCC specs files
-       # -stdlib=*            select c++ std lib with clang
-       # -fsanitize=*         Clang/GCC memory and address sanitizer
-+      # -fuse-ld=*           Linker select flags for GCC
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
--      -specs=*|-fsanitize=*)
-+      -specs=*|-fsanitize=*|-fuse-ld=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch
deleted file mode 100644
index c7720935d8..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-link-specs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 702a97fbb09bd7088a50f2b239016d1e32843c24 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Fri, 18 Sep 2015 10:36:43 +0200
-Subject: [PATCH] libtool: fix GCC linking with -specs=*
-
-References:
-https://bugzilla.redhat.com/show_bug.cgi?id=985592
-
-* build-aux/ltmain.in (func_mode_link): Pass -specs=*
-to the linker, Fedora uses this option for hardening.
-
-Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
-
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5360,10 +5360,12 @@
-       # -tp=*                Portland pgcc target processor selection
-       # --sysroot=*          for sysroot support
-       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-+      # -specs=*             GCC specs files
-       # -stdlib=*            select c++ std lib with clang
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-+      -specs=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"
---- a/build-aux/ltmain.sh
-+++ b/build-aux/ltmain.sh
-@@ -7272,10 +7272,12 @@
-       # -tp=*                Portland pgcc target processor selection
-       # --sysroot=*          for sysroot support
-       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-+      # -specs=*             GCC specs files
-       # -stdlib=*            select c++ std lib with clang
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-+      -specs=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch
deleted file mode 100644
index 580d635d04..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-sed-quote-speedup.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-https://bugs.gentoo.org/542252
-
-From 32f0df9835ac15ac17e04be57c368172c3ad1d19 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Sun, 4 Oct 2015 21:55:03 +0200
-Subject: [PATCH] libtool: mitigate the $sed_quote_subst slowdown
-
-When it is reasonably possible, use shell implementation for
-quoting.
-
-References:
-http://lists.gnu.org/archive/html/libtool/2015-03/msg00005.html
-http://lists.gnu.org/archive/html/libtool/2015-02/msg00000.html
-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20006
-
-* gl/build-aux/funclib.sh (func_quote): New function that can be
-used as substitution for '$SED $sed_quote_subst' call.
-* build-aux/ltmain.in (func_emit_wrapper): Use func_quote instead
-of '$SED $sed_quote_subst'.
-(func_mode_link): Likewise.
-* NEWS: Document.
-* bootstrap: Sync with funclib.sh.
-
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -3346,7 +3346,8 @@
-   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-     file=\"\$0\""
- 
--    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-+    func_quote "$ECHO"
-+    qECHO=$func_quote_result
-     $ECHO "\
- 
- # A function that is used when there is no print builtin or printf.
-@@ -8598,8 +8599,8 @@
- 	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
- 	  fi
- 	done
--	relink_command="(cd `pwd`; $relink_command)"
--	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-+	func_quote "(cd `pwd`; $relink_command)"
-+	relink_command=$func_quote_result
-       fi
- 
-       # Only actually do things if not in dry run mode.
-@@ -8845,7 +8846,8 @@
-       done
-       # Quote the link command for shipping.
-       relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
--      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-+      func_quote "$relink_command"
-+      relink_command=$func_quote_result
-       if test yes = "$hardcode_automatic"; then
- 	relink_command=
-       fi
---- a/build-aux/funclib.sh
-+++ b/build-aux/funclib.sh
-@@ -1,5 +1,5 @@
- # Set a version string for this script.
--scriptversion=2015-01-20.17; # UTC
-+scriptversion=2015-10-04.22; # UTC
- 
- # General shell script boiler plate, and helper functions.
- # Written by Gary V. Vaughan, 2004
-@@ -1026,6 +1026,57 @@
- }
- 
- 
-+# func_quote ARG
-+# --------------
-+# Aesthetically quote one ARG, store the result into $func_quote_result.  Note
-+# that we keep attention to performance here (so far O(N) complexity as long as
-+# func_append is O(1)).
-+func_quote ()
-+{
-+    $debug_cmd
-+
-+    func_quote_result=$1
-+
-+    case $func_quote_result in
-+      *[\\\`\"\$]*)
-+        case $func_quote_result in
-+          *[\[\*\?]*)
-+            func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"`
-+            return 0
-+            ;;
-+        esac
-+
-+        func_quote_old_IFS=$IFS
-+        for _G_char in '\' '`' '"' '$'
-+        do
-+          # STATE($1) PREV($2) SEPARATOR($3)
-+          set start "" ""
-+          func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy
-+          IFS=$_G_char
-+          for _G_part in $func_quote_result
-+          do
-+            case $1 in
-+            quote)
-+              func_append func_quote_result "$3$2"
-+              set quote "$_G_part" "\\$_G_char"
-+              ;;
-+            start)
-+              set first "" ""
-+              func_quote_result=
-+              ;;
-+            first)
-+              set quote "$_G_part" ""
-+              ;;
-+            esac
-+          done
-+          IFS=$func_quote_old_IFS
-+        done
-+        ;;
-+      *) ;;
-+    esac
-+}
-+
-+
- # func_quote_for_eval ARG...
- # --------------------------
- # Aesthetically quote ARGs to be evaled later.
-@@ -1042,12 +1093,8 @@
-     func_quote_for_eval_unquoted_result=
-     func_quote_for_eval_result=
-     while test 0 -lt $#; do
--      case $1 in
--        *[\\\`\"\$]*)
--	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
--        *)
--          _G_unquoted_arg=$1 ;;
--      esac
-+      func_quote "$1"
-+      _G_unquoted_arg=$func_quote_result
-       if test -n "$func_quote_for_eval_unquoted_result"; then
- 	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
-       else
---- a/build-aux/ltmain.sh
-+++ b/build-aux/ltmain.sh
-@@ -64,7 +64,7 @@
- # libraries, which are installed to $pkgauxdir.
- 
- # Set a version string for this script.
--scriptversion=2015-01-20.17; # UTC
-+scriptversion=2015-10-04.22; # UTC
- 
- # General shell script boiler plate, and helper functions.
- # Written by Gary V. Vaughan, 2004
-@@ -1091,6 +1091,57 @@
- }
- 
- 
-+# func_quote ARG
-+# --------------
-+# Aesthetically quote one ARG, store the result into $func_quote_result.  Note
-+# that we keep attention to performance here (so far O(N) complexity as long as
-+# func_append is O(1)).
-+func_quote ()
-+{
-+    $debug_cmd
-+
-+    func_quote_result=$1
-+
-+    case $func_quote_result in
-+      *[\\\`\"\$]*)
-+        case $func_quote_result in
-+          *[\[\*\?]*)
-+            func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"`
-+            return 0
-+            ;;
-+        esac
-+
-+        func_quote_old_IFS=$IFS
-+        for _G_char in '\' '`' '"' '$'
-+        do
-+          # STATE($1) PREV($2) SEPARATOR($3)
-+          set start "" ""
-+          func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy
-+          IFS=$_G_char
-+          for _G_part in $func_quote_result
-+          do
-+            case $1 in
-+            quote)
-+              func_append func_quote_result "$3$2"
-+              set quote "$_G_part" "\\$_G_char"
-+              ;;
-+            start)
-+              set first "" ""
-+              func_quote_result=
-+              ;;
-+            first)
-+              set quote "$_G_part" ""
-+              ;;
-+            esac
-+          done
-+          IFS=$func_quote_old_IFS
-+        done
-+        ;;
-+      *) ;;
-+    esac
-+}
-+
-+
- # func_quote_for_eval ARG...
- # --------------------------
- # Aesthetically quote ARGs to be evaled later.
-@@ -1107,12 +1158,8 @@
-     func_quote_for_eval_unquoted_result=
-     func_quote_for_eval_result=
-     while test 0 -lt $#; do
--      case $1 in
--        *[\\\`\"\$]*)
--	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
--        *)
--          _G_unquoted_arg=$1 ;;
--      esac
-+      func_quote "$1"
-+      _G_unquoted_arg=$func_quote_result
-       if test -n "$func_quote_for_eval_unquoted_result"; then
- 	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
-       else
-@@ -5258,7 +5305,8 @@
-   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-     file=\"\$0\""
- 
--    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-+    func_quote "$ECHO"
-+    qECHO=$func_quote_result
-     $ECHO "\
- 
- # A function that is used when there is no print builtin or printf.
-@@ -10510,8 +10558,8 @@
- 	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
- 	  fi
- 	done
--	relink_command="(cd `pwd`; $relink_command)"
--	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-+	func_quote "(cd `pwd`; $relink_command)"
-+	relink_command=$func_quote_result
-       fi
- 
-       # Only actually do things if not in dry run mode.
-@@ -10757,7 +10805,8 @@
-       done
-       # Quote the link command for shipping.
-       relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
--      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-+      func_quote "$relink_command"
-+      relink_command=$func_quote_result
-       if test yes = "$hardcode_automatic"; then
- 	relink_command=
-       fi
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch
new file mode 100644
index 0000000000..c0db69f3e2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch
@@ -0,0 +1,47 @@
+https://lists.gnu.org/archive/html/libtool-patches/2022-12/msg00000.html
+
+From d72817b1ee5d7b666bf30b0234e32423252d6ad8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 10 Dec 2022 02:00:22 +0000
+Subject: [PATCH] Allow -Werror and -Werror=* through flag filtering
+
+* build-aux/ltmain.in (func_mode_link): allow -Werror and -Werror=* through
+  flat filtering at link time.
+
+  This is needed for detecting likely-runtime problems with LTO using
+  e.g. -Werror=odr or -Werror=lto-type-mismatch.
+
+Bug: https://bugs.gentoo.org/884767
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -5408,10 +5408,11 @@ func_mode_link ()
+       # -fsanitize=*         Clang/GCC memory and address sanitizer
+       # -fuse-ld=*           Linker select flags for GCC
+       # -Wa,*                Pass flags directly to the assembler
++      # -Werror, -Werror=*   Report (specified) warnings as errors
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
++      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*)
+         func_quote_arg pretty "$arg"
+ 	arg=$func_quote_arg_result
+         func_append compile_command " $arg"
+--- a/build-aux/ltmain.sh
++++ a/build-aux/ltmain.sh
+@@ -5408,10 +5408,11 @@ func_mode_link ()
+       # -fsanitize=*         Clang/GCC memory and address sanitizer
+       # -fuse-ld=*           Linker select flags for GCC
+       # -Wa,*                Pass flags directly to the assembler
++      # -Werror, -Werror=*   Report (specified) warnings as errors
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
++      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*)
+         func_quote_arg pretty "$arg"
+ 	arg=$func_quote_arg_result
+         func_append compile_command " $arg"
+-- 
+2.38.1
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.6-r6.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild
similarity index 70%
rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.6-r6.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild
index cf041ceafa..75a9976589 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.6-r6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-LIBTOOLIZE="true" #225559
+# Please bump with dev-libs/libltdl.
+
+# bug #225559
+LIBTOOLIZE="true"
 WANT_LIBTOOL="none"
 inherit autotools prefix
 
@@ -12,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${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 ~x86-winnt"
+	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 ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
@@ -27,33 +30,29 @@ RDEPEND="
 	sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.69:*
 	>=sys-devel/automake-1.13:*
-	dev-libs/libltdl:0"
+	>=dev-libs/libltdl-2.4.7"
 DEPEND="${RDEPEND}"
 [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
-	"${FILESDIR}"/${PN}-2.4.6-link-specs.patch
-	"${FILESDIR}"/${PN}-2.4.6-link-fsanitize.patch #573744
-	"${FILESDIR}"/${PN}-2.4.6-link-fuse-ld.patch
-	"${FILESDIR}"/${PN}-2.4.6-libtoolize-slow.patch
-	"${FILESDIR}"/${PN}-2.4.6-libtoolize-delay-help.patch
-	"${FILESDIR}"/${PN}-2.4.6-sed-quote-speedup.patch #542252
-	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch #581314
+	# bug #109105
+	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
+	# bug #581314
+	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
 
 	"${FILESDIR}"/${PN}-2.4.6-mint.patch
 	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
 	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
-	"${FILESDIR}"/${PN}-2.4.6-darwin20.patch
+	"${FILESDIR}"/${PN}-2.4.7-werror-lto.patch
 )
 
 src_prepare() {
 	if [[ ${PV} == *9999 ]] ; then
-		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch #650876
+		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
 		./bootstrap || die
 	else
 		PATCHES+=(
-			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch #650876
+			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876
 		)
 	fi
 
@@ -87,7 +86,7 @@ src_prepare() {
 	# Make sure timestamps don't trigger a rebuild of man pages. #556512
 	if [[ ${PV} != *9999 ]] ; then
 		touch doc/*.1 || die
-		export HELP2MAN=false
+		export HELP2MAN=true
 	fi
 }
 
@@ -98,11 +97,13 @@ src_configure() {
 	# shells, so just force libtool to use /bin/bash all the time.
 	export CONFIG_SHELL="$(type -P bash)"
 
-	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
+	# Do not bother hardcoding the full path to sed.
+	# Just rely on $PATH. bug #574550
 	export ac_cv_path_SED="$(basename "$(type -P sed)")"
 
 	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
-	ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install
+
+	ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install
 }
 
 src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7.ebuild
index 09853e34e5..7b2a962644 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7.ebuild
@@ -85,7 +85,7 @@ src_prepare() {
 	# Make sure timestamps don't trigger a rebuild of man pages. #556512
 	if [[ ${PV} != *9999 ]] ; then
 		touch doc/*.1 || die
-		export HELP2MAN=false
+		export HELP2MAN=true
 	fi
 }
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild
index 65f0d1aab0..ae3d351ad4 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${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 ~x86-winnt"
+	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 ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
@@ -85,7 +85,7 @@ src_prepare() {
 	# Make sure timestamps don't trigger a rebuild of man pages. #556512
 	if [[ ${PV} != *9999 ]] ; then
 		touch doc/*.1 || die
-		export HELP2MAN=false
+		export HELP2MAN=true
 	fi
 }
 

From df881b45080435591e32ffd32bec3ad1d1febfd0 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Mon, 12 Dec 2022 14:19:49 +0100
Subject: [PATCH 28/30] eclass/app-alternatives: Add from Gentoo

It's from Gentoo commit b0c939c07feb8d0158925dce14735a5c8439d7e4.
---
 .../eclass/app-alternatives.eclass            | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/eclass/app-alternatives.eclass

diff --git a/sdk_container/src/third_party/portage-stable/eclass/app-alternatives.eclass b/sdk_container/src/third_party/portage-stable/eclass/app-alternatives.eclass
new file mode 100644
index 0000000000..c6924bfc6d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/eclass/app-alternatives.eclass
@@ -0,0 +1,84 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: app-alternatives.eclass
+# @MAINTAINER:
+# Michał Górny <mgorny@gentoo.org>
+# @AUTHOR:
+# Michał Górny <mgorny@gentoo.org>
+# @SUPPORTED_EAPIS: 8
+# @BLURB: Common logic for app-alternatives/*
+# @DESCRIPTION:
+# This eclass provides common logic shared by app-alternatives/*
+# ebuilds.  A global ALTERNATIVES variable needs to be declared
+# that lists available options and their respective dependencies.
+# HOMEPAGE, S, LICENSE, SLOT, IUSE, REQUIRED_USE and RDEPEND are set.
+# A get_alternative() function is provided that determines the selected
+# alternative and prints its respective flag name.
+
+case ${EAPI} in
+	8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} unsupported."
+esac
+
+if [[ ! ${_APP_ALTERNATIVES_ECLASS} ]]; then
+_APP_ALTERNATIVES_ECLASS=1
+
+# @ECLASS_VARIABLE: ALTERNATIVES
+# @PRE_INHERIT
+# @REQUIRED
+# @DESCRIPTION:
+# Array of "flag:dependency" pairs specifying the available
+# alternatives.  The default provider must be listed first.
+
+# @FUNCTION: _app-alternatives_set_globals
+# @INTERNAL
+# @DESCRIPTION:
+# Set ebuild metadata variables.
+_app-alternatives_set_globals() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	if [[ ${ALTERNATIVES@a} != *a* ]]; then
+		die 'ALTERNATIVES must be an array.'
+	elif [[ ${#ALTERNATIVES[@]} -eq 0 ]]; then
+		die 'ALTERNATIVES must not be empty.'
+	fi
+
+	HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives"
+	S=${WORKDIR}
+
+	LICENSE="CC0-1.0"
+	SLOT="0"
+
+	# yep, that's a cheap hack adding '+' to the first flag
+	IUSE="+${ALTERNATIVES[*]%%:*}"
+	REQUIRED_USE="^^ ( ${ALTERNATIVES[*]%%:*} )"
+	RDEPEND=""
+
+	local flag dep
+	for flag in "${ALTERNATIVES[@]}"; do
+		[[ ${flag} != *:* ]] && die "Invalid ALTERNATIVES item: ${flag}"
+		dep=${flag#*:}
+		flag=${flag%%:*}
+		RDEPEND+="
+			${flag}? ( ${dep} )
+		"
+	done
+}
+_app-alternatives_set_globals
+
+# @FUNCTION: get_alternative
+# @DESCRIPTION:
+# Get the flag name for the selected alternative (i.e. the USE flag set).
+get_alternative() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local flag
+	for flag in "${ALTERNATIVES[@]%%:*}"; do
+		usev "${flag}" && return
+	done
+
+	die "No selected alternative found (REQUIRED_USE ignored?!)"
+}
+
+fi

From 96bf0f8f2abf770b00c8b91f8fde210439db4216 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Mon, 12 Dec 2022 14:21:28 +0100
Subject: [PATCH 29/30] .github: Add app-alternatives eclass to packages list

---
 .../third_party/portage-stable/.github/workflows/packages-list   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk_container/src/third_party/portage-stable/.github/workflows/packages-list b/sdk_container/src/third_party/portage-stable/.github/workflows/packages-list
index bdb2367727..5f28382673 100644
--- a/sdk_container/src/third_party/portage-stable/.github/workflows/packages-list
+++ b/sdk_container/src/third_party/portage-stable/.github/workflows/packages-list
@@ -67,6 +67,7 @@ dev-util/strace
 dev-vcs/git
 
 eclass/alternatives.eclass
+eclass/app-alternatives.eclass
 eclass/autotools.eclass
 # Still has some Flatcar modifications, will need to upstream it first.
 #

From 445a393a05904082a8861d727556f637f7ecf75c Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Mon, 12 Dec 2022 15:34:22 +0100
Subject: [PATCH 30/30] changelog: Add an entry

---
 .../changelog/updates/2022-12-12-weekly-updates.md               | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2022-12-12-weekly-updates.md

diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2022-12-12-weekly-updates.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-12-12-weekly-updates.md
new file mode 100644
index 0000000000..f93d584079
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-12-12-weekly-updates.md
@@ -0,0 +1 @@
+- XZ utils ([5.2.9](https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;h=ebb303084403445088ec97dfedf0461a6e5b5077;hb=d8a898eb9974683bc725c49ec76722f9a8758f48))