From 24610457a2d578bb3cd6d26fbac8bd7ddd7e3fba Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:22:24 +0000
Subject: [PATCH 01/62] app-arch/xz-utils: Sync with Gentoo

It's from Gentoo commit 99529e3e30d71d892944629cfa1ac862d8327dc3.
---
 .../portage-stable/app-arch/xz-utils/Manifest |   4 +
 .../xz-utils-5.4.2-Wsign-conversion.patch     |  23 ++++
 .../app-arch/xz-utils/xz-utils-5.2.11.ebuild  | 118 ++++++++++++++++
 .../app-arch/xz-utils/xz-utils-5.4.2.ebuild   | 130 ++++++++++++++++++
 .../app-arch/xz-utils/xz-utils-9999.ebuild    |   8 +-
 5 files changed, 281 insertions(+), 2 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
 create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.11.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.2.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest
index 8e72b07133..457b0d0a09 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest
@@ -1,4 +1,8 @@
 DIST xz-5.2.10.tar.gz 2123206 BLAKE2B fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215 SHA512 c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1
 DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733 SHA512 48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
+DIST xz-5.2.11.tar.gz 2130684 BLAKE2B e513f99b2e28fa79f32747e21138cc13ab9340e95a302ac742bc6bda088465488173ea212704c4612f4059bbbc6c6a5b041332d84b999dc7df5b3fab1b1ac4e9 SHA512 8f75450380563229465420f4518fa7a60bbe6f0c9a3b580c2a9a7bf9bf380ad69209f792764115c346d89c49711478e8db42325ef9a46ccd3a6ec72292890ac8
+DIST xz-5.2.11.tar.gz.sig 566 BLAKE2B 34186ea22960f508dd796736107b99e1e3884ffae683f26671f455e46e4debf87400f2d7bb64b446fb142370a8bcebc6c05dce34dcc2678a761b9401b1e23860 SHA512 036ed0f663e179057a805a41052d3e437fbfb9dbbe173c5180fbb255f5a01ac4fa2561424228f4e568e63b22802b3a4ffd88dec2ba7c41a454998ebea30bea7c
 DIST xz-5.4.1.tar.gz 2528617 BLAKE2B f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98 SHA512 5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b
 DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b SHA512 2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c
+DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72 SHA512 149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
+DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b SHA512 30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
new file mode 100644
index 0000000000..217cc759a9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
@@ -0,0 +1,23 @@
+https://github.com/tukaani-project/xz/commit/0673c9ec98b6bae12b33dc295564514aaa26e2fc
+
+From 0673c9ec98b6bae12b33dc295564514aaa26e2fc Mon Sep 17 00:00:00 2001
+From: Lasse Collin <lasse.collin@tukaani.org>
+Date: Sun, 19 Mar 2023 22:45:59 +0200
+Subject: [PATCH] liblzma: Silence -Wsign-conversion in SSE2 code in
+ memcmplen.h.
+
+Thanks to Christian Hesse for reporting the issue.
+Fixes: https://github.com/tukaani-project/xz/issues/44
+--- a/src/liblzma/common/memcmplen.h
++++ b/src/liblzma/common/memcmplen.h
+@@ -89,7 +89,8 @@ lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2,
+ 	// version isn't used on x86-64.
+ #	define LZMA_MEMCMPLEN_EXTRA 16
+ 	while (len < limit) {
+-		const uint32_t x = 0xFFFF ^ _mm_movemask_epi8(_mm_cmpeq_epi8(
++		const uint32_t x = 0xFFFF ^ (uint32_t)_mm_movemask_epi8(
++			_mm_cmpeq_epi8(
+ 			_mm_loadu_si128((const __m128i *)(buf1 + len)),
+ 			_mm_loadu_si128((const __m128i *)(buf2 + len))));
+ 
+
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.11.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.11.ebuild
new file mode 100644
index 0000000000..f867fbc26f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.11.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+
+	# bug #272880 and bug #286068
+	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	inherit verify-sig
+
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="
+		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+		https://tukaani.org/xz/${MY_P}.tar.gz
+		verify-sig? (
+			https://tukaani.org/xz/${MY_P}.tar.gz.sig
+		)
+	"
+
+	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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="+extra-filters nls static-libs"
+
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+fi
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		# Allow building shared libs on Solaris/x64
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-threads
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
+
+	if ! multilib_is_native_abi ; then
+		myconf+=(
+			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+		)
+	fi
+
+	if ! use extra-filters ; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
+		myconf+=( --disable-path-for-script )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.2.ebuild
new file mode 100644
index 0000000000..736b0038dc
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	# Per tukaani.org, git.tukaani.org is a mirror of github and
+	# may be behind.
+	EGIT_REPO_URI="
+		https://github.com/tukaani-project/xz
+		https://git.tukaani.org/xz.git
+	"
+	inherit git-r3 autotools
+
+	# bug #272880 and bug #286068
+	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	inherit verify-sig
+
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="
+		https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz
+		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
+		https://tukaani.org/xz/${MY_P}.tar.gz
+		verify-sig? (
+			https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig
+			https://tukaani.org/xz/${MY_P}.tar.gz.sig
+		)
+	"
+
+	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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="doc +extra-filters nls static-libs"
+
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Wsign-conversion.patch
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		# Allow building shared libs on Solaris/x64
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-threads
+		$(multilib_native_use_enable doc)
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
+
+	if ! multilib_is_native_abi ; then
+		myconf+=(
+			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+		)
+	fi
+
+	if ! use extra-filters ; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
+		myconf+=( --disable-path-for-script )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use doc ; then
+		rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild
index 8c4479233e..a6b8dfa60f 100644
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -47,7 +47,7 @@ HOMEPAGE="https://tukaani.org/xz/"
 # See top-level COPYING file as it outlines the various pieces and their licenses.
 LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
-IUSE="+extra-filters nls static-libs"
+IUSE="doc +extra-filters nls static-libs"
 
 if [[ ${PV} != 9999 ]] ; then
 	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
@@ -68,6 +68,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myconf=(
 		--enable-threads
+		$(multilib_native_use_enable doc)
 		$(use_enable nls)
 		$(use_enable static-libs static)
 	)
@@ -110,7 +111,10 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+
+	if use doc ; then
+		rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+	fi
 }
 
 pkg_preinst() {

From 52cac2fecdc65ad4fa3e13ad51a26a65690f7fa4 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:22:31 +0000
Subject: [PATCH 02/62] app-text/asciidoc: Sync with Gentoo

It's from Gentoo commit 7aa289fdeb138fbe1b87ed0e0e9c045c73df740a.
---
 .../portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild
index 670534a039..28d44e37b4 100644
--- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild
@@ -6,13 +6,10 @@ EAPI=8
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
-inherit distutils-r1 optfeature readme.gentoo-r1
+inherit distutils-r1 optfeature readme.gentoo-r1 pypi
 
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/"
-# Could use the github tarball but we need autotools then
-#SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"

From 17c809e47399a1ee8ca19db57fb3157dd59699bb Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:22:40 +0000
Subject: [PATCH 03/62] dev-db/sqlite: Sync with Gentoo

It's from Gentoo commit 3b2fa301882d5deb5b245025652fc4f0d608c6c0.
---
 .../portage-stable/dev-db/sqlite/Manifest     |   2 +
 .../dev-db/sqlite/sqlite-3.41.1.ebuild        | 428 ++++++++++++++++++
 2 files changed, 430 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.41.1.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest
index 2633b8f4d9..cb3e1c1b34 100644
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest
@@ -1,4 +1,6 @@
 DIST sqlite-doc-3400100.zip 10934836 BLAKE2B 52adbfa911a5d8556e4e071bf14ad83145023fbd426f285d9724d7f06e41257df53d3c28224581f12b4ca8f699bf3d3ec829ee161374ce0208783e5da72639dc SHA512 1131b0a6304a4dd6287c85d38d1450fd2dd0e3377d88a263e3c4716415e0587750357f25486727b9433797da0331229682565e7a8a3986eba89cfcab550a2d41
 DIST sqlite-doc-3410000.zip 10979224 BLAKE2B aa42dd8977b1a2f782fcaecdea9797d0a97c623349854b8bf3050bbc8627482e77c1fd8952633c759e99ab6dd1038ab71fd4942429af9f9422cbc76deaac46ed SHA512 6eff61b7a63ee8cd8c9460b50f6ab6c9bf8074a270e900fee8bf28c1602cc5da35b0c626a780e735f349f08310a924ba83cd1420f2767f8d12d0ee0455374109
+DIST sqlite-doc-3410100.zip 10996110 BLAKE2B 03a0c77547ba20957884e202138a280d4f65e25f08e784b06026fdcb97a79999c1065009b8102362d4e58817a359d18245f2f34e98c210faa795b8b96ad4014f SHA512 796e3f75506ab1819043377cfaa96ff156e962b19d1aa5f04da591842ea52bc4e5dc5c69d765d9d7debd34e9075e1c48276d0a57c90d914ccb6236044cad0895
 DIST sqlite-src-3400100.zip 13725560 BLAKE2B 24d2efbbf7f8f35888b1e53c98f9c7fece9b1cf0b175bf49b78869253aa753ce47e2db67247183c07368e69d6eb63a6e39c06b212c8fd5ca36c892ff535bedca SHA512 78f8c6396bf8da090671c6f4c41255e60788324fccdaad906c53610eb6e37705f4d25c7f84da3be00b511ddf9f2e0545901f33f5ae4b6e00b1ea9413af095299
 DIST sqlite-src-3410000.zip 13831104 BLAKE2B 3bc0828f53c9e1e4344352375ef749fa145579b1a07ef657ca8d05417b5b0a211c785b44613fffe45d4bf74cff6f8e5320b5af7e8e97c1199e3d69916bc6ae6c SHA512 9c39202eb058e421035ffe4d5c9f74164a0ad4a928f6f01e4fa04af0e7efb64635ab5902220dbb37478c5c777170e4c49a171b36a0f908315e187a8f1aa2b5e8
+DIST sqlite-src-3410100.zip 13833820 BLAKE2B e863f03355bb47ba4464d953c0191a02845e651ec6ceaa1bb203c9976cf4c11ad2739af3f538c7fb675c863fd0b4980ed4f2237fa7e66abacca3bc4dc1986a72 SHA512 840d2542825db2d1758cf9fa0f7159a8c6c7d40d23a5249d1c7bdf0210a6cc83e4dd8e3393c0c6e76e922a76614a1b5f311e232d7439759bdc0e2fbb4c12244a
diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.41.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.41.1.ebuild
new file mode 100644
index 0000000000..b57b59ba8c
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.41.1.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+
+# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
+# for hints regarding test failures, backports, etc.
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}"/${PN}
+	PROPERTIES="live"
+else
+	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+	DOC_PV="${SRC_PV}"
+	#DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+
+	SRC_URI="
+		https://sqlite.org/2023/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2023/${PN}-doc-${DOC_PV}.zip )
+	"
+	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+
+	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="public-domain"
+SLOT="3"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )
+"
+BDEPEND=">=dev-lang/tcl-8.6:0"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" dev-vcs/fossil"
+else
+	BDEPEND+=" app-arch/unzip"
+fi
+
+_fossil_fetch() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local repo_uri="${2}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	mkdir -p "${T}/fossil/${repo_id}" || die
+	pushd "${T}/fossil/${repo_id}" > /dev/null || die
+
+	if [[ -n "${EVCS_OFFLINE}" ]]; then
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+		fi
+	else
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
+			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
+			echo
+		else
+			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
+			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
+			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
+			echo
+		fi
+
+		(
+			addwrite "${distdir}"
+			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
+			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
+		)
+	fi
+
+	popd > /dev/null || die
+}
+
+_fossil_checkout() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local branch_or_commit="${2}"
+	local target_directory="${3}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+	fi
+
+	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
+		mkdir -p "${T}/fossil/${repo_id}" || die
+		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
+	fi
+
+	mkdir "${target_directory}" || die
+	pushd "${target_directory}" > /dev/null || die
+
+	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
+	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
+	echo
+
+	popd > /dev/null || die
+}
+
+fossil_fetch() {
+	local repo_id="${1}"
+	local repo_uri="${2}"
+	local target_directory="${3}"
+
+	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
+
+	_fossil_fetch "${repo_id}" "${repo_uri}"
+	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
+		if use doc; then
+			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
+		fi
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+	local options=()
+
+	options+=(
+		--enable-load-extension
+		--enable-threadsafe
+	)
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support bytecode and tables_used virtual tables.
+	# https://sqlite.org/compile.html#enable_bytecode_vtab
+	# https://sqlite.org/bytecodevtab.html
+	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+	# Support column metadata functions.
+	# https://sqlite.org/compile.html#enable_column_metadata
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	# https://sqlite.org/dbpage.html
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/compile.html#enable_dbstat_vtab
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
+	# https://sqlite.org/compile.html#enable_deserialize
+	# https://sqlite.org/c3ref/serialize.html
+	# https://sqlite.org/c3ref/deserialize.html
+	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/compile.html#enable_fts3
+	# https://sqlite.org/compile.html#enable_fts3_parenthesis
+	# https://sqlite.org/compile.html#enable_fts4
+	# https://sqlite.org/compile.html#enable_fts5
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=( --enable-fts5 )
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/compile.html#enable_memsys5
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite3_normalized_sql() function.
+	# https://sqlite.org/c3ref/expanded_sql.html
+	append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/compile.html#enable_offset_sql_func
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/compile.html#enable_preupdate_hook
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/compile.html#enable_rbu
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/compile.html#enable_rtree
+	# https://sqlite.org/compile.html#enable_geopoly
+	# https://sqlite.org/rtree.html
+	# https://sqlite.org/geopoly.html
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support Session extension.
+	# https://sqlite.org/compile.html#enable_session
+	# https://sqlite.org/sessionintro.html
+	append-cppflags -DSQLITE_ENABLE_SESSION
+
+	# Support scan status functions.
+	# https://sqlite.org/compile.html#enable_stmt_scanstatus
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/compile.html#enable_stmtvtab
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/compile.html#enable_unlock_notify
+	# https://sqlite.org/c3ref/unlock_notify.html
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support soundex() function.
+	# https://sqlite.org/compile.html#soundex
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support URI filenames.
+	# https://sqlite.org/compile.html#use_uri
+	# https://sqlite.org/uri.html
+	append-cppflags -DSQLITE_USE_URI
+
+	options+=( $(use_enable debug) )
+
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+	fi
+
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+
+	if use readline; then
+		options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" )
+	fi
+
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/compile.html#secure_delete
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	options+=( $(use_enable static-libs static) )
+
+	# tcl, test, tools USE flags.
+	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
+		options+=(
+			--enable-tcl
+			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	else
+		options+=( --disable-tcl )
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+
+		# Skip known-broken test for now
+		# https://sqlite.org/forum/forumpost/d97caf168f
+		# https://sqlite.org/forum/forumpost/50f136d91d
+		if use test ; then
+			rm test/atof1.test || die
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+
+	if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then
+		emake tclsqlite3.c
+
+		local build_directory="$(pwd)"
+		build_directory="${build_directory##*/}"
+
+		mkdir "${WORKDIR}/${PN}-doc-build" || die
+		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
+
+		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
+		rmdir doc/matrix{/*,} || die
+
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+	# e_uri.test tries to open files in /.
+	# bug #839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(usex debug 'fulltest' 'test')
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool dbtotxt sqlite3-db-to-txt
+		install_tool index_usage sqlite3-index-usage
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	doman sqlite3.1
+
+	if use doc; then
+		if [[ ${PV} == 9999 ]]; then
+			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
+		else
+			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
+		fi
+
+		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
+		if [[ ${PV} != 9999 ]]; then
+			rm search search.d/admin || die
+			rmdir search.d || die
+			find -name "*~" -delete || die
+		fi
+
+		(
+			docinto html
+			dodoc -r *
+		)
+
+		popd > /dev/null || die
+	fi
+}

From 42cf769f6ab15e62285c49395af4b0e98c3de2cf Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:22:40 +0000
Subject: [PATCH 04/62] dev-lang/duktape: Sync with Gentoo

It's from Gentoo commit 1e3350db8b7f8bb429acb86a20a0a966280c34f4.
---
 .../portage-stable/dev-lang/duktape/duktape-2.7.0-r3.ebuild   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.7.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.7.0-r3.ebuild
index 51a4ebed87..f77166dfcd 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.7.0-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.7.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ LICENSE="MIT"
 # Upstream don't maintain binary compatibility
 # https://github.com/svaarala/duktape/issues/1524
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.0-respect-tc-env.patch

From e641c0ba7f99c99eeb85c766ff606298690e1564 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:22:41 +0000
Subject: [PATCH 05/62] dev-lang/python: Sync with Gentoo

It's from Gentoo commit 81f95e3e7d6d140172d0afc8411bc0f214c74c2b.
---
 .../third_party/portage-stable/dev-lang/python/Manifest   | 8 ++++----
 ...{python-3.10.10_p2.ebuild => python-3.10.10_p3.ebuild} | 0
 .../{python-3.11.2_p1.ebuild => python-3.11.2_p2.ebuild}  | 0
 .../{python-3.8.16_p3.ebuild => python-3.8.16_p4.ebuild}  | 0
 .../{python-3.9.16_p2.ebuild => python-3.9.16_p3.ebuild}  | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.10.10_p2.ebuild => python-3.10.10_p3.ebuild} (100%)
 rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.11.2_p1.ebuild => python-3.11.2_p2.ebuild} (100%)
 rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.8.16_p3.ebuild => python-3.8.16_p4.ebuild} (100%)
 rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.9.16_p2.ebuild => python-3.9.16_p3.ebuild} (100%)

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 0ec7d5a2ff..eafa964cae 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
@@ -11,8 +11,8 @@ DIST Python-3.8.16.tar.xz.asc 833 BLAKE2B 678dabc558d013b104bf9e65d4319076c4730a
 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.10_p2.tar.xz 13992 BLAKE2B e18e708888dd28c8f238d4897aff79483a679396a168d8b5ff4f5e8c7f09cec5f1b13aeb327d3dc3e2149c2117c25da050987f1f1c3322b56c87245ba2d0b54d SHA512 14bc218a2f3c64ef9f42682fd1364208bcaa74f787dee39bd9566e40764c260a65fd42961be47a6e6c6227091cb2fef83e1d689302448647560689e20e07efe0
-DIST python-gentoo-patches-3.11.2_p1.tar.xz 7788 BLAKE2B 9652c46cd323958a43e26fd6b0afdd8f214953db59d9acf133366f7576502578c10e0a80ca13a9d768442d79c71dd6d095d73ef2bbbd1f79ef269a9ee20fc4b8 SHA512 7c5794e582d8ea5f99acb9ccf87c7e1f45a6557d0eb95de2b8c0cd7831f22e53eef0f03f32ca37568d1742024be127f0219463351f5b604f258c8a9985f89ea9
+DIST python-gentoo-patches-3.10.10_p3.tar.xz 14700 BLAKE2B 934462f437ffbf0b65e1cd63719121b7d551698e5ca9e67283a60f24151c6cf62eb0d31b16dad3b6e95da0dd6eac8c84c86332e42195f0f9dd7fbc4db52a3f9e SHA512 72e97a441463fff2760deb5557d2bbee82a5354b3db30e1ea34ea05bf349af0a46e0ff244e5ec212c8d2663ad79e660634733c3737ed853f5270c5c0427c902f
+DIST python-gentoo-patches-3.11.2_p2.tar.xz 8516 BLAKE2B 52bfdfac533ed53f32b8546c37a10b7019f3f0cd296b7929d3eb83fdc6a5e49c95515bb2ba56487b81e68701c586520db08e323ac1f49ef6f82da56010e21a28 SHA512 4388c0ae0bd25a002aed095d1db42076bcf6b7486955aa41c34ac41318e82eec686e8b9aac31ff766eed16edf3fb86fd333c448090240ba79bbc35e458a96dd0
 DIST python-gentoo-patches-3.12.0a6.tar.xz 5160 BLAKE2B 3149259ac54ee360714e6b24811cafcc25011b14427b24811831ea02aef044b1670b951976e5756938fdba0710e8b9c8465eeb6bcdea0b78a91bb586f8ae212a SHA512 aaeb4b4102e2d9116798b52d98cdb5955226b3e97b3ba7c9e319d4ea98c126faebbfac3c609436fde2eae75254205a3aa9644b1aafad95c44d52b754e72b031e
-DIST python-gentoo-patches-3.8.16_p3.tar.xz 31900 BLAKE2B ae3787f223407c34c1a8c442c0e05bea8307cbace6140dc0ed08085d4a507bc2b6307cb89efa738750affc29320a3ec562fef5c066804abe25a856e4cbe88685 SHA512 df90a99b316c967a1176909a47450b02f771ded695b5f63486d85da7ff5755a27b9410b71bd27fb4217f8555e278c91bd88db53a9108aa84559bfbfd0ce4e5e7
-DIST python-gentoo-patches-3.9.16_p2.tar.xz 26664 BLAKE2B 7176c58fd4bfe40489de33d67a0c106f9d170656e6ae47318b103ac45a4e0aca14e89790300c3881a3c9b8ca556996573621eb5dac0a71106ea0ae9bbf3e82c2 SHA512 792fcd53385d95e3ba5937b26099fcc19e62d3512783c25e734ee0cd153c8717e618dba010dd98b8647d3265bf94e40665e30494aae1a84181febbd7dbab3f36
+DIST python-gentoo-patches-3.8.16_p4.tar.xz 32436 BLAKE2B 76984bbc04e5cf32d70853891967a33366dd28ca2cd47f3538ed1e9f4d39008d04c90f616d92112f5ec3468c42119089d195ee4d936536f8da4a772164aae221 SHA512 ad6d653fec3cce1f73db4b192f7e95b35ae2cf70aa8782d7b69f9d48eee240ef1cc32257a42bbb57f3952720df68b9976164a0b2748e36600332fba488383016
+DIST python-gentoo-patches-3.9.16_p3.tar.xz 27160 BLAKE2B 5a41a6ff135c3aca02b19cf9a61f554ca224173854274b872ce85e8c71f25c678604e50b87bae40d4b5ac082731c143338fcc6ef47acebad2b59ce0b1d600f5d SHA512 1ace0a9e929769c29082fdec6845a476c07c13fbbff8726a7a592fda09da8b50c996638b4e4e40acccb15630a796074329adbcc9a004c4305952fa5b0dc4146c
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.10_p2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.10_p3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.10_p2.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.10_p3.ebuild
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.2_p1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.2_p2.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.2_p1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.2_p2.ebuild
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16_p3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16_p4.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16_p3.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16_p4.ebuild
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16_p2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16_p3.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16_p2.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16_p3.ebuild

From 2db65e00b40dfba9746f8afdc68f2516e8318611 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:22:50 +0000
Subject: [PATCH 06/62] dev-libs/glib: Sync with Gentoo

It's from Gentoo commit ab4518e2e6285248b51674cff0987eb0ca86fd5d.
---
 .../glib/files/glib-2.76.0-g_strdup-c++.patch | 132 ++++++++++++++++++
 ...ib-2.76.0.ebuild => glib-2.76.0-r1.ebuild} |   1 +
 2 files changed, 133 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.76.0-g_strdup-c++.patch
 rename sdk_container/src/third_party/portage-stable/dev-libs/glib/{glib-2.76.0.ebuild => glib-2.76.0-r1.ebuild} (99%)

diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.76.0-g_strdup-c++.patch b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.76.0-g_strdup-c++.patch
new file mode 100644
index 0000000000..23b0a1b641
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.76.0-g_strdup-c++.patch
@@ -0,0 +1,132 @@
+https://bugs.gentoo.org/901035
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3322
+https://gitlab.gnome.org/GNOME/glib/-/commit/cc7f2f81cc59751fcc689731dcd60af5da5723ba
+
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function.  But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean             (g_str_has_prefix) (const gchar *str,
+     (g_str_has_suffix) (STR, SUFFIX)                                          \
+   )
+ 
+-#define g_strdup(STR)                                                         \
+-  (__builtin_constant_p ((STR)) ?                                             \
+-    (G_LIKELY ((STR) != NULL) ?                                               \
+-      G_GNUC_EXTENSION ({                                                     \
+-        const char *const ___str = ((STR));                                   \
+-        const char *const __str = _G_STR_NONNULL (___str);                    \
+-        const size_t __str_len = strlen (__str) + 1;                          \
+-        char *__dup_str = (char *) g_malloc (__str_len);                      \
+-        (char *) memcpy (__dup_str, __str, __str_len);                        \
+-      })                                                                      \
+-      :                                                                       \
+-      (char *) (NULL)                                                         \
+-    )                                                                         \
+-    :                                                                         \
+-    (g_strdup) ((STR))                                                        \
+-  )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar*                g_strjoin	       (const gchar  *separator,
+ 					...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+ 
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++  if (__builtin_constant_p (!str) && !str)
++    return NULL;
++
++  if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++    {
++      const size_t len = strlen (str) + 1;
++      char *dup_str = (char *) g_malloc (len);
++      return (char *) memcpy (dup_str, str, len);
++    }
++
++  return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+  * sequences. Inverse of g_strescape. The recognized sequences are \b
+  * \f \n \r \t \\ \" and the octal format.
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+   g_free (str);
+ }
+ 
++static void
++test_strdup_macro_qualified (void)
++{
++  gchar *str;
++
++  g_assert_null (::g_strdup (NULL));
++
++  str = ::g_strdup ("C++ is cool too!");
++  g_assert_nonnull (str);
++  g_assert_cmpstr (str, ==, "C++ is cool too!");
++  g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++  struct
++  {
++    char *p, *q;
++  } strings = {
++    g_strdup (NULL),
++    g_strdup ("C++ is cool too!"),
++  };
++
++  g_assert_null (strings.p);
++  g_assert_nonnull (strings.q);
++  g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++  g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+   g_test_add_func ("/C++/str-equal", test_str_equal);
+   g_test_add_func ("/C++/strdup", test_strdup);
+   g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++  g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++  g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+   g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+   g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+   g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+-- 
+GitLab
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.0-r1.ebuild
similarity index 99%
rename from sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.0.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.0-r1.ebuild
index 11eedb4e80..56112f34dd 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.0-r1.ebuild
@@ -69,6 +69,7 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+	"${FILESDIR}"/${PN}-2.76.0-g_strdup-c++.patch
 )
 
 pkg_setup() {

From 51fb3e0b036dc53b9a803a04981a4b8cac1a93a5 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:22:51 +0000
Subject: [PATCH 07/62] dev-libs/gobject-introspection: Sync with Gentoo

It's from Gentoo commit 15eff33f646f4d0b8ea878c51c1c492d530bb547.
---
 .../dev-libs/gobject-introspection/Manifest   |  1 +
 .../gobject-introspection-1.76.0.ebuild       | 79 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.76.0.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/Manifest
index 883ececc6d..4a7f9abc5e 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/Manifest
@@ -1,2 +1,3 @@
 DIST gobject-introspection-1.74.0.tar.xz 1044008 BLAKE2B 223bb9b8b452f03945f941086e47fb3b14f03f8353f4f903b21e3f494af728652a44de986752374057e90dd8111f21f5b0cd3e00bb0a8c3aa25c8261bb0b9247 SHA512 decff5dda0ec5ec0afda4d6bcd3bdadcbf34289002c0d9c0c77ecf8c5d3f15d196b24d8035041545031006acbdfe76af47c42da061c40e200c87f2c74cd301f0
 DIST gobject-introspection-1.75.6.tar.xz 1054100 BLAKE2B 3fb76550fc4f0ede1f0af93ef15d9923d25408ffc7d4f10fa4e10830ce1c7055760ec0fb11985f977eee9e81066e0712b4b6271398febd3e7592919db0335998 SHA512 6fb7b82c46eb79336ec654d34c94213bafd5ea6b293050698714c26afc929c73b6abbe75e09e992f0cccb7168f638a40219d6708e2758f620551a7b39306e0fb
+DIST gobject-introspection-1.76.0.tar.xz 1054488 BLAKE2B b5cc25977cf0a61b93fb98919f2c0e30e770431fdd4cfe85a564c50f9bd5e6ea9fec2b61c0b58f98c326c3007c361e1de0aee961538bcfd3b41fdb2a7e48a40b SHA512 76f3d2a74afbc3c819dee9350c39024b8665e704e01f63f877b431d59db42ee52ff636cb314c6be6e30b06bb21286ef37255467cc28ba434dc4dd72edc0cf8e9
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.76.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.76.0.ebuild
new file mode 100644
index 0000000000..7362abb833
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.76.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="doctool gtk-doc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.75.0:2
+	dev-libs/libffi:=
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+# Wants real bison, not app-alternatives/yacc
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.19
+		app-text/docbook-xml-dtd:4.3
+		app-text/docbook-xml-dtd:4.5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature test cairo)
+		$(meson_feature doctool)
+		#-Dglib_src_dir
+		$(meson_use gtk-doc gtk_doc)
+		#-Dcairo_libname
+		-Dpython="${EPYTHON}"
+		#-Dgir_dir_prefix
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	python_optimize "${ED}"/usr/$(get_libdir)/gobject-introspection/giscanner
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"/usr/share/aclocal/introspection.m4 \
+		"${ED}"/usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"/usr/share/aclocal || die
+}

From abb367a35fd8feaeea602189ee46e2501963561d Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:22:51 +0000
Subject: [PATCH 08/62] dev-libs/gobject-introspection-common: Sync with Gentoo

It's from Gentoo commit f9c933e1cdcdcb090a7d4a83ad3033f6daa89c2b.
---
 .../gobject-introspection-common/Manifest     |  1 +
 ...gobject-introspection-common-1.76.0.ebuild | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.0.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/Manifest
index 883ececc6d..4a7f9abc5e 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/Manifest
@@ -1,2 +1,3 @@
 DIST gobject-introspection-1.74.0.tar.xz 1044008 BLAKE2B 223bb9b8b452f03945f941086e47fb3b14f03f8353f4f903b21e3f494af728652a44de986752374057e90dd8111f21f5b0cd3e00bb0a8c3aa25c8261bb0b9247 SHA512 decff5dda0ec5ec0afda4d6bcd3bdadcbf34289002c0d9c0c77ecf8c5d3f15d196b24d8035041545031006acbdfe76af47c42da061c40e200c87f2c74cd301f0
 DIST gobject-introspection-1.75.6.tar.xz 1054100 BLAKE2B 3fb76550fc4f0ede1f0af93ef15d9923d25408ffc7d4f10fa4e10830ce1c7055760ec0fb11985f977eee9e81066e0712b4b6271398febd3e7592919db0335998 SHA512 6fb7b82c46eb79336ec654d34c94213bafd5ea6b293050698714c26afc929c73b6abbe75e09e992f0cccb7168f638a40219d6708e2758f620551a7b39306e0fb
+DIST gobject-introspection-1.76.0.tar.xz 1054488 BLAKE2B b5cc25977cf0a61b93fb98919f2c0e30e770431fdd4cfe85a564c50f9bd5e6ea9fec2b61c0b58f98c326c3007c361e1de0aee961538bcfd3b41fdb2a7e48a40b SHA512 76f3d2a74afbc3c819dee9350c39024b8665e704e01f63f877b431d59db42ee52ff636cb314c6be6e30b06bb21286ef37255467cc28ba434dc4dd72edc0cf8e9
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.0.ebuild
new file mode 100644
index 0000000000..bce7762306
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="gobject-introspection"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for GObject Introspection"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
+# Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like:
+# https://forums.gentoo.org/viewtopic-p-7421930.html
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins m4/introspection.m4
+
+	insinto /usr/share/gobject-introspection-1.0
+	doins Makefile.introspection
+}

From 4f4eb24eee202e02cfd30b0b91fa9b2f1f634606 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:14 +0000
Subject: [PATCH 09/62] dev-python/boto: Sync with Gentoo

It's from Gentoo commit 11706cd5ae38960e081221efd8a4d481785756c0.
---
 .../portage-stable/dev-python/boto/boto-2.49.0-r6.ebuild       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.49.0-r6.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.49.0-r6.ebuild
index 4044a5d7d0..00502f5ae5 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.49.0-r6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/boto/boto-2.49.0-r6.ebuild
@@ -6,11 +6,10 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Amazon Web Services API"
 HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"

From 0ed67cac7d83bdb4bfefc11f4234aa5ce7352d8f Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:16 +0000
Subject: [PATCH 10/62] dev-python/cython: Sync with Gentoo

It's from Gentoo commit 2e1d6c51afc17d5f1b26b62e2cea582fcec0847a.
---
 .../portage-stable/dev-python/cython/cython-0.29.33.ebuild      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33.ebuild
index ed6b43043b..73a270b7e3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="Apache-2.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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 

From efcb41bea647f0f4588eb37f5fa02fa9d726d937 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:17 +0000
Subject: [PATCH 11/62] dev-python/distro: Sync with Gentoo

It's from Gentoo commit 4116f95231531c2c7b259c2a908d302b4c39e428.
---
 .../portage-stable/dev-python/distro/distro-1.8.0.ebuild       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild
index 7d704ee72b..6b635b1f8d 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/python-distro/distro/
 	https://pypi.org/project/distro/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"

From 810afd8fba5208a5a85ff9b1505bae6493bfb88c Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:17 +0000
Subject: [PATCH 12/62] dev-python/docutils: Sync with Gentoo

It's from Gentoo commit fd6ee56f48251c245bb2ce7664db9766fdd55f65.
---
 .../portage-stable/dev-python/docutils/docutils-0.19.ebuild    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.19.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.19.ebuild
index b97ed0c05e..bb359da3a8 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.19.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.19.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)"
 HOMEPAGE="
 	https://docutils.sourceforge.io/
 	https://pypi.org/project/docutils/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"

From cbbbd445afbf99188fa1d28a1f84fd07b80647f1 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:18 +0000
Subject: [PATCH 13/62] dev-python/flit_core: Sync with Gentoo

It's from Gentoo commit 79dcf57af0985f6b25244096b84efb6dc1f7bbed.
---
 .../portage-stable/dev-python/flit_core/flit_core-3.8.0.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flit_core/flit_core-3.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flit_core/flit_core-3.8.0.ebuild
index 1812d084e5..e4cdefb91f 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/flit_core/flit_core-3.8.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/flit_core/flit_core-3.8.0.ebuild
@@ -7,14 +7,13 @@ EAPI=7
 DISTUTILS_USE_PEP517=standalone
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Simplified packaging of Python modules (core module)"
 HOMEPAGE="
 	https://pypi.org/project/flit-core/
 	https://github.com/pypa/flit/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

From 87b7b6713326d32771d49a0cfcf2637aa1090c66 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:21 +0000
Subject: [PATCH 14/62] dev-python/installer: Sync with Gentoo

It's from Gentoo commit 7d193bde719f4e70ec95a9526c5a2eb7af4bfdad.
---
 .../dev-python/installer/Manifest             |  2 +
 .../installer/installer-0.7.0.ebuild          | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/installer/installer-0.7.0.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/installer/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/installer/Manifest
index ef2653b968..b6db2da200 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/installer/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/installer/Manifest
@@ -1,2 +1,4 @@
 DIST installer-0.6.0-py3-none-any.whl.zip 452554 BLAKE2B 58a38d07256ed4fde3ab9495d47c117966155067fb6e903e2c1979272055b252e81f514cc67f5d0cda12e870f0a4f68f4c44bbfd6af38628e64726bdbcb17b50 SHA512 eca4f06e078c920085090a24c6083fceba2d52e433b21e1f2fb4d4e2e457f0dcca0e0307fb3239ab6018a92a3cb2e797499f050264ca2918bd268699357140b7
 DIST installer-0.6.0.gh.tar.gz 469015 BLAKE2B c7e297724a634377d312ef408627e40c8a8aa7f67824331b657d13aa2908df2a59b935d7774437aa56b4b41bc7418f6f2e575c1e0fb6b282a124cf0440f74b89 SHA512 0952bbf245359d6f660f98e59096ed3d57facb5bad0e9715fe525bd52f50cce198b481811d2ba4d204776f7ae9bec9c3431ae044d6ef9a8db8d873c170cf13fb
+DIST installer-0.7.0-py3-none-any.whl.zip 453838 BLAKE2B 59bb698e7a4232a5254b6f6c4a042c68a22a26e15c1205707d3c9734513e92bf4518a09341619eab9ef0023ee65fcaa9837a4befb7a2452f1592411654374595 SHA512 8e10013521238ef8fb2f5ab4bd00f6154c05046011cad8824d96b7cdc4ed235b87e534d1e163a47a11dbfb5bb3cf19d9a2ea3edd1e9c9ce5fbc9a375010c36dc
+DIST installer-0.7.0.tar.gz 474349 BLAKE2B 76b86d14c0f4f0eba091ff08ef27e1b2f23c93318d197b3c41f5fef45eb11acc54bb1d35e3afc1e0dd98b30cc4cd3d9963ab1ba0bfe9d294ee3d0933ddaa24db SHA512 e89c2d28ca73d9c4291d645dda675fdcfcaba2e4f8765b9fa4a2f211e27711510f3d171b96a6b024c11808ba7f06b7b560a7cb31fafba815bd5c7396f26789f7
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/installer/installer-0.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/installer/installer-0.7.0.ebuild
new file mode 100644
index 0000000000..d7a6feac48
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-python/installer/installer-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A library for installing Python wheels"
+HOMEPAGE="
+	https://pypi.org/project/installer/
+	https://github.com/pypa/installer/
+	https://installer.readthedocs.io/en/latest/
+"
+SRC_URI+="
+	$(pypi_wheel_url --unpack)
+"
+
+LICENSE="MIT"
+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"
+
+BDEPEND="
+	app-arch/unzip
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	python_domodule src/installer "${WORKDIR}"/*.dist-info
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}

From 7a21a94ea7cc850512b0599e68197758da77d45a Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:23 +0000
Subject: [PATCH 15/62] dev-python/jinja: Sync with Gentoo

It's from Gentoo commit cd19a78ac797e77d6c751b1cbcb7a7be5f3c36b7.
---
 .../portage-stable/dev-python/jinja/Manifest  |  1 -
 .../dev-python/jinja/jinja-2.11.3-r1.ebuild   | 57 -------------------
 2 files changed, 58 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-2.11.3-r1.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jinja/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/jinja/Manifest
index db75823198..e6fcb661ff 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/jinja/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/jinja/Manifest
@@ -1,2 +1 @@
-DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
 DIST jinja-3.1.2.gh.tar.gz 272546 BLAKE2B dc4bc81900c07e7816ff63259073409650f1f679e00d76b9574aaba301b36a7037aaf77a87cc1c160ea2aa2272ceb67e2fd20fbd74bb9850880fb909babded8e SHA512 50feebc7eed4c8b5bb0c2951784c1c115e3ee1c0e0c91bbf1884551b1312ef8fce24804a2ca1dfd8c543406529afe4817567c39e7cfd15028b54049853623144
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-2.11.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-2.11.3-r1.ebuild
deleted file mode 100644
index 7f1982612b..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-2.11.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i -e '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-	# fix compat with markupsafe-2.1.0+
-	sed -i -e 's:soft_unicode:soft_str:g' src/jinja2/*.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins ext/Vim/*
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}

From 8c278dee82df0205ca9f77e83f544ff3559d3af4 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:23 +0000
Subject: [PATCH 16/62] dev-python/lazy-object-proxy: Sync with Gentoo

It's from Gentoo commit a674ecce60870110f23c84d475fccdb902a10ac6.
---
 .../lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
index 5161a0f1a0..73480ddc15 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A fast and thorough lazy object proxy"
 HOMEPAGE="
@@ -14,7 +15,6 @@ HOMEPAGE="
 	https://pypi.org/project/lazy-object-proxy/
 	https://python-lazy-object-proxy.readthedocs.io/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

From 0195eb8479934079c11bd66e6e0150ade73c3943 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:24 +0000
Subject: [PATCH 17/62] dev-python/markupsafe: Sync with Gentoo

It's from Gentoo commit 85e4ebc989148329346a6a9238579998b3af2d9f.
---
 .../dev-python/markupsafe/Manifest            |  1 -
 .../markupsafe/markupsafe-2.1.1.ebuild        | 27 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.1.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest
index a73919e84d..24d2598de7 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest
@@ -1,3 +1,2 @@
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
-DIST MarkupSafe-2.1.1.tar.gz 18668 BLAKE2B c15bddc89bec9a6558b797b825314d9db3ac03978c44aed42d98ab534613e5bffa2eb0ffe500ff675e78491e3f6039981c468711bdf398ff56277b2bd93932c4 SHA512 1d9bf55614b4e0aeca726ebda7bab2829452212f03f2295efdd0340f3dd05eefc9733d6dd0e37f0d06a432ce00ed7d06b28c9e817fc25212675006577f468b3e
 DIST MarkupSafe-2.1.2.tar.gz 19080 BLAKE2B 560cc052c105c3d9f2690c3e5a2a597dd36848080e3c7d6f8273dcd03bdb613ed54cfe6e53b9ec8053deb38d0d055123da7204a671c1fff3295596d44a63b317 SHA512 84dbeddaf2df713b3cce94eb64876fea8f80c608e25130c18e4691be2b1dea56df8b772d26c0caca88231ef795125eb9678210c33bf20518c18e3047912ddb4b
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.1.ebuild
deleted file mode 100644
index 1453ceee52..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="MarkupSafe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="
-	https://palletsprojects.com/p/markupsafe/
-	https://github.com/pallets/markupsafe/
-	https://pypi.org/project/MarkupSafe/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-
-distutils_enable_tests pytest

From e6a1051dae8a96c8cc8006eb56b6b1b6b4643c38 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:25 +0000
Subject: [PATCH 18/62] dev-python/ordered-set: Sync with Gentoo

It's from Gentoo commit 8bf862bd59598d8828bafcdee02ff675e1a92b7a.
---
 .../dev-python/ordered-set/ordered-set-4.1.0.ebuild           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild
index abf7456269..96c2e79683 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild
@@ -5,13 +5,13 @@
 EAPI=7
 
 DISTUTILS_USE_PEP517=flit
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A mutable set that remembers the order of its entries"
 HOMEPAGE="https://github.com/rspeer/ordered-set"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"

From 89de9b8ae1549cd7f961cf554893654a4a37514f Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:26 +0000
Subject: [PATCH 19/62] dev-python/platformdirs: Sync with Gentoo

It's from Gentoo commit c2919f73b580cd3e2dd0ecb04c5ab72dba0dc453.
---
 .../dev-python/platformdirs/Manifest          |  3 --
 .../platformdirs/platformdirs-2.6.2-r1.ebuild | 53 -------------------
 .../platformdirs/platformdirs-3.0.0.ebuild    | 53 -------------------
 .../platformdirs/platformdirs-3.1.0.ebuild    | 53 -------------------
 .../platformdirs/platformdirs-3.1.1.ebuild    |  2 +-
 5 files changed, 1 insertion(+), 163 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-2.6.2-r1.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.0.0.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.1.0.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/Manifest
index 733835581f..461a808cb3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/Manifest
@@ -1,4 +1 @@
-DIST platformdirs-2.6.2.gh.tar.gz 21184 BLAKE2B 4acc85301f764d4457ace88f9fb409e4d2f8bb17b9133dc3316c4d265a7cf50019298f1ba4cef87f5999b48fd7060687f7008079de26ffe74740a4cefff9309e SHA512 704cc39ba1746055e0459139759e118bd6178fb13cc8ecf580f58d16073fbb8ade0bce8b5eb9230ccc45b19f622a41c84a06f8698ee722da9d5cec44c5f46e25
-DIST platformdirs-3.0.0.gh.tar.gz 21358 BLAKE2B b7dd6d55cc07d9e584d2e3f4a8a1e3bcd5b75eac6786c4225c9b249af9d98cbe0c8b1edc7a6180c147ad13d0a7d5c4fbc9f15cf71af03590c011f7fd4ae336a4 SHA512 36885fdb4767e2525eef48e8ede6cec8013d2e8767c7940381d642faa14382583885c2428ce7b27fc36d33048494354cb4d16b42eac2748ca4458b8c124ed01f
-DIST platformdirs-3.1.0.gh.tar.gz 21721 BLAKE2B 5f7334c0003d0dcd51473820239068dd441ecc18e7837822f824f8ca2e5f5915aa89363eee27740214b97c1c4bb258a4ffa2ab6b4963bf6e9346c13fed6dc0f0 SHA512 49ad7b15419aff2c5af5c63a8850378d688eb95aadcd0c489d26fe4eea8315caffb17136fa7cbdf4a945bebae2eb8154ddfb771ed6fdc47595eff590e0f32ccb
 DIST platformdirs-3.1.1.tar.gz 14712 BLAKE2B ddb070cc3c572b03eaa356599d2a0e408f7f0a650378e60b4a7b4fcd740fb9117c73491451588b26d42a4db9b971dbc690f9ddae34ec03e42248120ff5e4e64e SHA512 537557370a05f78279c88cdda4b5abfbe1d2e6d91d69c4dd4049c6b1a8ac3e44a830d787e2b86af85c346e0244a6ba26233db061d7c8d0a3fbd141962609930d
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-2.6.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-2.6.2-r1.ebuild
deleted file mode 100644
index f35c13ebc2..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.0.0.ebuild
deleted file mode 100644
index bb833077f5..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.1.0.ebuild
deleted file mode 100644
index b876a13536..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.1.1.ebuild
index 58e26b5de9..1ef6750de3 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (

From f674287fd79ae79cc256ebe9b998075617de6820 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:32 +0000
Subject: [PATCH 20/62] dev-python/six: Sync with Gentoo

It's from Gentoo commit c82fe86e03a75820aafd059c8e079548e5c6d6e1.
---
 .../portage-stable/dev-python/six/six-1.16.0-r1.ebuild         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0-r1.ebuild
index 39c83b0ad7..5803cfb422 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0-r1.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python 2 and 3 compatibility library"
 HOMEPAGE="
 	https://github.com/benjaminp/six/
 	https://pypi.org/project/six/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"

From 7b3eebf07f49d82e207c475714b7dfb6af8c3c71 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:32 +0000
Subject: [PATCH 21/62] dev-python/snakeoil: Sync with Gentoo

It's from Gentoo commit 1829a785a34cfae8351be19bef396ffe67ffb1d3.
---
 .../portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild   | 2 +-
 .../portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild
index a92092e2e3..2aad99caa0 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 fi
 
 DESCRIPTION="misc common functionality and useful optimizations"
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild
index 88ca572e1a..fece6e6a0b 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 fi
 
 DESCRIPTION="misc common functionality and useful optimizations"

From 09ce1bc5beff3282827a5d9dbe31a44808865b66 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:33 +0000
Subject: [PATCH 22/62] dev-python/typing-extensions: Sync with Gentoo

It's from Gentoo commit ac57b2b4b773d98ab53067a4dbb25211ca0c2da9.
---
 .../dev-python/typing-extensions/Manifest     |  1 -
 .../typing-extensions-4.4.0.ebuild            | 36 -------------------
 .../typing-extensions-4.5.0.ebuild            |  2 +-
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest
index 4e33031f06..47c6d4b387 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest
@@ -1,2 +1 @@
-DIST typing_extensions-4.4.0.gh.tar.gz 50027 BLAKE2B 4cb757eadcfce85842dc5625e620f01f8fda00fe3712d5895d8b0aa07a9e649cd20f9f820cb2801e3b34c84c1d3b79d5e71fc49cd37014924825b6cdef0152c7 SHA512 1c046e6dab22fb399acf7ab8771d035aa24c88b09cbd023e80a41cd04851c5f8b1d297275012e933658e963e008b073b8d3815f5703042545b57130daa38f143
 DIST typing_extensions-4.5.0.gh.tar.gz 52431 BLAKE2B 3d905e4f1146d23d00b695044daf653722fce9ade8f44730116bab0b8fb15c3e8d2124a6b0d395fad078878e0e4b7888e19660ca2491ccc9ec01dc11ce318fc8 SHA512 29369da83cdca57aba7d8c2089c77ad265eeb614fd34056f678e6dc9374558d1059ff2c514326115734fadbcad27ec98e1e5fcec087022a9d838cc2bfd1fe825
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild
deleted file mode 100644
index 8a7b2b50c0..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-SRC_URI="
-	https://github.com/python/typing_extensions/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy-tests.patch
-)
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild
index b036b91b4a..e56af8570a 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 distutils_enable_tests unittest
 

From f2a644220d3cb8855959e16674b0920caa6545a4 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:34 +0000
Subject: [PATCH 23/62] dev-python/wheel: Sync with Gentoo

It's from Gentoo commit cb0738a21d9e41c19c64f252b921f54619b88c92.
---
 .../portage-stable/dev-python/wheel/Manifest  |  1 +
 .../dev-python/wheel/wheel-0.40.0.ebuild      | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/wheel/wheel-0.40.0.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/dev-python/wheel/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/wheel/Manifest
index e1612f697e..3e16760be0 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/wheel/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/wheel/Manifest
@@ -1 +1,2 @@
 DIST wheel-0.38.4.gh.tar.gz 69770 BLAKE2B a6077e38c21626169d68a3256fbe6457de3d4fde5d0a582859fe7b9ec5d73c142538f7fbfe762ddd436473c682e7810407a08730f66ec2a7844084d349e0779f SHA512 2ff7c6175201f8145f2c1f9937c6955a1dd22eeedab1e456f65c4edae9186610d9e7702c35773b49026c56c9cc201672025e7d42fcc7f782153c65c28e6b90d0
+DIST wheel-0.40.0.tar.gz 96226 BLAKE2B f4207ab822f037a3d8decc50643ad7e49a632028c712bc33c680d178f10117ff0aa4f2a971bf739a77a76dbf818360d0f628ce997b942ee9d85ec7fac28badc8 SHA512 211e68d927c93b9b2748bf081097d1172cf8d4863d540be72f1d6023b64042410805d4208a2c94de89a1eeb0fb32044e78f41ab58ac94498ac0c489a1eea0d23
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/wheel/wheel-0.40.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/wheel/wheel-0.40.0.ebuild
new file mode 100644
index 0000000000..1100190f6e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-python/wheel/wheel-0.40.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="
+	https://github.com/pypa/wheel/
+	https://pypi.org/project/wheel/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unbundle packaging
+	rm -r src/wheel/vendored || die
+	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
+	sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
+
+	distutils-r1_src_prepare
+}

From 2a48125ab620d3a5995b48beff8fc82ce3374016 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:36 +0000
Subject: [PATCH 24/62] dev-util/cmake: Sync with Gentoo

It's from Gentoo commit 9888a7cbe8db8b96827b9310181b0efb4a04ac7a.
---
 .../src/third_party/portage-stable/dev-util/cmake/Manifest  | 6 ++++--
 .../portage-stable/dev-util/cmake/cmake-3.25.2.ebuild       | 2 +-
 .../cmake/{cmake-3.26.0_rc4.ebuild => cmake-3.26.0.ebuild}  | 0
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename sdk_container/src/third_party/portage-stable/dev-util/cmake/{cmake-3.26.0_rc4.ebuild => cmake-3.26.0.ebuild} (100%)

diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest
index 21cba2c15f..0c03f62c5b 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest
@@ -10,5 +10,7 @@ DIST cmake-3.25.3-SHA-256.txt 1646 BLAKE2B 2b4febaa4c486f42c773621efe5ab3ff90357
 DIST cmake-3.25.3-SHA-256.txt.asc 833 BLAKE2B 7db637e3383915cb659b176ffc72508460ef73a245dc5ff99d9ba2649d8db0666e04ff2d428fefaa86cd14a07047bc7b7df0e0bed91ac80d9a8bb993f1d70102 SHA512 26f6c584d8f8bb44fc10b227f81ef3655d35140a1825270877e2be5460e4f0bfa92ca7d7186f55ef08085814c7f79e50cfc9cd7ba9880620aba25661ed1f75ac
 DIST cmake-3.25.3-docs.tar.xz 500216 BLAKE2B 5c6474328e2bfa17f5aa39693dabb19f33ac1f6875119e41d60f97c94bf1441b9d9528e96e4dd36d5d68e711c4bf4d32fe84a454df796755eccb1483fa55e3c8 SHA512 6e9ce5fc545324c327d8216dbbc316bbd5966640ae2b3e17ada00926004d55df75c5d25e6590ed53a8033d9638c5b6282bedd115ddf28b27980a80e40a3cba0c
 DIST cmake-3.25.3.tar.gz 10562254 BLAKE2B b7ae9f129731da30f89967eac20bdfcebd9c4f6ca3b28decc2016ab18292e4b51eb5a43b5797f874e23e64e1d01eeb98b18a927035aab8edc63a069f1bfce32b SHA512 ebcb5616ca418fe164863b157f67cff6e8c49b0f8f723c0bd219466211f3cfe8b93c4b3ad0fe6d2d3772881fd867b0905340945156f6d70a9ea08bfb7eb98550
-DIST cmake-3.26.0-rc4.tar.gz 10668045 BLAKE2B 2f768c69dcc4476a90bad3e6ffeed91c07ae349999057cbca450acc2aaccd12039a1131b0a268370b21c12ef41e7eafcb8a0dc3fc7b650337a97bf9a314bf674 SHA512 647c44833eaffb65400a1909fe29d502c633c76e0be6245bea57e337d2a81d04b0c5fd00ad556c668469bc5391e896679369c979fe3abe8e09fc2090986595a7
-DIST cmake-3.26.0_rc4-docs.tar.xz 507420 BLAKE2B 554d4d49053230c5c5f435ba31e7e82bcb5024e126511f91c767294e5e6739a36ff94f425c5deadd7b31b9bbd9df3f91c83b4b3578cad2f84959502950c4d0f4 SHA512 cef63824bb8c59e70b527f8f20a49cffa59ef69ca32b4f74d7c75a620bd3472e06200fb01f1ee393c3fc3e8607fe9df4ae2416e1c68a755c8cb2f89eca60a623
+DIST cmake-3.26.0-SHA-256.txt 1646 BLAKE2B 4d206db310af5b0305329755473d936d54adb30cc3effb91b12f37e290ada84cb5f0ead5f0e813e653b5a3918f471256ba75a5253151bc0f70dfcc5e65b8665c SHA512 1fe9615b0695f4c94c1d8e963247db9354e5749fcb3abcd1605ec20bd8ff1e53ce0c18d8c1eee5d10c6b04e5a82dbdf61266ab0801267ab22573c7080ffbbd05
+DIST cmake-3.26.0-SHA-256.txt.asc 833 BLAKE2B cbbc54efd9e4b0242f28bbb7c6ce435fc31bd28180331537c44538600ec6470b69fe37635c5de8b55eb1eb015b51c0fb2f591b698195b27686644341ef1813b2 SHA512 eb81bf190fd74b2ad2cb9d35fd8248024054ec6e33b5a12ce49da23cc0fac1ec5bae48df748ad9b30680e77e9b51af5dd8e3de02e47b587670d25b372f977fcb
+DIST cmake-3.26.0-docs.tar.xz 507564 BLAKE2B 13f0f30cd87ce10e8331573a8bb93c796b7ad2862eba6e7ca676784068931f19ac3e3758b5767f4897933cf432099899668acf0dbf132e367eaa3b54bf674cd9 SHA512 5e140b1a81ab24dc05851717ddd1a7d57bc3c54103328db8826ff190e6d27f5d0d35f4e07f094dec4217aaa8c497abd7c858132775955cb89560c8e080de9279
+DIST cmake-3.26.0.tar.gz 10667656 BLAKE2B a1c6970935e103467f0557d244fa630d6f01add9a61f4f6200c711b757b7852eceb9c96f4247c2c09f8582c19a6def0c8b632e8e56574019c630a65c6a77bdd2 SHA512 c9d166989abbae71002fe2fbe589c18794a0d6d2ff61fd197c473ff593066a1a17d12889cd875d63fa8824327c8ad165cb03d1f17e517dcef6b2de3b0f0ee789
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild
index decf971990..d9689aa41b 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild
@@ -47,7 +47,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.0_rc4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.0.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.0_rc4.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.0.ebuild

From 6761c2d61d8bbf9019952f312f6fa01ea2503f42 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:45 +0000
Subject: [PATCH 25/62] dev-util/pahole: Sync with Gentoo

It's from Gentoo commit 5455dc2798ff4b1b84ca0f97d0bd3dc068e82199.
---
 .../portage-stable/dev-util/pahole/pahole-1.24_p20221024.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24_p20221024.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24_p20221024.ebuild
index 5d98a67216..aec3a504a1 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24_p20221024.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24_p20221024.ebuild
@@ -37,7 +37,7 @@ LICENSE="GPL-2" # only
 SLOT="0"
 IUSE="debug"
 if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 fi
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

From b3382292d2ea75763c29d0ac2e5d3573b8037ee4 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:52 +0000
Subject: [PATCH 26/62] dev-vcs/git: Sync with Gentoo

It's from Gentoo commit 37305aa8f6bd146c01c41ae9aca55b52c82c5193.
---
 .../portage-stable/dev-vcs/git/Manifest       |  6 +-
 .../files/git-2.7.0-mediawiki-500pages.patch  | 46 ---------
 .../git-2.7.0-mediawiki-namespaces.patch      | 97 -------------------
 .../files/git-2.7.0-mediawiki-subpages.patch  | 48 ---------
 ...it-2.40.0_rc0.ebuild => git-2.40.0.ebuild} |  0
 5 files changed, 3 insertions(+), 194 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
 rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.40.0_rc0.ebuild => git-2.40.0.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 48ac47c708..17e1af7b51 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,9 @@
 DIST git-2.39.1.tar.xz 7160744 BLAKE2B 5ebf583232da9f6a937ebba17858b9fa8b550e3d0d981ff5603f77673cce69bf9a3c1c18c61d4c5e6b2f629a8173eaef8a09c913961d175571e4e6b00d2b194d SHA512 b1821a814947f01adf98206a7e9a01da9daa617b1192e8ef6968b05af8d874f028fb26b5f828a9c48f734ef2c276f4d23bdc898ba46fb7aaa96dbe68081037e9
 DIST git-2.39.2.tar.xz 7163224 BLAKE2B bcd9abdaf8ce626de7aec2da666395f80212772aa17516f903459d683597184efeeb1d6aad536e0bf722a9bf63df98549fdeaab5b0a48e5500faf83ebf5d7516 SHA512 fdca70bee19401c5c7a6d2f3d70bd80b6ba99f6a9f97947de31d4366ee3a78a18d5298abb25727ec8ef67131bca673e48dff2a5a050b6e032884ab04066b20cb
-DIST git-2.40.0.rc0.tar.xz 7179140 BLAKE2B 275149105e27fa938d3769f29546a04fbea0daa10796933e9c50bc6a9c482fdb13dbe0f0f3bef3373fe98afeca7f4cc80c32cc5b38fdcdf60b7dc951a3fdaf61 SHA512 123d400cce9a66f7399fe9e74b79e8ec709b7ca45d4cf8296af27ad1b866fccebc6493cc056c08d4678d3720bace60193d55ff6014137965317c16e65536ac20
+DIST git-2.40.0.tar.xz 7183692 BLAKE2B e2687ceb7e341170f063013c8c0e8be81456cda786981f36170aefb714687d78cf850287e5fb35d98e7326f611881ffd27d380728c87b9306fbbe46c1b989d69 SHA512 a2720f8f9a0258c0bb5e23badcfd68a147682e45a5d039a42c47128296c508109d5039029db89311a35db97a9008585e84ed11b400846502c9be913d67f0fd90
 DIST git-htmldocs-2.39.1.tar.xz 1504172 BLAKE2B 64a73a2b04e99b0bf18ab2153076bcbae9c114a31c9ab998c5e068f0ce6c0f5140e9db79008b1b01688db6a6d53e84fde8b2319eb45394aa6bc2df361be78520 SHA512 9b67b0464acd5651ef5871f724c59c910195cdd7020ecdcadced6e8e1275269ee1ca5808881e67e908114cb4ef27c959320f1e3d718b6699d3761281b6179600
 DIST git-htmldocs-2.39.2.tar.xz 1505352 BLAKE2B 8b60f9bae9585aab8782f38ff64391a9c8fddeed47d84a989b4f65db87c14e927d1d975fa5239435e921dbc74a75c600d6f0485defa1a235a66355c0f8d9060d SHA512 fe0982e653784285bce7f158956892900ae9c88aa986261de4184e3349e34ee54f92d7280e143031b107872fc1729814489f6e355aa12dc415d724da65ec3716
-DIST git-htmldocs-2.40.0.rc0.tar.xz 1516032 BLAKE2B 076dfa70832fedf4f39bbe321aa74b7928a70040858624026662dc686a4af051fc8206daaee6748d560153bf38972210fb24095439f176b979727df8674bbab4 SHA512 288084d6789f2544be5f9932e43f542cc785e99df9ef42252a9ba87159bec9e845bcb7594e7e6011cbba1f75285b74e48cba2e86c6c9299c95b439b0803de4ed
+DIST git-htmldocs-2.40.0.tar.xz 1517292 BLAKE2B 1baa47344e8c41c529e6ea21fa9ab406d146e128c2154beceb1d2ddf993cebdfeca132ed86811ef062df38e1ecc541dd2285bca0d985e7cc8ce185422d53f9b4 SHA512 3295e6b5e69430b3900ade93484cc357dd69d59ffccef0b62648d4aefc5d3e0820bd81dde2ec5ad0f3983c9c3a3648fa6edea508e870ebc0194cf6d42137aee2
 DIST git-manpages-2.39.1.tar.xz 557012 BLAKE2B 1a39a1192443eac0d12da059e0146d286272054192810d12f53f627bd341c3dc50bea2078cccac0d46c5e95502a1d669f072ab387e1662c890e5c38d46ad3f31 SHA512 4f1fdd7abf53dd60478ffc5f926777cd00446a3799ad9a2129814adfe7d3d63e13dd9bcdcea699fd139c9e134cf45857f0585ce2772e4fb93e4930c8f86a08bb
 DIST git-manpages-2.39.2.tar.xz 557080 BLAKE2B 6b2dbb33f1041ba802582f529638b8b4574309efbf5af94add5c676efed7314743d5b326ec18a95ba85a4fe818e95913069717034a9863879e1d03ee32b839ba SHA512 6326ff43564fc42ca0a424edd17896434e11c09ce21f4bfd4d4975aaaf7f2c0d823da0e89b267557b0b7799c342db88d84685d24f589f53edfe486208c1f15b1
-DIST git-manpages-2.40.0.rc0.tar.xz 562536 BLAKE2B 1c41631408a9bea0d73dbc8df2242c3cbaf2330bc96f3e3020b10397568dc6e32b631d6ff0dd8026adc5c36398e44d88dcf773f49b706e446b93e84c94942081 SHA512 1444417c073c8a5d74edeb45e521761ce42d911c3f8dcc329a54a78d9078a81d4d1f9e8a1772d03f4196bc6b013fe092d0ea422ca43292399dd22c84813ddba7
+DIST git-manpages-2.40.0.tar.xz 562824 BLAKE2B 9e57d39c2111fc3a109d355773bc191110ac421bc1b0b9bdeeb13e84d8934ad4bdb8c7439bc7fe8f1ffea505e4ea6d14ab4fdf689e828e841cf0af8d2eb3cd12 SHA512 7415db5fd30239c7f5a51c40c3e94870ef6896df0d78a88bbe91c38d58e4d9802e12e1de2cb03634a52ad4a5877c9d7e1194c284567288ed4263788c48c8cff0
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
deleted file mode 100644
index 0ce706db99..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-500pages.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Searching for pages using the MediaWiki API returns at most 500 results
-(hi Patrick). To get a list of all pages in a larger wiki, we need to run
-repeated searches...
-
-Source: https://github.com/moy/Git-Mediawiki/issues/32
-Author: anarcat https://github.com/anarcat
-
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
-index 8dd74a9..f2ce311 100755
---- a/contrib/mw-to-git/git-remote-mediawiki.perl
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
-@@ -259,16 +259,29 @@ sub get_mw_tracked_categories {
- sub get_mw_all_pages {
- 	my $pages = shift;
- 	# No user-provided list, get the list of pages from the API.
--	my $mw_pages = $mediawiki->list({
-+	my $query = {
- 		action => 'query',
- 		list => 'allpages',
- 		aplimit => 'max'
--	});
--	if (!defined($mw_pages)) {
-+	};
-+	my $curpage;
-+	my $oldpage = '';
-+	while (1) {
-+	if (defined($curpage)) {
-+		if ($oldpage eq $curpage) {
-+		    last;
-+		}
-+		$query->{apfrom} = $curpage;
-+		$oldpage = $curpage;
-+	    }
-+	    my $mw_pages = $mediawiki->list($query);
-+	    if (!defined($mw_pages)) {
- 		fatal_mw_error("get the list of wiki pages");
--	}
--	foreach my $page (@{$mw_pages}) {
-+	    }
-+	    foreach my $page (@{$mw_pages}) {
- 		$pages->{$page->{title}} = $page;
-+		$curpage = $page->{title};
-+	    }
- 	}
- 	return;
- }
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
deleted file mode 100644
index 72ab2126fa..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-namespaces.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-source:
-https://gist.github.com/anarcat/f821fa285c6b8b6b16a5
-https://github.com/moy/Git-Mediawiki/issues/10
-
-
-From 147224cfe6143c44b16aec0bb6d6a506a6b96ced Mon Sep 17 00:00:00 2001
-From: Kevin <kevin@ki-ai.org>
-Date: Fri, 28 Aug 2015 15:53:37 -0500
-Subject: [PATCH] Add namespace support to git-mediawiki
-
-Signed-off-by: Kevin <kevin@ki-ai.org>
----
- contrib/mw-to-git/git-remote-mediawiki.perl | 34 +++++++++++++++++++++++++++--
- 1 file changed, 32 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
-index 8dd74a9..662a5b5 100755
---- a/contrib/mw-to-git/git-remote-mediawiki.perl
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
-@@ -17,6 +17,7 @@ use Git;
- use Git::Mediawiki qw(clean_filename smudge_filename connect_maybe
- 					EMPTY HTTP_CODE_OK);
- use DateTime::Format::ISO8601;
-+use Scalar::Util;
- use warnings;
- 
- # By default, use UTF-8 to communicate with Git and the user
-@@ -63,6 +64,10 @@ chomp(@tracked_pages);
- my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
- chomp(@tracked_categories);
- 
-+# Just like @tracked_categories, but for MediaWiki namespaces.
-+my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces"));
-+chomp(@tracked_namespaces);
-+
- # Import media files on pull
- my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
- chomp($import_media);
-@@ -256,6 +261,23 @@ sub get_mw_tracked_categories {
- 	return;
- }
- 
-+sub get_mw_tracked_namespaces {
-+    my $pages = shift;
-+    foreach my $local_namespace (@tracked_namespaces) {
-+        my $mw_pages = $mediawiki->list( {
-+            action => 'query',
-+            list => 'allpages',
-+            apnamespace => get_mw_namespace_id($local_namespace),
-+            aplimit => 'max' } )
-+            || die $mediawiki->{error}->{code} . ': '
-+                . $mediawiki->{error}->{details} . "\n";
-+        foreach my $page (@{$mw_pages}) {
-+            $pages->{$page->{title}} = $page;
-+        }
-+    }
-+    return;
-+}
-+
- sub get_mw_all_pages {
- 	my $pages = shift;
- 	# No user-provided list, get the list of pages from the API.
-@@ -319,6 +341,10 @@ sub get_mw_pages {
- 		$user_defined = 1;
- 		get_mw_tracked_categories(\%pages);
- 	}
-+    if (@tracked_namespaces) {
-+        $user_defined = 1;
-+        get_mw_tracked_namespaces(\%pages);
-+    }
- 	if (!$user_defined) {
- 		get_mw_all_pages(\%pages);
- 	}
-@@ -1263,7 +1289,6 @@ my %cached_mw_namespace_id;
- sub get_mw_namespace_id {
- 	$mediawiki = connect_maybe($mediawiki, $remotename, $url);
- 	my $name = shift;
--
- 	if (!exists $namespace_id{$name}) {
- 		# Look at configuration file, if the record for that namespace is
- 		# already cached. Namespaces are stored in form:
-@@ -1331,7 +1356,12 @@ sub get_mw_namespace_id {
- sub get_mw_namespace_id_for_page {
- 	my $namespace = shift;
- 	if ($namespace =~ /^([^:]*):/) {
--		return get_mw_namespace_id($namespace);
-+		my ($ns, $id) = split(/:/, $namespace);
-+		if (Scalar::Util::looks_like_number($id)) {
-+			return get_mw_namespace_id($ns);
-+		} else{
-+			return
-+		}
- 	} else {
- 		return;
- 	}
--- 
-2.5.0
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
deleted file mode 100644
index c798a894d3..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.7.0-mediawiki-subpages.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2593304723c6def159c10b9060dafa78a775a057 Mon Sep 17 00:00:00 2001
-From: Lyubomyr Shaydariv <lyubomyr-shaydariv@users.noreply.github.com>
-Date: Fri, 11 Sep 2015 00:41:17 +0300
-Subject: [PATCH] git-remote-mediawiki: support subpages as subdirectories
-
-This is a fix for https://github.com/moy/Git-Mediawiki/issues/22
-The subdirectories option is enabled using -c remote.origin.subpageDirs=true
-during the cloning and it is not recommended to be modified in or
-removed from .git/config after the cloning.
----
- contrib/mw-to-git/git-remote-mediawiki.perl | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
-index 8dd74a9..f3624be 100755
---- a/contrib/mw-to-git/git-remote-mediawiki.perl
-+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
-@@ -63,6 +63,11 @@
- my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
- chomp(@tracked_categories);
- 
-+# Use subdirectories for subpages
-+my $use_subpage_dirs = run_git("config --get --bool remote.${remotename}.subpageDirs");
-+chomp($use_subpage_dirs);
-+$use_subpage_dirs = ($use_subpage_dirs eq 'true');
-+
- # Import media files on pull
- my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
- chomp($import_media);
-@@ -689,6 +694,9 @@ sub fe_escape_path {
-     $path =~ s/\\/\\\\/g;
-     $path =~ s/"/\\"/g;
-     $path =~ s/\n/\\n/g;
-+    if ($use_subpage_dirs) {
-+        $path =~ s/%2F/\//g;
-+    }
-     return qq("${path}");
- }
- 
-@@ -927,7 +935,7 @@ sub mw_import_revids {
- 		# If this is a revision of the media page for new version
- 		# of a file do one common commit for both file and media page.
- 		# Else do commit only for that page.
--		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of $commit{title}\n";
-+		print {*STDERR} "${n}/", scalar(@{$revision_ids}), ": Revision #$rev->{revid} of ", fe_escape_path($commit{title}), "\n";
- 		import_file_revision(\%commit, ($fetch_from == 1), $n_actual, \%mediafile);
- 	}
- 
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.40.0_rc0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.40.0.ebuild
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.40.0_rc0.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.40.0.ebuild

From a9b80c4966823d01b0e89472374f7aa918f83257 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:53 +0000
Subject: [PATCH 27/62] eclass/acct-group: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../third_party/portage-stable/eclass/acct-group.eclass  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/acct-group.eclass b/sdk_container/src/third_party/portage-stable/eclass/acct-group.eclass
index f55c9f4c95..47e2d278f7 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/acct-group.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/acct-group.eclass
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: acct-group.eclass
@@ -36,9 +36,9 @@
 if [[ -z ${_ACCT_GROUP_ECLASS} ]]; then
 _ACCT_GROUP_ECLASS=1
 
-case ${EAPI:-0} in
+case ${EAPI} in
 	7|8) ;;
-	*) die "EAPI=${EAPI:-0} not supported";;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 inherit user-info
@@ -83,7 +83,6 @@ S=${WORKDIR}
 
 
 # << Phase functions >>
-EXPORT_FUNCTIONS pkg_pretend src_install pkg_preinst
 
 # @FUNCTION: acct-group_pkg_pretend
 # @DESCRIPTION:
@@ -184,3 +183,5 @@ acct-group_pkg_preinst() {
 }
 
 fi
+
+EXPORT_FUNCTIONS pkg_pretend src_install pkg_preinst

From a04731d2cdf659048208c6e79023a621251c4e35 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:53 +0000
Subject: [PATCH 28/62] eclass/acct-user: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../third_party/portage-stable/eclass/acct-user.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/acct-user.eclass b/sdk_container/src/third_party/portage-stable/eclass/acct-user.eclass
index 14fda76ced..145fdb41aa 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/acct-user.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/acct-user.eclass
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: acct-user.eclass
@@ -44,9 +44,9 @@
 if [[ -z ${_ACCT_USER_ECLASS} ]]; then
 _ACCT_USER_ECLASS=1
 
-case ${EAPI:-0} in
+case ${EAPI} in
 	7|8) ;;
-	*) die "EAPI=${EAPI:-0} not supported";;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 inherit user-info
@@ -212,8 +212,6 @@ eislocked() {
 }
 
 # << Phase functions >>
-EXPORT_FUNCTIONS pkg_pretend src_install pkg_preinst pkg_postinst \
-	pkg_prerm
 
 # @FUNCTION: acct-user_pkg_pretend
 # @DESCRIPTION:
@@ -490,3 +488,5 @@ acct-user_pkg_prerm() {
 }
 
 fi
+
+EXPORT_FUNCTIONS pkg_pretend src_install pkg_preinst pkg_postinst pkg_prerm

From e5204a88c9989e276fc0de9e9f894c71a8098d88 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:55 +0000
Subject: [PATCH 29/62] eclass/autotools: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../portage-stable/eclass/autotools.eclass       | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass
index e93338ac6b..3a9119856a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: autotools.eclass
@@ -13,6 +13,11 @@
 # Note: We require GNU m4, as does autoconf.  So feel free to use any features
 # from the GNU version of m4 without worrying about other variants (i.e. BSD).
 
+case ${EAPI} in
+	6|7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 if [[ ${_AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then
 	# See if we were included already, but someone changed the value
 	# of AUTOTOOLS_AUTO_DEPEND on us.  We could reload the entire
@@ -26,14 +31,7 @@ fi
 if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then
 _AUTOTOOLS_ECLASS=1
 
-case ${EAPI} in
-	6)
-		# Needed for eqawarn
-		inherit eutils
-		;;
-	7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
-esac
+[[ ${EAPI} == 6 ]] && inherit eqawarn
 
 inherit gnuconfig libtool
 

From bd90dc4faeea19a6c55a3acf7aa9bf5f7e4974f6 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:55 +0000
Subject: [PATCH 30/62] eclass/cmake-multilib: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../third_party/portage-stable/eclass/cmake-multilib.eclass   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass
index 4dd3eab3cd..c8fad94ac0 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cmake-multilib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cmake-multilib.eclass
@@ -36,7 +36,7 @@ case ${EAPI} in
 				;;
 		esac
 		;;
-	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ ${CMAKE_IN_SOURCE_BUILD} ]]; then

From a7e2ed12df2443361dc27ae0f7be49706e667c43 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:55 +0000
Subject: [PATCH 31/62] eclass/cmake: Sync with Gentoo

It's from Gentoo commit c9a840065a2553871dd298e933da2874bf26062b.
---
 .../src/third_party/portage-stable/eclass/cmake.eclass        | 4 ++--
 1 file changed, 2 insertions(+), 2 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 46659867b1..03f2517c5b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass
@@ -20,7 +20,7 @@
 
 case ${EAPI} in
 	7|8) ;;
-	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ -z ${_CMAKE_ECLASS} ]]; then
@@ -489,7 +489,7 @@ cmake_src_configure() {
 			# When cross-compiling with a sysroot (e.g. with crossdev's emerge wrappers)
 			# we need to tell cmake to use libs/headers from the sysroot but programs from / only.
 			cat >> "${toolchain_file}" <<- _EOF_ || die
-				set(CMAKE_FIND_ROOT_PATH "${SYSROOT}")
+				set(CMAKE_SYSROOT "${ESYSROOT}")
 				set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 				set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 				set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

From 57444e7cbc265a2a02b17240c829a195327467c3 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:23:56 +0000
Subject: [PATCH 32/62] eclass/distutils-r1: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../portage-stable/eclass/distutils-r1.eclass | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass
index 95911f912c..78f5365828 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass
@@ -44,9 +44,9 @@
 # For more information, please see the Python Guide:
 # https://projects.gentoo.org/python/guide/
 
-case ${EAPI:-0} in
+case ${EAPI} in
 	7|8) ;;
-	*) die "EAPI=${EAPI:-0} not supported";;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @ECLASS_VARIABLE: DISTUTILS_OPTIONAL
@@ -169,7 +169,8 @@ esac
 #     ${DISTUTILS_DEPS}"
 # @CODE
 
-if [[ ! ${_DISTUTILS_R1} ]]; then
+if [[ -z ${_DISTUTILS_R1_ECLASS} ]]; then
+_DISTUTILS_R1_ECLASS=1
 
 inherit multibuild multilib multiprocessing ninja-utils toolchain-funcs
 
@@ -179,14 +180,6 @@ else
 	inherit python-single-r1
 fi
 
-fi
-
-if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
-	EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-fi
-
-if [[ ! ${_DISTUTILS_R1} ]]; then
-
 _distutils_set_globals() {
 	local rdep bdep
 	if [[ ${DISTUTILS_USE_PEP517} ]]; then
@@ -2107,5 +2100,8 @@ distutils-r1_src_install() {
 	return ${ret}
 }
 
-_DISTUTILS_R1=1
+fi
+
+if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
+	EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 fi

From d76c6f14d977a1f4a2a82f262f97aab8437e27b2 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:24:01 +0000
Subject: [PATCH 33/62] eclass/eapi8-dosym: Sync with Gentoo

It's from Gentoo commit 3dbeacb046899daf891f6c9f2ed8539c2e8855f9.
---
 .../third_party/portage-stable/eclass/eapi8-dosym.eclass  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/eapi8-dosym.eclass b/sdk_container/src/third_party/portage-stable/eclass/eapi8-dosym.eclass
index 52f0ffe3e6..4e3977ef54 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/eapi8-dosym.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/eapi8-dosym.eclass
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: eapi8-dosym.eclass
@@ -6,7 +6,7 @@
 # PMS team <pms@gentoo.org>
 # @AUTHOR:
 # Ulrich Müller <ulm@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Testing implementation of EAPI 8 dosym -r option
 # @DESCRIPTION:
 # A stand-alone implementation of the dosym command aimed for EAPI 8.
@@ -17,8 +17,8 @@
 # https://bugs.gentoo.org/708360
 
 case ${EAPI} in
-	5|6|7) ;;
-	*) die "${ECLASS}: EAPI=${EAPI:-0} not supported" ;;
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 # @FUNCTION: _dosym8_canonicalize

From 52344a97d719ba5de62279a24b45251d5e5a34a1 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:24:26 +0000
Subject: [PATCH 34/62] eclass/fcaps: Sync with Gentoo

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

diff --git a/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass b/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass
index 349e72a63a..477e1e954a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/fcaps.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: fcaps.eclass
@@ -191,6 +191,6 @@ fcaps_pkg_postinst() {
 	done
 }
 
-EXPORT_FUNCTIONS pkg_postinst
-
 fi
+
+EXPORT_FUNCTIONS pkg_postinst

From de985a56969ecd3a2ecb7c4598e7bbeca6cb1efb Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:24:27 +0000
Subject: [PATCH 35/62] eclass/git-r3: Sync with Gentoo

It's from Gentoo commit 0dbbdfc6c6485614f2f84914dec2326cdb2a08e9.
---
 .../portage-stable/eclass/git-r3.eclass       | 93 +++++++++----------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/git-r3.eclass b/sdk_container/src/third_party/portage-stable/eclass/git-r3.eclass
index bdb28565e2..5c7dc29627 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/git-r3.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/git-r3.eclass
@@ -1,27 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: git-r3.eclass
 # @MAINTAINER:
 # Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Eclass for fetching and unpacking git repositories.
 # @DESCRIPTION:
 # Third generation eclass for easing maintenance of live ebuilds using
 # git as remote repository.
 
-case ${EAPI:-0} in
-	5|6|7|8) ;;
+case ${EAPI} in
+	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_unpack
-
-if [[ ! ${_GIT_R3} ]]; then
+if [[ -z ${_GIT_R3_ECLASS} ]]; then
+_GIT_R3_ECLASS=1
 
 PROPERTIES+=" live"
 
-if [[ ${EAPI} != [56] ]]; then
+if [[ ${EAPI} != 6 ]]; then
 	BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
 else
 	DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
@@ -559,49 +558,46 @@ git-r3_fetch() {
 	local commit_id=${2:-${EGIT_COMMIT}}
 	local commit_date=${4:-${EGIT_COMMIT_DATE}}
 
-	# support new override API for EAPI 6+
-	if [[ ${EAPI} != 5 ]]; then
-		# get the name and do some more processing:
-		# 1) kill .git suffix,
-		# 2) underscore (remaining) non-variable characters,
-		# 3) add preceding underscore if it starts with a digit,
-		# 4) uppercase.
-		local override_name=${GIT_DIR##*/}
-		override_name=${override_name%.git}
-		override_name=${override_name//[^a-zA-Z0-9_]/_}
-		override_name=${override_name^^}
+	# get the name and do some more processing:
+	# 1) kill .git suffix,
+	# 2) underscore (remaining) non-variable characters,
+	# 3) add preceding underscore if it starts with a digit,
+	# 4) uppercase.
+	local override_name=${GIT_DIR##*/}
+	override_name=${override_name%.git}
+	override_name=${override_name//[^a-zA-Z0-9_]/_}
+	override_name=${override_name^^}
 
-		local varmap=(
-			REPO:repos
-			BRANCH:branch_name
-			COMMIT:commit_id
-			COMMIT_DATE:commit_date
-		)
+	local varmap=(
+		REPO:repos
+		BRANCH:branch_name
+		COMMIT:commit_id
+		COMMIT_DATE:commit_date
+	)
 
-		local localvar livevar live_warn= override_vars=()
-		for localvar in "${varmap[@]}"; do
-			livevar=EGIT_OVERRIDE_${localvar%:*}_${override_name}
-			localvar=${localvar#*:}
-			override_vars+=( "${livevar}" )
+	local localvar livevar live_warn= override_vars=()
+	for localvar in "${varmap[@]}"; do
+		livevar=EGIT_OVERRIDE_${localvar%:*}_${override_name}
+		localvar=${localvar#*:}
+		override_vars+=( "${livevar}" )
 
-			if [[ -n ${!livevar} ]]; then
-				[[ ${localvar} == repos ]] && repos=()
-				live_warn=1
-				ewarn "Using ${livevar}=${!livevar}"
-				declare "${localvar}=${!livevar}"
-			fi
-		done
-
-		if [[ ${live_warn} ]]; then
-			ewarn "No support will be provided."
-		else
-			einfo "To override fetched repository properties, use:"
-			local x
-			for x in "${override_vars[@]}"; do
-				einfo "  ${x}"
-			done
-			einfo
+		if [[ -n ${!livevar} ]]; then
+			[[ ${localvar} == repos ]] && repos=()
+			live_warn=1
+			ewarn "Using ${livevar}=${!livevar}"
+			declare "${localvar}=${!livevar}"
 		fi
+	done
+
+	if [[ ${live_warn} ]]; then
+		ewarn "No support will be provided."
+	else
+		einfo "To override fetched repository properties, use:"
+		local x
+		for x in "${override_vars[@]}"; do
+			einfo "  ${x}"
+		done
+		einfo
 	fi
 
 	# set final variables after applying overrides
@@ -1079,5 +1075,6 @@ git-r3_pkg_needrebuild() {
 # 'export' locally until this gets into EAPI
 pkg_needrebuild() { git-r3_pkg_needrebuild; }
 
-_GIT_R3=1
 fi
+
+EXPORT_FUNCTIONS src_unpack

From 24da7a9e51a312311a6c9c0e96df618117c4caf2 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:24:36 +0000
Subject: [PATCH 36/62] eclass/libtool: Sync with Gentoo

It's from Gentoo commit ef47037c0df3bd254d6fe1601c34d24316762fa3.
---
 .../src/third_party/portage-stable/eclass/libtool.eclass  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/libtool.eclass b/sdk_container/src/third_party/portage-stable/eclass/libtool.eclass
index a38f415882..9797b22aab 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/libtool.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/libtool.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: libtool.eclass
@@ -17,10 +17,10 @@
 if [[ -z ${_LIBTOOL_ECLASS} ]]; then
 _LIBTOOL_ECLASS=1
 
-case ${EAPI:-0} in
-	5|6) DEPEND=">=app-portage/elt-patches-20170815" ;;
+case ${EAPI} in
+	6) DEPEND=">=app-portage/elt-patches-20170815" ;;
 	7|8) BDEPEND=">=app-portage/elt-patches-20170815" ;;
-	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 inherit toolchain-funcs

From afad7f489a62958af8c03fa8a1b209e2d4c724a9 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:24:36 +0000
Subject: [PATCH 37/62] eclass/linux-info: Sync with Gentoo

It's from Gentoo commit 8435a16eb3e375dfe0a37f076eb6a1ebfed0a55b.
---
 .../portage-stable/eclass/linux-info.eclass   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/linux-info.eclass b/sdk_container/src/third_party/portage-stable/eclass/linux-info.eclass
index a65d0c441b..ce04a0dc66 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/linux-info.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/linux-info.eclass
@@ -1,9 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: linux-info.eclass
 # @MAINTAINER:
 # kernel@gentoo.org
+# @SUPPORTED_EAPIS: 6 7 8
 # @AUTHOR:
 # Original author: John Mylchreest <johnm@gentoo.org>
 # @BLURB: eclass used for accessing kernel related information
@@ -26,6 +27,14 @@
 # get_version
 # get_running_version
 
+case ${EAPI} in
+	6|7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ -z ${_LINUX_INFO_ECLASS} ]]; then
+_LINUX_INFO_ECLASS=1
+
 # A Couple of env vars are available to effect usage of this eclass
 # These are as follows:
 
@@ -151,9 +160,7 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}"
 
 # And to ensure all the weirdness with crosscompile
 inherit toolchain-funcs
-[[ ${EAPI:-0} == [0123456] ]] && inherit eapi7-ver
-
-EXPORT_FUNCTIONS pkg_setup
+[[ ${EAPI} == 6 ]] && inherit eapi7-ver
 
 # bug #75034
 case ${ARCH} in
@@ -231,7 +238,6 @@ getfilevar() {
 		# We use nonfatal because we want the caller to take care of things #373151
 		# Pass need-config= to make to avoid config check in kernel Makefile.
 		# Pass dot-config=0 to avoid the config check in kernels prior to 5.4.
-		[[ ${EAPI:-0} == [0123] ]] && nonfatal() { "$@"; }
 		echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \
 			nonfatal emake -C "${basedname}" --no-print-directory M="${T}" \
 			dot-config=0 need-config= need-compiler= \
@@ -1009,3 +1015,7 @@ kernel_get_makefile() {
 	[[ -s ${KV_DIR}/Makefile ]] && KERNEL_MAKEFILE="${KV_DIR}/Makefile" && return
 
 }
+
+fi
+
+EXPORT_FUNCTIONS pkg_setup

From 3e9b4d2709011178806f603314ad553a12c8bc4c Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:24:40 +0000
Subject: [PATCH 38/62] eclass/meson-multilib: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../third_party/portage-stable/eclass/meson-multilib.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/meson-multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/meson-multilib.eclass
index 49c6441872..0c069af119 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/meson-multilib.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/meson-multilib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: meson-multilib.eclass
@@ -31,8 +31,6 @@ _MESON_MULTILIB_ECLASS=1
 
 inherit meson multilib-minimal
 
-EXPORT_FUNCTIONS src_configure src_compile src_test src_install
-
 # @FUNCTION: meson_native_use_bool
 # @USAGE: <USE flag> [option name]
 # @DESCRIPTION:
@@ -130,3 +128,5 @@ multilib_src_install() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_configure src_compile src_test src_install

From 6e10bbc495322998dcbb78953c53ff33d54bd8cc Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:24:40 +0000
Subject: [PATCH 39/62] eclass/meson: Sync with Gentoo

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

diff --git a/sdk_container/src/third_party/portage-stable/eclass/meson.eclass b/sdk_container/src/third_party/portage-stable/eclass/meson.eclass
index a79019ccfd..881e247000 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/meson.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/meson.eclass
@@ -1,4 +1,4 @@
-# Copyright 2017-2022 Gentoo Authors
+# Copyright 2017-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: meson.eclass
@@ -44,8 +44,6 @@ _MESON_ECLASS=1
 
 inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs
 
-EXPORT_FUNCTIONS src_configure src_compile src_test src_install
-
 BDEPEND=">=dev-util/meson-0.62.2
 	${NINJA_DEPEND}
 	dev-util/meson-format-array
@@ -449,3 +447,5 @@ meson_src_install() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_configure src_compile src_test src_install

From 3df94e84468f0e311396ca396cba1e20329458cd Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:24:52 +0000
Subject: [PATCH 40/62] eclass/optfeature: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../src/third_party/portage-stable/eclass/optfeature.eclass   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/optfeature.eclass b/sdk_container/src/third_party/portage-stable/eclass/optfeature.eclass
index b44fc1b852..c8b4911320 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/optfeature.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/optfeature.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: optfeature.eclass
@@ -9,7 +9,7 @@
 
 case ${EAPI} in
 	7|8) ;;
-	*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
 if [[ -z ${_OPTFEATURE_ECLASS} ]]; then

From 22e857267bc2cc4c3f890164b94b2657d4443b6d Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:09 +0000
Subject: [PATCH 41/62] eclass/python-r1: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../src/third_party/portage-stable/eclass/python-r1.eclass    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/python-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/python-r1.eclass
index 657922fe64..4758defe64 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/python-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/python-r1.eclass
@@ -35,7 +35,7 @@ case ${EAPI} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_PYTHON_R1_ECLASS} ]]; then
+if [[ -z ${_PYTHON_R1_ECLASS} ]]; then
 _PYTHON_R1_ECLASS=1
 
 if [[ ${_PYTHON_SINGLE_R1_ECLASS} ]]; then
@@ -616,7 +616,7 @@ _python_multibuild_wrapper() {
 python_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	if [[ ${_DISTUTILS_R1} ]]; then
+	if [[ ${_DISTUTILS_R1_ECLASS} ]]; then
 		if has "${EBUILD_PHASE}" prepare configure compile test install &&
 			[[ ! ${_DISTUTILS_CALLING_FOREACH_IMPL} &&
 				! ${_DISTUTILS_FOREACH_IMPL_WARNED} ]]

From e21b300e0970f90ccd76554c6f575fa992812d5f Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:14 +0000
Subject: [PATCH 42/62] eclass/savedconfig: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../portage-stable/eclass/savedconfig.eclass    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/savedconfig.eclass b/sdk_container/src/third_party/portage-stable/eclass/savedconfig.eclass
index 4681fd2532..cc57485430 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/savedconfig.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/savedconfig.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: savedconfig.eclass
@@ -30,15 +30,18 @@
 # 4. Emerge the package with just USE=savedconfig to get the custom
 # build.
 
+case ${EAPI} in
+	6|7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ -z ${_SAVEDCONFIG_ECLASS} ]]; then
+_SAVEDCONFIG_ECLASS=1
+
 inherit portability
 
 IUSE="savedconfig"
 
-case ${EAPI} in
-	6|7|8) ;;
-	*) die "EAPI=${EAPI:-0} is not supported" ;;
-esac
-
 # @FUNCTION: save_config
 # @USAGE: <config files to save>
 # @DESCRIPTION:
@@ -152,4 +155,6 @@ savedconfig_pkg_postinst() {
 	fi
 }
 
+fi
+
 EXPORT_FUNCTIONS pkg_postinst

From 5da03e91c3870b1a20ef640a039c0b0f70862522 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:25 +0000
Subject: [PATCH 43/62] eclass/toolchain: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../portage-stable/eclass/toolchain.eclass            | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
index 06c044fd1d..2d78012590 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
@@ -12,17 +12,17 @@
 # instead.
 
 case ${EAPI} in
-	7) inherit eutils ;;
-	8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_TOOLCHAIN_ECLASS} ]]; then
+if [[ -z ${_TOOLCHAIN_ECLASS} ]]; then
 _TOOLCHAIN_ECLASS=1
 
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/"
 
+[[ ${EAPI} == 7 ]] && inherit eutils
 inherit edo flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix
 
 tc_is_live() {
@@ -2828,9 +2828,6 @@ toolchain_death_notice() {
 
 fi
 
-EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \
-	src_compile src_test src_install pkg_postinst pkg_postrm
-
 # Note [implicitly enabled flags]
 # -------------------------------
 # Usually configure-based packages handle explicit feature requests
@@ -2848,3 +2845,5 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \
 # Thus safer way to enable/disable the feature is to rely on implicit
 # enabled-by-default state:
 #    econf $(usex foo '' --disable-foo)
+
+EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm

From a23b80f3db6e5b32dca51eb7b8df24df296ef76d Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:32 +0000
Subject: [PATCH 44/62] eclass/verify-sig: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../third_party/portage-stable/eclass/verify-sig.eclass   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass b/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass
index f67a3b10a0..5e757cdd60 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass
@@ -45,9 +45,8 @@ case ${EAPI} in
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_unpack
-
-if [[ ! ${_VERIFY_SIG_ECLASS} ]]; then
+if [[ -z ${_VERIFY_SIG_ECLASS} ]]; then
+_VERIFY_SIG_ECLASS=1
 
 IUSE="verify-sig"
 
@@ -390,5 +389,6 @@ verify-sig_src_unpack() {
 	default_src_unpack
 }
 
-_VERIFY_SIG_ECLASS=1
 fi
+
+EXPORT_FUNCTIONS src_unpack

From 1e28faef280382faccaeb55025004d7df6da1852 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:35 +0000
Subject: [PATCH 45/62] eclass/vim-plugin: Sync with Gentoo

It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.
---
 .../portage-stable/eclass/vim-plugin.eclass   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/vim-plugin.eclass b/sdk_container/src/third_party/portage-stable/eclass/vim-plugin.eclass
index edf1c94d31..81e1e54f63 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/vim-plugin.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vim-plugin.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vim-plugin.eclass
@@ -13,15 +13,17 @@
 # documentation, for which we make a special case via vim-doc.eclass.
 
 case ${EAPI} in
-	6|7) ;;
-	8) _DEFINE_VIM_PLUGIN_SRC_PREPARE=true ;;
+	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_VIM_PLUGIN_ECLASS} ]]; then
+if [[ -z ${_VIM_PLUGIN_ECLASS} ]]; then
+_VIM_PLUGIN_ECLASS=1
 
 inherit vim-doc
 
+[[ ${EAPI} != [67] ]] && _DEFINE_VIM_PLUGIN_SRC_PREPARE=true
+
 # @ECLASS_VARIABLE: VIM_PLUGIN_VIM_VERSION
 # @DESCRIPTION:
 # Minimum Vim version the plugin supports.
@@ -230,13 +232,9 @@ display_vim_plugin_help() {
 	fi
 }
 
-_VIM_PLUGIN_ECLASS=1
 fi
 
-EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
-
 # src_prepare is only exported in EAPI >= 8
-case ${EAPI} in
-	6|7) ;;
-	*) EXPORT_FUNCTIONS src_prepare ;;
-esac
+[[ ${_DEFINE_VIM_PLUGIN_SRC_PREPARE} ]] && EXPORT_FUNCTIONS src_prepare
+
+EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm

From 6842f4dc2b79e7dae888364cf8e3f16d3360c150 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:35 +0000
Subject: [PATCH 46/62] eclass/virtualx: Sync with Gentoo

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

diff --git a/sdk_container/src/third_party/portage-stable/eclass/virtualx.eclass b/sdk_container/src/third_party/portage-stable/eclass/virtualx.eclass
index e04834d39b..2513f4e162 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/virtualx.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/virtualx.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: virtualx.eclass
@@ -11,10 +11,10 @@
 
 case ${EAPI} in
 	6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} is not supported." ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ ! ${_VIRTUALX_ECLASS} ]]; then
+if [[ -z ${_VIRTUALX_ECLASS} ]]; then
 _VIRTUALX_ECLASS=1
 
 # @ECLASS_VARIABLE: VIRTUALX_REQUIRED

From edc81da30552894bc80fbd840a39472eff04f575 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:43 +0000
Subject: [PATCH 47/62] net-dns/bind-tools: Sync with Gentoo

It's from Gentoo commit 0ff8693edb3ea593f16db544f314ab7f4cfa3638.
---
 .../net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
index 7ed4312a32..a0e03ab006 100644
--- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps doc gssapi idn libedit readline test xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
 RESTRICT="!test? ( test )"

From d8a3d42560e89b400d2ae2f266b807a64df691d7 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:45 +0000
Subject: [PATCH 48/62] net-libs/libpcap: Sync with Gentoo

It's from Gentoo commit 2ca0b4b88d683c8b34d61337eaf5c0a020111c4f.
---
 .../portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild
index 0191ce8d4d..21a46673c4 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD"

From 08c9c116cb41cf602c68f2b5e964bd19e99e3bab Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:48 +0000
Subject: [PATCH 49/62] net-libs/nghttp2: Sync with Gentoo

It's from Gentoo commit 7b6a8a611e16d50a03c4aa7314e06e50c3b33367.
---
 .../portage-stable/net-libs/nghttp2/Manifest  |  1 +
 .../net-libs/nghttp2/nghttp2-1.52.0.ebuild    | 58 +++++++++++++++++++
 .../net-libs/nghttp2/nghttp2-9999.ebuild      | 58 +++++++------------
 3 files changed, 80 insertions(+), 37 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.52.0.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest
index bcdf39180b..d5800e9274 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest
+++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest
@@ -1,3 +1,4 @@
 DIST nghttp2-1.48.0-pthread.patch 24917 BLAKE2B 22013d89685be603094aa82f69da8741d4c0d76aea8a01de1322c19cef053964fdf0bec937650382f85607ac74466d4d052e6d40217101bc1e40326ad0ddc003 SHA512 bdebc50f13584826d6693aae201db9be63fcadcb8a68af188e94f008e005a2fd6aa6b91b31de2f07f84b93d981a003c8752c5fb4d47502f768bd94e21635627f
 DIST nghttp2-1.51.0-pthread.patch 24623 BLAKE2B 55c63b4851788e4e18df1f7881fc370bf901c2df2249243e18e2a49f2142454438b41ecd941ed888ca065cdb037bd52624231a97a06eae4f97ebbc24cd890a46 SHA512 eaa85373f977bd4383d11d6077d69c80cf254ec49f4686a0140765a84806f6691f435fd5d558d4642cbf4a364f274c16b50d3f63c4e9507b6dc3b1317498e15a
 DIST nghttp2-1.51.0.tar.xz 4115988 BLAKE2B ca3c5fb439b60f67ce5447c957397c16c7659432d3a3b25076b88142318675eb2af9f039a86ce88df8af3bd0167d98f14cdeb8dad2d01eda1378015acefa354e SHA512 0212680e57a15f9afca3b5226429edebd2fe8a52117480007d4472cd0c1bd3aa4d9f21269c637a11efd0f2146a3ee16c3c07ab35d9fb3d4566235d3a14268eeb
+DIST nghttp2-1.52.0.tar.xz 1491732 BLAKE2B a77ff3e1f901768daf7e681cad06bf3b9ea44876dba76e06c2aaec8637196f27ee7213e3ef52da53b995f68a2a617f64947b4392f57140310bdc5a1d994ad1b2 SHA512 3af1ce13270f7afc8652bd3de71200d9632204617fe04d2be7156d60eeb1a5cc415573677791a399ae03577e8e3256939b1b05d27dbd98dee504d09ec5325d56
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.52.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.52.0.ebuild
new file mode 100644
index 0000000000..eff7b0dad9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.52.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/1.14" # 1.<SONAME>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
+
+RESTRICT="!test? ( test )"
+
+SSL_DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	hpack-tools? ( >=dev-libs/jansson-2.5:= )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	systemd? ( >=sys-apps/systemd-209 )
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_FAILMALLOC=OFF
+		-DENABLE_WERROR=OFF
+		-DENABLE_THREADS=ON
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools)
+		$(cmake_use_find_package hpack-tools Jansson)
+		-DWITH_JEMALLOC=$(multilib_native_usex jemalloc)
+		-DENABLE_STATIC_LIB=$(usex static-libs)
+		$(cmake_use_find_package systemd Systemd)
+		$(cmake_use_find_package test CUnit)
+		-DENABLE_APP=$(multilib_native_usex utils)
+		-DWITH_LIBXML2=$(multilib_native_usex xml)
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	eninja check
+}
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild
index b24cbd6c83..fee50b41ad 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: Add python support.
-
 EAPI=8
 
-inherit autotools git-r3 multilib-minimal
+inherit cmake-multilib git-r3
 
 DESCRIPTION="HTTP/2 C Library"
 HOMEPAGE="https://nghttp2.org/"
 EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
 
 LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
+SLOT="0/1.14" # 1.<SONAME>
 KEYWORDS=""
-IUSE="cxx debug hpack-tools jemalloc static-libs systemd test utils xml"
+IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml"
 
 RESTRICT="!test? ( test )"
 
@@ -22,10 +20,6 @@ SSL_DEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
 "
 RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP}]
-	)
 	hpack-tools? ( >=dev-libs/jansson-2.5:= )
 	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
 	utils? (
@@ -34,41 +28,31 @@ RDEPEND="
 		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
 		net-dns/c-ares:=[${MULTILIB_USEDEP}]
 	)
-	systemd? ( sys-apps/systemd )
+	systemd? ( >=sys-apps/systemd-209 )
 	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
 BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--enable-threads
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(multilib_native_use_with hpack-tools jansson)
-		$(multilib_native_use_with jemalloc)
-		$(use_enable static-libs static)
-		$(multilib_native_use_with systemd)
-		$(use_with test cunit)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with xml libxml2)
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_FAILMALLOC=OFF
+		-DENABLE_WERROR=OFF
+		-DENABLE_THREADS=ON
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_HPACK_TOOLS=$(multilib_native_usex hpack-tools)
+		$(cmake_use_find_package hpack-tools Jansson)
+		-DWITH_JEMALLOC=$(multilib_native_usex jemalloc)
+		-DENABLE_STATIC_LIB=$(usex static-libs)
+		$(cmake_use_find_package systemd Systemd)
+		$(cmake_use_find_package test CUnit)
+		-DENABLE_APP=$(multilib_native_usex utils)
+		-DWITH_LIBXML2=$(multilib_native_usex xml)
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	cmake_src_configure
 }
 
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -type f -name '*.la' -delete || die
-	fi
+multilib_src_test() {
+	eninja check
 }

From ccaaba8ceebc067c1d8b2e9281e4aa363149877d Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:52 +0000
Subject: [PATCH 50/62] net-misc/curl: Sync with Gentoo

It's from Gentoo commit c6b3f26466c6770b5f0db1218e014f9c8dbb3444.
---
 ...rl-7.88.1.ebuild => curl-7.88.1-r2.ebuild} |   5 +
 .../files/curl-7.88.1-onion-resolution.patch  | 132 ++++++++++++++++++
 2 files changed, 137 insertions(+)
 rename sdk_container/src/third_party/portage-stable/net-misc/curl/{curl-7.88.1.ebuild => curl-7.88.1-r2.ebuild} (98%)
 create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.88.1-onion-resolution.patch

diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.88.1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.88.1-r2.ebuild
similarity index 98%
rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.88.1.ebuild
rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.88.1-r2.ebuild
index 74340e55cd..d1a2c5b221 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.88.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.88.1-r2.ebuild
@@ -93,6 +93,11 @@ MULTILIB_CHOST_TOOLS=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+
+	"${FILESDIR}"/${P}-header-dump-segfault.patch
+	"${FILESDIR}"/${P}-onion-resolution.patch
+	"${FILESDIR}"/${P}-pipewait.patch
+	"${FILESDIR}"/${P}-silent-parallel.patch
 )
 
 src_prepare() {
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.88.1-onion-resolution.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.88.1-onion-resolution.patch
new file mode 100644
index 0000000000..0551988465
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.88.1-onion-resolution.patch
@@ -0,0 +1,132 @@
+https://github.com/curl/curl/pull/10705
+From: Matt Jolly <Matt.Jolly@footclan.ninja>
+Date: Wed, 8 Mar 2023 02:16:45 +1100
+Subject: [PATCH] Refuse to resolve the .onion TLD.
+
+RFC 7686 states that:
+
+> Applications that do not implement the Tor
+> protocol SHOULD generate an error upon the use of .onion and
+> SHOULD NOT perform a DNS lookup.
+
+Let's do that.
+
+See curl/curl#543
+https://www.rfc-editor.org/rfc/rfc7686#section-2
+--- a/lib/hostip.c
++++ b/lib/hostip.c
+@@ -652,6 +652,14 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
+   CURLcode result;
+   enum resolve_t rc = CURLRESOLV_ERROR; /* default to failure */
+   struct connectdata *conn = data->conn;
++  /* We should intentionally error and not resolve .onion TLDs */
++  size_t hostname_len = strlen(hostname);
++  if(hostname_len >= 7 &&
++  (curl_strequal(&hostname[hostname_len-6], ".onion") ||
++  curl_strequal(&hostname[hostname_len-7], ".onion."))) {
++    failf(data, "Not resolving .onion address (RFC 7686)");
++    return CURLRESOLV_ERROR;
++  }
+   *entry = NULL;
+ #ifndef CURL_DISABLE_DOH
+   conn->bits.doh = FALSE; /* default is not */
+--- a/tests/data/Makefile.inc
++++ b/tests/data/Makefile.inc
+@@ -186,8 +186,8 @@ test1432 test1433 test1434 test1435 test1436 test1437 test1438 test1439 \
+ test1440 test1441 test1442 test1443 test1444 test1445 test1446 test1447 \
+ test1448 test1449 test1450 test1451 test1452 test1453 test1454 test1455 \
+ test1456 test1457 test1458 test1459 test1460 test1461 test1462 test1463 \
+-test1464 test1465 test1466 test1467 test1468 test1469 \
+-\
++test1464 test1465 test1466 test1467 test1468 test1469 test1471 \
++test1472 \
+ test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \
+ test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \
+ test1516 test1517 test1518 test1519 test1520 test1521 test1522 test1523 \
+--- /dev/null
++++ b/tests/data/test1471
+@@ -0,0 +1,39 @@
++<testcase>
++<info>
++<keywords>
++Onion
++Tor
++FAILURE
++</keywords>
++</info>
++#
++# Server-side
++<reply>
++</reply>
++
++#
++# Client-side
++<client>
++<server>
++none
++</server>
++<name>
++Fail to resolve .onion TLD
++</name>
++<command>
++red.onion
++</command>
++</client>
++
++#
++# Verify data after the test has been "shot"
++<verify>
++# Couldn't resolve host name
++<errorcode>
++6
++</errorcode>
++<stderr mode="text">
++curl: (6) Not resolving .onion address (RFC 7686)
++</stderr>
++</verify>
++</testcase>
+--- /dev/null
++++ b/tests/data/test1472
+@@ -0,0 +1,39 @@
++<testcase>
++<info>
++<keywords>
++Onion
++Tor
++FAILURE
++</keywords>
++</info>
++#
++# Server-side
++<reply>
++</reply>
++
++#
++# Client-side
++<client>
++<server>
++none
++</server>
++<name>
++Fail to resolve .onion. TLD
++</name>
++<command>
++tasty.onion.
++</command>
++</client>
++
++#
++# Verify data after the test has been "shot"
++<verify>
++# Couldn't resolve host name
++<errorcode>
++6
++</errorcode>
++<stderr mode="text">
++curl: (6) Not resolving .onion address (RFC 7686)
++</stderr>
++</verify>
++</testcase>
+-- 
+2.39.2
+

From aa5d61af4ec3e73e01087b53276a8e980af676de Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:55 +0000
Subject: [PATCH 51/62] net-misc/wget: Sync with Gentoo

It's from Gentoo commit 6efa842ac4114bb18af18474883260cba12722ad.
---
 .../portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild
index f96719bf65..2d81389c69 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild
@@ -54,7 +54,7 @@ BDEPEND="
 		dev-perl/HTTP-Message
 		dev-perl/IO-Socket-SSL
 	)
-	verify-sig? ( sec-keys/openpgp-keys-wget )
+	verify-sig? ( >=sec-keys/openpgp-keys-wget-20230313 )
 "
 
 DOCS=( AUTHORS MAILING-LIST NEWS README )

From 3870f84718fe5c4333b632758b90037e599dee13 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:25:55 +0000
Subject: [PATCH 52/62] net-misc/whois: Sync with Gentoo

It's from Gentoo commit 98488a2aeaf46d03ed4b734262e331585039288f.
---
 .../portage-stable/net-misc/whois/Manifest    |  1 +
 .../net-misc/whois/whois-5.5.16.ebuild        | 81 +++++++++++++++++++
 .../net-misc/whois/whois-9999.ebuild          |  4 +-
 3 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.16.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest
index 8b41b491da..659286d351 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest
+++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/Manifest
@@ -1,2 +1,3 @@
 DIST whois_5.5.14.tar.xz 87480 BLAKE2B 868c9dc968581535ee2b56a6293f634e2c8dc6c00703a45d4ca4f0ce6769786ee4921bd66f3a470b2a7f31808db2971b284c23b76b608bff1edbb7bbe37f892a SHA512 f190d488d7bd68717c0a83ca85709fad09c33b619c46d7e0dd12e79621fdba56b9d43480c25ef3c9df2f6ade0ee72d692bfc5d0bd96839ef92194004313d1cc6
 DIST whois_5.5.15.tar.xz 89960 BLAKE2B 50e0114b3b6c3ad143e7a1aed62e492e780a061d7151de2b0d48cc4b55b889958abaa5fc069c8c36075936fb4bf4ad3d9e15ff799c2c0e2e33a1aa31c4136272 SHA512 e173927fd3428d27bc8ab34b1a66b82d6a2cfc107245755868bdd33cb7eb1b8159e87774c3a751d9694e65b3d870b9904dc9a3c657dca385950c8a19be1fa61c
+DIST whois_5.5.16.tar.xz 90516 BLAKE2B c3d34dd392c2d7968c5c9b7bcce07d144dc3d7dcea15f1578de2114dc34325a9d01754d922b7a83edd799101c816c254b7a79e78feeb8a115c40f41ac1e01f4c SHA512 302a88edad11fee38b4d16b78af38701938d8d875e5ef22b9f40147717f9edda5abc5b791638bb2a3534214938a598faeeae5001275e751d480f95761b6bff14
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.16.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.16.ebuild
new file mode 100644
index 0000000000..7d0d51aff2
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.16.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_P=${P/-/_}
+DESCRIPTION="Improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}"/${PN}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls xcrypt"
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	xcrypt? ( >=sys-libs/libxcrypt-4.1:= )
+	!xcrypt? ( virtual/libcrypt:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
+)
+
+src_prepare() {
+	default
+
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	use xcrypt && export HAVE_XCRYPT=1
+
+	tc-export CC
+
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+}
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild
index cd95191e70..7d0d51aff2 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}
+	#S="${WORKDIR}"/${PN}
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi

From d16d129a29ae813946d1032aae40c525366f52b7 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:26:04 +0000
Subject: [PATCH 53/62] profiles: Sync with Gentoo

It's from Gentoo commit 178b21ba0df784d9aa045a2c1e113974928a2e5a.
---
 .../profiles/arch/amd64/x32/package.mask      |   1 +
 .../profiles/arch/hppa/package.use.mask       |   4 +
 .../profiles/arch/ia64/package.use.mask       |   4 +
 .../profiles/arch/loong/package.use.mask      |   4 +-
 .../profiles/arch/powerpc/package.use.mask    |   4 +
 .../arch/powerpc/ppc32/package.use.mask       |   8 -
 .../arch/powerpc/ppc64/64le/package.mask      |   1 +
 .../profiles/arch/powerpc/ppc64/package.mask  |   1 +
 .../profiles/arch/riscv/package.use.mask      |   5 -
 .../profiles/arch/s390/package.use.mask       |   4 +
 .../profiles/arch/sparc/package.use.mask      |   6 -
 .../profiles/arch/x86/package.use.force       |   6 +-
 .../profiles/base/package.use.mask            |  33 +-
 .../mips/17.0/{ => mipsel/n64}/musl/eapi      |   0
 .../n64 => mipsel/n64/musl}/make.defaults     |   5 +-
 .../linux/mips/17.0/mipsel/n64/musl/parent    |   3 +
 .../{musl/mipsel => mipsel/o32/musl}/eapi     |   0
 .../mipsel => mipsel/o32/musl}/make.defaults  |   6 +-
 .../linux/mips/17.0/mipsel/o32/musl/parent    |   3 +
 .../linux/mips/17.0/musl/mipsel/n64/parent    |   2 -
 .../mips/17.0/musl/mipsel/o32/make.defaults   |   6 -
 .../linux/mips/17.0/musl/mipsel/o32/parent    |   2 -
 .../linux/mips/17.0/musl/mipsel/parent        |   2 -
 .../default/linux/mips/17.0/musl/n64/parent   |   2 -
 .../default/linux/mips/17.0/musl/o32/parent   |   2 -
 .../default/linux/mips/17.0/musl/parent       |   3 -
 .../17.0/{musl/mipsel/n64 => n64/musl}/eapi   |   0
 .../17.0/{musl/n64 => n64/musl}/make.defaults |   2 +-
 .../default/linux/mips/17.0/n64/musl/parent   |   3 +
 .../17.0/{musl/mipsel/o32 => o32/musl}/eapi   |   0
 .../17.0/{musl/o32 => o32/musl}/make.defaults |   2 +-
 .../default/linux/mips/17.0/o32/musl/parent   |   3 +
 .../musl/n64 => 23.0/mipsel/n64/musl}/eapi    |   0
 .../n64 => mipsel/n64/musl}/make.defaults     |   5 +-
 .../linux/mips/23.0/mipsel/n64/musl/parent    |   3 +
 .../musl/o32 => 23.0/mipsel/o32/musl}/eapi    |   0
 .../mipsel => mipsel/o32/musl}/make.defaults  |   6 +-
 .../linux/mips/23.0/mipsel/o32/musl/parent    |   3 +
 .../linux/mips/23.0/musl/mipsel/n64/eapi      |   1 -
 .../linux/mips/23.0/musl/mipsel/n64/parent    |   2 -
 .../linux/mips/23.0/musl/mipsel/o32/eapi      |   1 -
 .../mips/23.0/musl/mipsel/o32/make.defaults   |   6 -
 .../linux/mips/23.0/musl/mipsel/o32/parent    |   2 -
 .../linux/mips/23.0/musl/mipsel/parent        |   2 -
 .../default/linux/mips/23.0/musl/n64/eapi     |   1 -
 .../default/linux/mips/23.0/musl/n64/parent   |   2 -
 .../default/linux/mips/23.0/musl/o32/eapi     |   1 -
 .../default/linux/mips/23.0/musl/o32/parent   |   2 -
 .../default/linux/mips/23.0/musl/parent       |   3 -
 .../linux/mips/23.0/{ => n64}/musl/eapi       |   0
 .../23.0/{musl/n64 => n64/musl}/make.defaults |   2 +-
 .../default/linux/mips/23.0/n64/musl/parent   |   3 +
 .../mips/23.0/{musl/mipsel => o32/musl}/eapi  |   0
 .../23.0/{musl/o32 => o32/musl}/make.defaults |   2 +-
 .../default/linux/mips/23.0/o32/musl/parent   |   3 +
 .../profiles/features/wd40/package.use.mask   |   1 +
 .../portage-stable/profiles/package.mask      | 297 ++++++++----------
 .../portage-stable/profiles/profiles.desc     |   8 +-
 .../portage-stable/profiles/updates/1Q-2023   |   1 +
 59 files changed, 234 insertions(+), 250 deletions(-)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/{ => mipsel/n64}/musl/eapi (100%)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/{musl/mipsel/n64 => mipsel/n64/musl}/make.defaults (54%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/{musl/mipsel => mipsel/o32/musl}/eapi (100%)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/{musl/mipsel => mipsel/o32/musl}/make.defaults (57%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/n64/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/o32/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/parent
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/{musl/mipsel/n64 => n64/musl}/eapi (100%)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/{musl/n64 => n64/musl}/make.defaults (78%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/musl/parent
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/{musl/mipsel/o32 => o32/musl}/eapi (100%)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/{musl/o32 => o32/musl}/make.defaults (78%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/musl/parent
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/{17.0/musl/n64 => 23.0/mipsel/n64/musl}/eapi (100%)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/{musl/mipsel/n64 => mipsel/n64/musl}/make.defaults (54%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/{17.0/musl/o32 => 23.0/mipsel/o32/musl}/eapi (100%)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/{musl/mipsel => mipsel/o32/musl}/make.defaults (57%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/eapi
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/eapi
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/parent
 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/parent
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/{ => n64}/musl/eapi (100%)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/{musl/n64 => n64/musl}/make.defaults (78%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/n64/musl/parent
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/{musl/mipsel => o32/musl}/eapi (100%)
 rename sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/{musl/o32 => o32/musl}/make.defaults (78%)
 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/o32/musl/parent

diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask
index 5c271adccf..ba6dd002ce 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask
@@ -14,6 +14,7 @@ net-analyzer/gsad
 # Requires qtwebengine
 sci-electronics/eagle
 sci-geosciences/gpsbabel
+sci-geosciences/qgis
 sci-geosciences/viking
 
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-09-09)
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask
index eae0b1d0df..9fcb85c3f4 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Michał Górny <mgorny@gentoo.org> (2023-03-14)
+# Requires virtual/pandoc.
+dev-python/nbclassic doc
+
 # Hans de Graaff <graaff@gentoo.org> (2023-02-27)
 # Depends on virtual/rust
 dev-lang/ruby jit
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 78e6aa7442..2c53b53fd8 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
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2023-03-14)
+# Requires virtual/pandoc.
+dev-python/nbclassic doc
+
 # Sam James <sam@gentoo.org> (2022-12-26)
 # Unkeyworded dependencies
 dev-util/diffoscope opendocument pascal pdf R
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 721deb5a7e..4c7686c3bf 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
@@ -143,11 +143,9 @@ app-office/libreoffice clang
 # LLVM toolchain now partially usable on loong, mask the remaining pieces
 # pending test/bugfixes/porting.
 #
-# - sys-libs/libcxx: will work once https://reviews.llvm.org/D139297 lands
 # - sys-devel/lld: port is still under review
 dev-util/lldb test
-sys-devel/clang-common default-libcxx default-lld
-sys-devel/clang-runtime libcxx
+sys-devel/clang-common default-lld
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-11-18)
 # net-libs/webkit-gtk is not available on loong yet.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask
index f4e6d9210b..ebc5b4e0f9 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask
@@ -6,6 +6,10 @@
 dev-python/nbval doc
 dev-python/nbclassic doc
 
+# Bernd Waibel <waebbl-gentoo@posteo.net> (2023-02-23)
+# Mask openvdb, as it pulls in masked media-libs/openexr
+sci-libs/vtk openvdb
+
 # Sam James <sam@gentoo.org> (2022-11-19)
 # Drags in Rails (propshaft->rails)
 dev-ruby/actiontext test
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask
index db65690bc3..30c0907796 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask
@@ -195,18 +195,10 @@ net-analyzer/wireshark bcg729
 # Incomplete support, bug #605878.
 net-vpn/tor seccomp
 
-# Michał Górny <mgorny@gentoo.org> (2017-03-23)
-# Most of clang runtimes are not supported here
-sys-devel/clang-runtime openmp sanitize
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2016-12-13)
 # Dropping ppc from sci-libs/armadillo, bug 555896
 sci-libs/gdal armadillo
 
-# Michał Górny <mgorny@gentoo.org> (2016-11-18)
-# libomp does not support 32-bit PPC, #600148.
-sys-devel/clang-runtime openmp
-
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2016-08-01)
 # kde-frameworks/*:5 not keyworded.
 net-irc/kvirc kde
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask
index 1fd7b40d96..703c39a8fa 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -48,6 +48,7 @@
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-17)
 # works on ppc64le
 -app-containers/docker
+-app-containers/docker-buildx
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-22
 # criu works on ppc64le
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask
index 6b90376ee8..03686090b5 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask
@@ -52,6 +52,7 @@ sci-mathematics/geogebra-bin
 # does not work on big-endian ppc64
 # next releases remove that assumption and mask will be lifted
 app-containers/docker
+app-containers/docker-buildx
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-18)
 # openjfx:11 does not work on ppc64be
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask
index 52afa87c79..63b53b0ff2 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask
@@ -63,11 +63,6 @@ dev-libs/cyrus-sasl berkdb
 dev-python/QtPy pyside2 webengine
 dev-python/QtPy test
 
-# Jakov Smolić <jsmolic@gentoo.org> (2022-06-07)
-# riscv has no sanitizers unmasked for the time being, so
-# mask to prevent emerge from erroring out by default
-sys-devel/clang-runtime sanitize
-
 # Marek Szuba <marecki@gentoo.org> (2022-04-30)
 # net-wireless/sdrplay contains prebuilt binaries, currently available
 # upstream only for amd64/x86 and arm
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask
index 7a5c89d17b..ca0d8c3533 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2023-03-14)
+# Requires virtual/pandoc.
+dev-python/nbclassic doc
+
 # Florian Schmaus <flow@gentoo.org> (2022-11-23)
 # avoid larger deptree, bug #882593
 dev-python/bracex doc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask
index ae581f80df..ed39d11b93 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask
@@ -400,8 +400,6 @@ xfce-base/xfwm4 xpresent
 # Michał Górny <mgorny@gentoo.org> (2017-03-23)
 # Most of clang runtimes are not supported here
 sys-devel/clang-runtime openmp sanitize
-sys-libs/libcxx libunwind
-sys-libs/libcxxabi libunwind
 
 # Pacho Ramos <pacho@gentoo.org> (2017-02-04)
 # Missing keywords, bug #599572
@@ -420,10 +418,6 @@ dev-libs/hiredis test
 # DOSBox + OpenGLide is untested on this arch.
 games-emulation/dosbox glide
 
-# Michał Górny <mgorny@gentoo.org> (2016-11-18)
-# libomp does not support SPARC, #600148.
-sys-devel/clang-runtime openmp
-
 # Christian Ruppert <idl0r@gentoo.org> (2016-10-14)
 # dnstap USE masked due to missing keywords
 net-dns/bind dnstap
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.force
index ab771e1ef6..25906d7385 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2023-03-16)
+# Fails with -jit, #901463.
+>=dev-lang/spidermonkey-102.6.0 jit
+
 # Joonas Niilola <juippis@gentoo.org> (2022-05-19)
 # Bundled libvpx results in a failure, force the system-libvpx to be
 # used. bmo#1768145. Confirmed on firefox-91 and firefox-100.0.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask
index 6334b0fe23..021f765e12 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask
@@ -6,6 +6,13 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2023-03-15)
+# Signing key is expired on Savannah. The same key is renewed elsewhere
+# and the signature is valid, but it's easier to disable verify-sig here
+# for now as it's not a new release.  Recent Gemato got stricter with this
+# which is how it appears now. See bug #900895.
+~net-misc/wget-1.21.3 verify-sig
+
 # Matt Turner <mattst88@gentoo.org> (2023-03-03)
 # Depends on deprecated gnome-base/gconf and gtk+:2
 sys-power/apcupsd gnome
@@ -213,7 +220,7 @@ sys-libs/ncurses stack-realign
 
 # Michał Górny <mgorny@gentoo.org> (2022-05-25)
 # dev-python/sphinxcontrib-openapi is masked for removal.
-dev-python/jupyter_server doc
+dev-python/jupyter-server doc
 
 # Joonas Niilola <juippis@gentoo.org> (2022-05-03)
 # system-python-libs is HIGHLY EXPERIMENTAL according to upstream, and
@@ -424,15 +431,21 @@ x11-libs/colord-gtk doc
 # Mask the experimental targets in release ebuilds.
 # Note to self: remember to move still-applicable masks to the newer
 # version when master is bumped.
-<dev-ml/llvm-ocaml-16 llvm_targets_ARC llvm_targets_CSKY
-<sys-devel/clang-16 llvm_targets_ARC llvm_targets_CSKY
-<sys-devel/llvm-16 llvm_targets_ARC llvm_targets_CSKY
-<dev-ml/llvm-ocaml-16 llvm_targets_DirectX llvm_targets_LoongArch
-<sys-devel/clang-16 llvm_targets_DirectX llvm_targets_LoongArch
-<sys-devel/llvm-16 llvm_targets_DirectX llvm_targets_LoongArch
-<dev-ml/llvm-ocaml-16 llvm_targets_M68k llvm_targets_SPIRV
-<sys-devel/clang-16 llvm_targets_M68k llvm_targets_SPIRV
-<sys-devel/llvm-16 llvm_targets_M68k llvm_targets_SPIRV
+<dev-ml/llvm-ocaml-16 llvm_targets_LoongArch
+<sys-devel/clang-16 llvm_targets_LoongArch
+<sys-devel/llvm-16 llvm_targets_LoongArch
+<dev-ml/llvm-ocaml-17 llvm_targets_ARC llvm_targets_CSKY
+<sys-devel/clang-17 llvm_targets_ARC llvm_targets_CSKY
+<sys-devel/llvm-17 llvm_targets_ARC llvm_targets_CSKY
+<dev-ml/llvm-ocaml-17 llvm_targets_DirectX
+<sys-devel/clang-17 llvm_targets_DirectX
+<sys-devel/llvm-17 llvm_targets_DirectX
+<dev-ml/llvm-ocaml-17 llvm_targets_M68k llvm_targets_SPIRV
+<sys-devel/clang-17 llvm_targets_M68k llvm_targets_SPIRV
+<sys-devel/llvm-17 llvm_targets_M68k llvm_targets_SPIRV
+<dev-ml/llvm-ocaml-17 llvm_targets_Xtensa
+<sys-devel/clang-17 llvm_targets_Xtensa
+<sys-devel/llvm-17 llvm_targets_Xtensa
 
 # Marek Szuba <marecki@gentoo.org> (2020-11-30)
 # Vendored therecipe/qt violates network sandbox + uses external binary
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n64/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n64/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n64/musl/make.defaults
similarity index 54%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n64/musl/make.defaults
index 26dbb0e4c1..cb0c7807a7 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n64/musl/make.defaults
@@ -1,6 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips64el-gentoo-linux-musl"
 CHOST_n64="${CHOST}"
 LIBDIR_n64="lib"
+
+# Disable sandbox because its currently broken on mipsel-musl
+FEATURES="-sandbox"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent
new file mode 100644
index 0000000000..a3de2bcf95
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n64/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../../features/musl
+../../../../../../../features/wd40
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/musl/make.defaults
similarity index 57%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/musl/make.defaults
index 53daa27ad9..d19638d735 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/musl/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+CHOST="mipsel-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
+
 # Disable sandbox because its currently broken on mipsel-musl
 FEATURES="-sandbox"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent
new file mode 100644
index 0000000000..a3de2bcf95
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../../features/musl
+../../../../../../../features/wd40
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
deleted file mode 100644
index e92fcf7cbf..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
deleted file mode 100644
index d0dec15ac7..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="mipsel-gentoo-linux-musl"
-CHOST_o32="${CHOST}"
-LIBDIR_o32="lib"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
deleted file mode 100644
index 85db6caf16..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/mips/mipsel/o32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/parent
deleted file mode 100644
index f2bcf2737c..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/n64/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/n64/parent
deleted file mode 100644
index 0a2e2f2706..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mips64/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/o32/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/o32/parent
deleted file mode 100644
index 6d4edaa24a..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/o32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/parent
deleted file mode 100644
index 9ef7663a23..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../features/musl
-../../../../../features/wd40
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/n64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/musl/make.defaults
similarity index 78%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/n64/make.defaults
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/musl/make.defaults
index 90dd886753..594d429605 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/n64/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/musl/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips64-gentoo-linux-musl"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/musl/parent
new file mode 100644
index 0000000000..bd0ef6ecac
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../features/musl
+../../../../../../features/wd40
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/o32/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/musl/make.defaults
similarity index 78%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/o32/make.defaults
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/musl/make.defaults
index 4027a83045..98209034fd 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/o32/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/musl/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips-gentoo-linux-musl"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/musl/parent
new file mode 100644
index 0000000000..bd0ef6ecac
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../features/musl
+../../../../../../features/wd40
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/n64/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/n64/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/n64/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/n64/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/n64/musl/make.defaults
similarity index 54%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/n64/musl/make.defaults
index 26dbb0e4c1..cb0c7807a7 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/n64/musl/make.defaults
@@ -1,6 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips64el-gentoo-linux-musl"
 CHOST_n64="${CHOST}"
 LIBDIR_n64="lib"
+
+# Disable sandbox because its currently broken on mipsel-musl
+FEATURES="-sandbox"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent
new file mode 100644
index 0000000000..a3de2bcf95
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/n64/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../../features/musl
+../../../../../../../features/wd40
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/o32/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/o32/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/musl/o32/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/o32/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/o32/musl/make.defaults
similarity index 57%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/o32/musl/make.defaults
index 53daa27ad9..d19638d735 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/o32/musl/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+CHOST="mipsel-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
+
 # Disable sandbox because its currently broken on mipsel-musl
 FEATURES="-sandbox"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent
new file mode 100644
index 0000000000..a3de2bcf95
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/mipsel/o32/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../../features/musl
+../../../../../../../features/wd40
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent
deleted file mode 100644
index e92fcf7cbf..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults
deleted file mode 100644
index d0dec15ac7..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="mipsel-gentoo-linux-musl"
-CHOST_o32="${CHOST}"
-LIBDIR_o32="lib"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent
deleted file mode 100644
index 85db6caf16..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../arch/mips/mipsel/o32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/parent
deleted file mode 100644
index f2bcf2737c..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mipsel
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/parent
deleted file mode 100644
index 0a2e2f2706..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/mips64/n64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/eapi
deleted file mode 100644
index 7ed6ff82de..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/parent
deleted file mode 100644
index 6d4edaa24a..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/mips/o32
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/parent
deleted file mode 100644
index 9ef7663a23..0000000000
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../features/musl
-../../../../../features/wd40
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/n64/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/n64/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/n64/musl/make.defaults
similarity index 78%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/make.defaults
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/n64/musl/make.defaults
index 90dd886753..594d429605 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/n64/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/n64/musl/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips64-gentoo-linux-musl"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/n64/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/n64/musl/parent
new file mode 100644
index 0000000000..bd0ef6ecac
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/n64/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../features/musl
+../../../../../../features/wd40
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/o32/musl/eapi
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/mipsel/eapi
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/o32/musl/eapi
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/o32/musl/make.defaults
similarity index 78%
rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/make.defaults
rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/o32/musl/make.defaults
index 4027a83045..98209034fd 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/musl/o32/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/o32/musl/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CHOST="mips-gentoo-linux-musl"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/o32/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/o32/musl/parent
new file mode 100644
index 0000000000..bd0ef6ecac
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/23.0/o32/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../../features/musl
+../../../../../../features/wd40
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 7081843fae..6a03a500e1 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
@@ -93,6 +93,7 @@ dev-python/anyio test
 dev-python/httpcore test
 dev-python/httpx test
 dev-python/uvicorn test
+dev-python/aiohttp-socks test
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-05-13)
 # dev-lang/rust is not available on ${arch} yet.
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 48c89dfd8c..f4bf4218ce 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,115 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2023-03-19)
+# Unmaintained, last release 18 years ago, assortment of QA issues,
+# upstream gone, fails with modern C, no revdeps remaining.
+# Removal on 2023-04-18. Bug #833484, #833536, #833944, #883757.
+dev-perl/PerlMol
+
+# Hans de Graaff <graaff@gentoo.org> (2023-03-19)
+# This version of cucumber-core is not compatible with the other
+# cucumber dependencies. Please downgrade cucumber-core.
+=dev-util/cucumber-core-11.1.0
+
+# David Seifert <soap@gentoo.org> (2023-03-19)
+# Upstream disappeared, last release over 8.5 years ago, unmaintained,
+# laundry list of QA issues, fails with modern C, no revdeps remaining.
+# Removal on 2023-04-18. Bug #683166, #814658, #834966, #898262.
+sci-libs/xdrfile
+
+# David Seifert <soap@gentoo.org> (2023-03-19)
+# Last release over 7.5 years ago, repo link broken and redirects to
+# homepage, build system is a mess, fails with modern C.
+# Removal on 2023-04-18. Bug #802729, #862414, #876993, #880577.
+x11-wm/subtle
+
+# David Seifert <soap@gentoo.org> (2023-03-19)
+# Last release over 5 years ago, fails with modern C, no revdeps in
+# tree.
+# Removal on 2023-04-18. Bug #884407.
+dev-ruby/ruby-xslt
+
+# David Seifert <soap@gentoo.org> (2023-03-19)
+# Last release over 10 years ago, fails with modern C, no revdeps in
+# tree.
+# Removal on 2023-04-18. Bug #587222, #884409.
+dev-ruby/tidy-ext
+
+# David Seifert <soap@gentoo.org> (2023-03-19)
+# Upstream disappeared, last release over 8 years ago, fails with modern
+# C, no revdeps in tree.
+# Removal on 2023-04-18. Bug #713784, #895686.
+dev-ruby/sigar
+
+# David Seifert <soap@gentoo.org> (2023-03-19)
+# Apache NIH make, long abandoned upstream, forked reboot went nowhere.
+# Last release over 2 years ago, fails with modern C and no revdeps in
+# tree. Removal on 2023-04-18. Bug #880401.
+dev-util/dmake
+
+# Hans de Graaff <graaff@gentoo.org> (2023-03-19)
+# ruby27-only package without reverse dependencies. No recent activity
+# upstream and last supported ruby version is 2.5. Masked for removal on
+# 2023-04-19.
+dev-ruby/bit-struct
+
+# Obsolete slot using an older version of faraday. Use the newer slot
+# instead. Masked for removal on 2023-04-19.
+dev-ruby/elasticsearch:6
+dev-ruby/elasticsearch-api:6
+dev-ruby/elasticsearch-transport:6
+
+# Hans de Graaff <graaff@gentoo.org> (2023-03-19)
+# Last upstream activity 5 years ago, no longer works with modern
+# Cucumber. Masked for removal on 2023-04-19.
+dev-ruby/fivemat
+
+# David Seifert <soap@gentoo.org> (2023-03-18)
+# Upstream disappeared, last release over 20 years ago, only Gentoo
+# still carries this, breaks with modern C under Clang, no revdeps.
+# Removal on 2023-04-17. Bug #875683.
+net-analyzer/bigeye
+
+# David Seifert <soap@gentoo.org> (2023-03-18)
+# Upstream disappeared, last release over 15 years ago, only Gentoo
+# still carries this, breaks with modern C under Clang, no revdeps.
+# Removal on 2023-04-17. Bug #875020.
+net-analyzer/traceroute-nanog
+
+# David Seifert <soap@gentoo.org> (2023-03-18)
+# Last release over 7.5 years ago, only Gentoo still carries this,
+# breaks with modern C under Clang, no revdeps.
+# Removal on 2023-04-17. Bug #871711.
+media-plugins/vdr-remotetimers
+
+# David Seifert <soap@gentoo.org> (2023-03-18)
+# Upstream disappeared, release is over 14 years old, only Gentoo still
+# carries this, breaks with modern C under Clang, no revdeps.
+# Removal on 2023-04-17. Bug #862438.
+sci-chemistry/prekin
+
+# David Seifert <soap@gentoo.org> (2023-03-18)
+# Unmaintained in Gentoo, last upstream commit 7 years ago, breaks with
+# modern C under Clang, no revdeps. Bug #741078, #874648, #883303.
+# Removal on 2023-04-17.
+net-wireless/spectools
+
+# Hans de Graaff <graaff@gentoo.org> (2023-03-18)
+# Ancient out-of-date package. No proper upstream release since 2011.
+# No reverse dependencies. Masked for removal on 2023-04-18.
+dev-ruby/six
+
+# Sam James <sam@gentoo.org> (2023-03-16)
+# Breaks building C++ consumers. See bug #901211 and bug #901035.
+# Please upgrade to glib-2.76.0-r1.
+=dev-libs/glib-2.76.0
+
+# Alfredo Tupone <tupone@gentoo.org> (2023-03-14)
+# Masked for removal in 30 days.
+# Bug #895824, no rev dep
+dev-tcltk/tkzinc
+
 # David Seifert <soap@gentoo.org> (2023-03-12)
 # Qt-based application is EOL, Yubico has switched to a Flutter-based
 # Googleware framework. Switch to app-crypt/yubioath-flutter-bin or use
@@ -47,13 +156,38 @@ dev-ruby/net-http-persistent:3
 
 # Guillermo Joandet <gjoandet@gmail.com> (2023-03-11)
 # In preparation for GNOME 44
+>=app-editors/gnome-text-editor-44_rc
+>=app-text/evince-44_rc
 >=dev-libs/gjs-1.75
 >=dev-python/pygobject-3.43
 >=gnome-base/gnome-session-44_rc
 >=gnome-base/gnome-settings-daemon-44_rc
 >=gnome-base/gnome-shell-44_rc
+>=gnome-base/librsvg-2.55.90
+>=gnome-base/nautilus-44_rc
+>=gnome-extra/gnome-boxes-44_rc
+>=gnome-extra/gnome-calculator-44_rc
+>=gnome-extra/gnome-calendar-44_rc
+>=gnome-extra/gnome-characters-44_rc
+>=gnome-extra/gnome-clocks-44_rc
+>=gnome-extra/gnome-contacts-44_rc
 >=gnome-extra/gnome-shell-extensions-44_rc
+>=gnome-extra/gnome-software-44_rc
+>=gnome-extra/gnome-system-monitor-44_rc
+>=gnome-extra/gnome-user-docs-44_rc
+>=gnome-extra/gnome-weather-44_rc
+>=gui-apps/gnome-console-44_beta
+>=gui-libs/libadwaita-1.3_rc
+>=media-gfx/eog-44_beta
+>=media-gfx/gnome-font-viewer-44_rc
 >=net-libs/glib-networking-2.76_beta
+>=net-libs/webkit-gtk-2.40.0
+>=net-misc/gnome-connections-44_rc
+>=net-misc/gnome-remote-desktop-44_rc
+>=sci-geosciences/gnome-maps-44_rc
+>=sys-apps/baobab-44_rc
+>=sys-apps/gnome-disk-utility-44_rc
+>=sys-apps/xdg-desktop-portal-gnome-44_rc
 >=x11-wm/mutter-44_rc
 
 # Hans de Graaff <graaff@gentoo.org> (2023-03-11)
@@ -224,124 +358,12 @@ app-eselect/eselect-opencascade
 # Removal on 2023-03-21.  Bug #895342.
 dev-python/flask-script
 
-# Sam James <sam@gentoo.org> (2023-02-18)
-# Last release in 2018, needs porting to Python 3.11, and no reverse
-# dependencies. Removal on 2023-03-18. bug #895174.
-dev-python/setuptools_trial
-
-# Sam James <sam@gentoo.org> (2023-02-18)
-# Backport to Python 3.5(!) hence irrelevant for newer versions of Python
-# where os.scandir() and os.walk() improvements were integrated in the stdlib.
-# Incompatible with Python 3.11. No reverse dependencies.
-# Removal on 2023-03-18. bug #895198
-dev-python/scandir
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-17)
-# Merged into dev-python/pytest-cov in 2020.  No revdeps left.
-# Removal on 2023-03-19.  Bug #895120.
-dev-python/cov-core
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-17)
-# Broken against the current package versions in ::gentoo.  Upstream
-# inactive.  No revdeps.
-# Removal on 2023-03-19.  Bug #865931.
-dev-python/pytest-flake8
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-15)
-# A number of test failures, and the test phase does not fail correctly.
-# Last release in 2019.  No revdeps.
-# Removal on 2023-03-17.  Bug #894606.
-dev-python/urlgrabber
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-15)
-# Unmaintained.  Broken with current version of dev-python/pyglet.
-# No upstream activity since Sep 2021.  No revdeps.
-# Removal on 2023-03-17.  Bug #887973.
-dev-python/glooey
-
-# Alfredo Tupone <tupone@gentoo.org> (2023-02-14)
-# Masked for removal in 30 days.
-# Not maintained (2020), no rev dep
-dev-ml/ppxfind
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-14)
-# Unmaintained and archived.  Invalid version number causes total mayhem
-# when installed alongside new dev-python/packaging.
-# Removal on 2023-03-16.  Bug #894222.
-net-p2p/bittornado
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-02-10)
-# Unused Java libraries. Removal on 2023-03-12.
-dev-java/jcip-annotations
-dev-java/jformatstring
-dev-java/jta
-dev-java/pdf-renderer
-
-# Florian Schmaus <flow@gentoo.org> (2023-02-10)
-# Previous dependencies of ejabberd, now no longer needed.
-# Removal on 2023-03-10.
-dev-erlang/iconv
-dev-erlang/p1_xmlrpc
-dev-erlang/riak_pb
-
 # Florian Schmaus <flow@gentoo.org> (2023-02-09)
 # Leftovers from net-im/jabber-base. Unused and obsolete.
 # Removal on 2023-03-09.
 acct-user/jabber
 acct-group/jabber
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-02-07)
-# Unused Java libraries. Removal on 2023-03-08.
-# jspeex had last upstream activities in 2005.
-dev-java/jspeex
-dev-java/osgi-annotation-versioning
-dev-java/commons-text
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-03)
-# The package has been archived upstream.  It is broken with all Python
-# versions supported by Gentoo, and it is broken with django-2.
-# The other listed packages are its reverse dependencies.
-# Removal on 2023-03-05.  Bug #718972.
-app-misc/gcalcli
-app-misc/goobook
-dev-python/gcs-oauth2-boto-plugin
-dev-python/google-apitools
-dev-python/google-reauth-python
-dev-python/oauth2client
-net-misc/gsutil
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-02)
-# dev-python/citeproc-py requires dev-python/nose and is not maintained
-# upstream.  Its only revdep, dev-python/duecredit has no reverse
-# dependencies left.
-# Removal on 2023-03-04.  Bug #888239.
-dev-python/citeproc-py
-dev-python/duecredit
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-01)
-# dev-python/blockdiag still requires dev-python/nose.  There was a PR
-# made to switch to pytest in Feb 2020 but it's not progressing at all.
-# It was needed only for dev-python/aiohttp[doc].
-# Removal on 2023-03-03.  Bug #888233.
-dev-python/blockdiag
-dev-python/sphinxcontrib-blockdiag
-
-# Michał Górny <mgorny@gentoo.org> (2023-02-01)
-# Requires legacy setuptools backend.  Hacky build system.  The only
-# revdep is dev-python/rdflib where it is entirely optional.
-# Removal on 2023-03-03.  Bug #892854.
-dev-python/berkeleydb
-
-# Michał Górny <mgorny@gentoo.org> (2023-01-31)
-# No tests, no activity since Aug 2020, no reverse dependencies.
-# Removal on 2023-03-02.  Bug #892744.
-dev-python/alagitpull
-
-# Michał Górny <mgorny@gentoo.org> (2023-01-31)
-# The test suite is broken (async tests don't run).  No revdeps.
-# Removal on 2023-03-02.  Bug #892742.
-dev-python/aiohttp-jinja2
-
 # Ben Kohler <bkohler@gentoo.org> (2023-01-30)
 # Breaks too many revdeps for now
 =app-text/discount-3*
@@ -350,55 +372,11 @@ dev-python/aiohttp-jinja2
 # Commands trigger an assertion and crashes, bug #892487
 =sys-fs/lvm2-2.03.18
 
-# Mike Gilbert <floppym@gentoo.org> (2023-01-28)
-# No upstream releases since 2008.
-# No Gentoo maintainer since 2009.
-# Installs files in the wrong places (bug #455542)
-# and with the wrong mode (bug #892325).
-# Removal on 2023-02-27.
-app-admin/bastille
-
-# Florian Schmaus <flow@gentoo.org> (2023-01-27)
-# Previous dependencies of dev-lang/clojure, now part of the clojure
-# ebuild and no longer needed.
-# Removal on 2023-02-27.
-dev-java/core-specs-alpha
-dev-java/spec-alpha
-
-# Michał Górny <mgorny@gentoo.org> (2023-01-26)
-# Unmaintained.  Last release in 2003.  The package fails to install
-# since Aug 2021 and while a fix would be trivial, there does not seem
-# to have been any interest in it during that period.
-# Removal on 2023-02-25.  Bug #806384.
-www-misc/wsmake
-
-# Michał Górny <mgorny@gentoo.org> (2023-01-25)
-# Unmaintained.  Multiple build failure bugs reported.  This version
-# predates 2008.
-# Removal on 2023-02-24.  Bug #837611.
-sys-cluster/wulfware
-
 # Sam James <sam@gentoo.org> (2023-01-23)
 # Please upgrade to >=app-eselect/eselect-wxwidgets-20230114-r1 as -r0 may
 # lead to build failures.
 =app-eselect/eselect-wxwidgets-20230114
 
-# Michał Górny <mgorny@gentoo.org> (2023-01-21)
-# Packages that are incompatible with ffmpeg-5.
-#
-# media-libs/libextractor: no Gentoo maintainer, ver from 2019, bug #834382
-# media-libs/qtav: no Gentoo maintainer, no porting progress, bug #834386
-# media-plugins/vdr-vaapidevice: no activity since 2019, bug #834390
-# media-sound/potamus: last rel. 2018, one commit in 2020, bug #834396
-# media-video/ffmpeg2theora: no activity since 2016, bug #834403
-#
-# Removal on 2023-02-20.
-media-libs/libextractor
-media-libs/qtav
-media-plugins/vdr-vaapidevice
-media-sound/potamus
-media-video/ffmpeg2theora
-
 # David Seifert <soap@gentoo.org> (2023-01-14)
 # Py3.8 only backports
 dev-python/backports-tempfile
@@ -410,13 +388,6 @@ dev-python/pkgutil_resolve_name
 # Breaks reverse dependencies: bug #889694, bug #888579.
 =sys-fs/btrfs-progs-6.1.1
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-12-29)
-# Upstream is dead, last activity in Nov 2017. Does not
-# work with newer log4j, bug #857663. Use net-p2p/biglybt
-# instead. Removal on 2023-02-28.
-net-p2p/vuze
-net-p2p/vuze-coreplugins
-
 # Sam James <sam@gentoo.org> (2022-12-27)
 # Regression in listing subvolumes (no UUIDs), bug #888549
 # https://github.com/kdave/btrfs-progs/issues/562
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 5845a27c35..5907185b9e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
@@ -351,10 +351,10 @@ arm64		default/linux/arm64/17.0/musl				dev
 arm64		default/linux/arm64/17.0/musl/llvm			exp
 arm64		default/linux/arm64/17.0/musl/hardened			exp
 arm64		default/linux/arm64/17.0/musl/hardened/selinux		exp
-mips		default/linux/mips/17.0/musl/o32			exp
-mips		default/linux/mips/17.0/musl/n64			exp
-mips		default/linux/mips/17.0/musl/mipsel/o32			exp
-mips		default/linux/mips/17.0/musl/mipsel/n64			exp
+mips		default/linux/mips/17.0/o32/musl			exp
+mips		default/linux/mips/17.0/n64/musl			exp
+mips		default/linux/mips/17.0/mipsel/o32/musl			exp
+mips		default/linux/mips/17.0/mipsel/n64/musl			exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/musl		dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64/musl		dev
 x86		default/linux/x86/17.0/musl				dev
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023
index 215e86c188..b0348250ce 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023
@@ -20,3 +20,4 @@ move dev-python/netcdf4-python dev-python/netcdf4
 move dev-python/jupyterlab_server dev-python/jupyterlab-server
 move dev-python/jupyter_server_ydoc dev-python/jupyter-server-ydoc
 move app-text/pytextile dev-python/textile
+move dev-python/jupyter_server dev-python/jupyter-server

From d1389b85a0c32df357e30a9f2df41b273ede22f3 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:26:05 +0000
Subject: [PATCH 54/62] sys-apps/diffutils: Sync with Gentoo

It's from Gentoo commit 9083aec7b4e8c779439f8340423660e16841a2d6.
---
 .../portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index 7f61222e80..87c7e4f06f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

From 74dba4c963b67bc735572018d6ec8726f04a9efa Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:26:13 +0000
Subject: [PATCH 55/62] sys-apps/portage: Sync with Gentoo

It's from Gentoo commit 3009f682e74a46a4a88ecab250c59f8e921ea2f9.
---
 .../portage-stable/sys-apps/portage/Manifest  |   1 +
 .../sys-apps/portage/portage-3.0.45.3.ebuild  | 284 ++++++++++++++++++
 2 files changed, 285 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest
index 58289a9dee..18632e0ed2 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest
@@ -1,3 +1,4 @@
 DIST portage-3.0.43.tar.bz2 1139615 BLAKE2B e0f2646c3b6d5d49ec23038ad27507f7b9c0c03b848e82aff336896802c07b29344f924c4525d880f8895ba38f8116a7c79ecea51c794a433da9bd146efadc20 SHA512 b5e5339f3b5446f5c8f9b319e86e82d260e004b0606c3d0eadf09f91c95de0279c64c0fc4d7f6251ebd2cf7a65ba1ba37d752ed48b712e72b8c024835e747691
 DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 06f584e6e37bbb309b9bb0e29ba4381eadd4ae6246aeb1045e3a5c5dcb33d74f74e74aa3f2325acbf37e16a535095c433f2796ed042f73cea5e208150e210cb0 SHA512 d40c95f3a31c5e2ae35374243c40c8d1f6b47b7c89f6a711a12d8744cb6848a85443298c0f947475b32acf52332e7f09b1e85915149ab8363930c0404f08410e
 DIST portage-3.0.45.2.tar.bz2 1145556 BLAKE2B 09cd28839418f91f512ce4ddf45addf37f72d07d6ee84812519239245529c6b5fbe63e45ee3fe3048fb8b3aced2a18c0f30fbdb261a793bae87243e9258799bd SHA512 16be3572d74b26ca5ed62392e3da701cc8e93e6d6d35024a2d10b0f971618404a135645a869d8df2aedf9e3e9201e7ad912a427e9593065fe20ada7a0fedf353
+DIST portage-3.0.45.3.tar.bz2 1146552 BLAKE2B 0506124bf47d71df699c2ecb2846b19f68b39813409e141fe292e237093eeb4f3d6fb771f6328624e0182322f71f42e629c2c58a2c590efb8697fa61b03d73a4 SHA512 89757efb71127249356c7d4ea1a05de7409285abaf045b2c6b5ddd463bef997db497df6ea3a05085656eced49bee625732bfb2d0771b7592f883f8712e547415
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3.ebuild
new file mode 100644
index 0000000000..c226bd8136
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )
+"
+DEPEND="
+	!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)
+"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		>=app-shells/bash-5.0:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=sec-keys/openpgp-keys-gentoo-release-20220101
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0
+"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/coreutils-6.4
+		>=sys-apps/file-5.44-r3
+	)
+"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions && ! tc-is-cross-compiler; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+	fi
+
+	cd "${S}/cnf" || die
+	if [[ -f "make.conf.example.${ARCH}".diff ]] ; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	if ! use build; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
+
+pkg_postinst() {
+	# Warn about obsolete "enotice" script, bug #867010
+	local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
+	if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
+		eerror "Obsolete 'enotice' script detected!"
+		eerror "Please remove this from ${bashrc} to avoid problems."
+		eerror "See bug 867010 for more details."
+	fi
+}

From e6bec5f53dfadca8488c1635d73754fd77df85fd Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:26:14 +0000
Subject: [PATCH 56/62] sys-apps/texinfo: Sync with Gentoo

It's from Gentoo commit f02f2ec7415bfef02b2318366dec9a5a7b0899ad.
---
 .../portage-stable/sys-apps/texinfo/Manifest  |  1 +
 .../sys-apps/texinfo/texinfo-7.0.2.90.ebuild  | 82 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.2.90.ebuild

diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/Manifest
index 7e5010a2e5..2c5caf77d1 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/Manifest
@@ -1,2 +1,3 @@
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
+DIST texinfo-7.0.2.90.tar.xz 4876224 BLAKE2B 632edc0e9312f6042eb6ea0da0a18f33fd46c78e089bbead1846519f501be3e4cdf488bf6965f7f27073c72860a8750f6fdc032911ca2f1a506ccf80ba4e1536 SHA512 3d84795de2a7bc9dc35729801fa6c9e32c8ecaf6c0bbfa834107a5786d191d5dbc4f053394b173eb7c49fbaa241c2374073ad499a6267c7cba680969bb23f4a5
 DIST texinfo-7.0.2.tar.xz 4875424 BLAKE2B 23737cc800392c949add14c1d0a01a294e8c224d958c03325c96d6540dcfae49db5c2d4a8c29310c0603f8ac8477f6ee00a14db4aa6caab317b19e776139e617 SHA512 26dd5bb1392f2197ecde296ba157d4533f4b11fadf1238481da4cf2b3796c665ce96049df8d2f9a6d4fa22b7e9013d9978d195e525288663f0a54482bbc22b2b
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.2.90.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.2.90.ebuild
new file mode 100644
index 0000000000..ab957b84c6
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.2.90.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: if your package uses the texi2dvi utility, it must depend on the
+# virtual/texi2dvi package to pull in all the right deps.  The tool is not
+# usable out-of-the-box because it requires the large tex packages.
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="https://www.gnu.org/software/texinfo/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
+	REGEN_BDEPEND="
+		>=sys-devel/autoconf-2.62
+		>=sys-devel/automake-1.16
+		sys-devel/libtool
+	"
+elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+	REGEN_BDEPEND=""
+else
+	SRC_URI="mirror://gnu/${PN}/${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"
+	REGEN_BDEPEND=""
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="nls +standalone static"
+
+RDEPEND="
+	!=app-text/tetex-2*
+	>=sys-libs/ncurses-5.2-r2:=
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	standalone? ( >=dev-lang/perl-5.8.1 )
+	!standalone?  ( >=dev-lang/perl-5.8.1:= )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${REGEN_BDEPEND}
+	nls? ( >=sys-devel/gettext-0.19.6 )
+"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# Needed if a patch touches install-info.c
+	#touch man/install-info.1 || die
+
+	if use prefix ; then
+		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
+		touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die
+	fi
+}
+
+src_configure() {
+	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions
+	# bug #622576
+	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}"
+	local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
+
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		$(use_enable nls)
+		$(use_enable !standalone perl-xs)
+	)
+
+	econf "${myeconfargs[@]}"
+}

From a9b2b6d6e2b3f9ff79b97de86442615e7f4bccdc Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:26:15 +0000
Subject: [PATCH 57/62] sys-devel/autoconf-archive: Sync with Gentoo

It's from Gentoo commit 49a5e118cf99d4d6b09698f92dae03e2b732f6ec.
---
 .../autoconf-archive/autoconf-archive-2023.02.20.ebuild         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild
index 74cad29304..54af93636e 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 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"
 
 # File collisions, bug #540246
 RDEPEND="

From de619dbcc41a135aaa74887177fdfd081c3090f1 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:26:21 +0000
Subject: [PATCH 58/62] sys-devel/gcc: Sync with Gentoo

It's from Gentoo commit 48488786b8625ce64b1d88402a90741cfc8e661c.
---
 .../portage-stable/sys-devel/gcc/Manifest     |  7 +++
 .../sys-devel/gcc/gcc-10.4.1_p20230316.ebuild | 58 +++++++++++++++++++
 .../sys-devel/gcc/gcc-11.3.1_p20230317.ebuild | 52 +++++++++++++++++
 .../gcc/gcc-12.2.1_p20230121-r1.ebuild        |  2 +-
 ....ebuild => gcc-12.2.1_p20230311-r1.ebuild} |  2 +-
 .../sys-devel/gcc/gcc-12.2.1_p20230318.ebuild | 52 +++++++++++++++++
 .../gcc/gcc-13.0.1_pre20230312-r1.ebuild      | 54 +++++++++++++++++
 .../gcc/gcc-13.0.1_pre20230319.ebuild         | 54 +++++++++++++++++
 8 files changed, 279 insertions(+), 2 deletions(-)
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230316.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230317.ebuild
 rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-12.2.1_p20230311.ebuild => gcc-12.2.1_p20230311-r1.ebuild} (98%)
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230318.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230319.ebuild

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 343143eed5..8298ee44a4 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,6 +1,7 @@
 DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2 SHA512 6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5
 DIST gcc-10-20230302.tar.xz 72112120 BLAKE2B 8647639d9c6aef31b63566b006bb2980ca974e4aac4f5ced5f12a4f7fe0e9bda1e456d31f13dc478ab187d5e739ac850dd7dcc9db421ece1cadc50c952dbbed4 SHA512 97f72699b1a38de0dfb95253dc1602400fb05c2466b3682e51a4793d17db62e1d55b8d19211c3326e5369aace2a74345059b4b1c1a61a1f2c1c75a0aa9ec3e0e
 DIST gcc-10-20230309.tar.xz 72121328 BLAKE2B 6dfcd9278c0909cd4f75835d8da584374f063767b68524cb956bb35b8b16abee78f3770c84dbd19bb5c28a0d1d69011e6c33abfaa7ea5e6688e15eaaf1820be8 SHA512 a54a39b418203185c58f76fffa9a61a8c14ac16a2aaa5eaf312d9a90ea9a51c5e7f3398a25e04dc5ffc6fb589141f4aeb0ca110a478276b4027631d1bb9f9c6c
+DIST gcc-10-20230316.tar.xz 72129548 BLAKE2B 72b5d9bf3f98bdc961d3f9e6361edcf51f7b7866c64cfd158a15a7a0b045d0cff00f185bb1da85b0cf95df5fb73ce6109a8bf0eef0bb1018970754c22d41c827 SHA512 13787d3ce14ffdc7f277263237364b0493aeb88115cdf8d100ab35e9abe08d4c845a90cd78b1c138286beef991079f3b42bb4fcf720284dff1b34606ead59ccc
 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
@@ -11,6 +12,7 @@ DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e2
 DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f06274362728174b32d9ead52ea95c25ea6a192397378b9b4c4f958285d97488d28e425c26129d23f143b1a8668fbc SHA512 81f71aeb706b4ccb89e2af5201770fd72cc3190b9b5eac0b5a25a522626b9c4015a2e5d13e4bd1360ac0f7f1be27df51fc530c15ce3c3d782f39f34d5c58803e
 DIST gcc-11-20230303.tar.xz 76131828 BLAKE2B ad73cf9b11f4a70be922ebc2a934e8d5f863582ebb662fe74c71b5880c9d6617cc80233456bde70a7867d788fa1f72262f1ef069f23ff85a423c5eede3e7d3c7 SHA512 3b310b87f7d7423a727f2348038add5b76f923b0baf528d061e45a1030eefb538f4175866dc6e7e70852a794de0ab62798965ea1e574bfe62ccae35fe4b2b00b
 DIST gcc-11-20230310.tar.xz 76137524 BLAKE2B 3d94746408ef1b91eb049f06fc9028e567346ae700433f2de90f7f0028871f7e5834b85785ab601314a6c66ecd4a7ef129ab78a0ff67c890e73d8682efe59e87 SHA512 07e9cb07a4e42c6d753c53768ba39211e5efd08e40bb78b66eb1bfcfe8267985a4b69da361cc8eb0b072367adf58f6230abb362b8290099d464d0edaea4bb0f5
+DIST gcc-11-20230317.tar.xz 76143768 BLAKE2B c2fc0222d23d1fdca7db234246052695ff9760c4d43e36a40e06a7c089e2b789b1833aadf8efaeb8e961e6370acdee0c6adaa454fb1cb13b9e8a002e2793fef5 SHA512 698097c4ba95f2f24f8b11d7096755f3cd393286e18f7cccbd559ded154d18e1348dead9adf7c9aa131a03a97d97759ad0eee8a6e3196faff8c9ca9d868247d9
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9
 DIST gcc-11.4.0-patches-7.tar.xz 14416 BLAKE2B 3ebf62cba04cac8830a93a99d11c21347c38891db3a81493a10e02e8b7af0c86389ffbede50672dfe1189a77a67b832f8f97a1d95d43eff11db131a143b1d03d SHA512 41e2ed1ccf6d3631accccdab057877c79c99eb1b3c32f9d35628bca6c633c4f8dadb1d7f93bed2e4d7ff9f36cc9e46ea00f0e57e8af64b2e5f4b3b01285c6da3
@@ -18,15 +20,20 @@ DIST gcc-11.4.0-patches-8.tar.xz 13788 BLAKE2B a1406d5dcd906ed51ef06bb6571c216d8
 DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349
 DIST gcc-12-20230304.tar.xz 79683276 BLAKE2B e02622f1193ba17dd1041eae0c2f594b26806b00cfb269e683cc356d6d405ae8a49e60823ed6f814d2aac820ef01d9004f68d628a853be139fa6a70e8601ba2a SHA512 0c23a8845c8f202b0c0e4aceb3104bf76c0aca9171ba65d292057703d160fc4ce0b0d7c8876cf1bb30f998c4a5a0a8f3c4165dd4d8d316019cff0dc19aa62182
 DIST gcc-12-20230311.tar.xz 79694468 BLAKE2B 7c775bf81e43d431dd03b17b995ee6b7d54c8c8f2eb2962498dcb741b4a661d1c02b48cf3cc17f9074a58a8a299977e1caecb1ba34200759b00a18e36e156fe3 SHA512 e016537c8a06311ccfec5760417f9daa4c4e55b32fc28f32dd0ec7429f53ed753a84a788da304b12f9c7443ec693ad881536cfa875829d201d803138fde59c16
+DIST gcc-12-20230318.tar.xz 79703428 BLAKE2B ec1a4c1e8de27f8762ef91f553a2f8045f26a38c1beb49be4a39c86a11b894b609548f3f6f47b6bf2de9a357995a1f72c3667dba4892189eedee01c9e3c160ed SHA512 7ba9acab02a42090fde3e903bb579d20bd1ba6ae0403fa344e25db74e4a81dfe5a81a98971869baaf0d70c089f313bf789287f037294f813429480634afea8f6
 DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bedb24714d78b7b725476b1eac3898d89c0c549da8e69db28911205bb3293f62cf344a90ade0898ecf5fed57ff00fcf8547a9f SHA512 7a7a440bc08de8dcb37c080ea0c27904adaaadaaaafaab24d90becd2d009243dcfc886d8f674ce3ccddb4ebb5ad17f04d841064d9ec2e2e2e96a1afac3002111
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
 DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c
 DIST gcc-12.2.0-patches-13.tar.xz 13756 BLAKE2B df0388a669458f2991951d2f4027badbff3f802e6a0422478206b5cdda76e70b531a474d2ac42817e9e7f8200e9ac35ca8276af539839b4ebb2e22903ec25a23 SHA512 2970de9d2806d59c5d0f77e66000860c816ebd674489db8114f48f6aa11575644154431480222580b520b9e312647b06f94ab38959a49a8cda818158d6babf1d
+DIST gcc-12.2.0-patches-14.tar.xz 13752 BLAKE2B c44609a8a3a96480f144b7e6859c2b1d7105f421ffa08929c35fc13eb5ec11d967b02cf8248ecb4ea85824b1872125a73c92f404050c3399d5c06fe668711fd3 SHA512 c1db7a7f3a929dfdc8de9a662448f57296ab818b9fd133763b2ab0dddce2e01cf322e5ac53f3d69c2366053ef3c4fa44c72eed248dc7aeef49f558341bdd3854
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST gcc-13-20230226.tar.xz 84264388 BLAKE2B fea763a1627bff19eb0f7869b83c00337dc2a203178d17143c98c2c1d3fd385d2f853f195ff79ecc1cae659a1f8704c88e7fd77456eed4510bdcba7631e49353 SHA512 38de82dd54e1b57490f5492a4adcd05b9da3ace2235654dff19bade8d378e75be1495f3b2b4e7f7e57ea144351c4ade1e9a5b141546259024f0359f43b2025ac
 DIST gcc-13-20230305.tar.xz 84314220 BLAKE2B cf4971cddea6981e3dfb62dd7d69b85b85df0a137e0596f71530966186f2919e800e60b6712b1d676b4250e835db8601af5376a77dad82fff7b1d9faae012da8 SHA512 39320f90bcdc2d8f5cefa2c8ac551d7a6f0d20744cdff5ed8956321d6b0813bbc44d18266bf7bb7ebbe642078a6d9677216e6db939dd56186959e5454d7d3a85
+DIST gcc-13-20230312.tar.xz 84361832 BLAKE2B 4099036d7224cbdb9cfd8fb454201a80f76ea9569d8625d4cedc14ed30caf0a4b88a60b5f9fff12001a19a928909489609da3634c109e457f9b6dedcd20a947d SHA512 7513ebdbe9e6116658c4bafdc71f122cae3cf7233b91402bc1d05fe1fec0ff036ed613b1db3af2b235fc153c862f428cd297da6ba0e6e81e1e7962fa0550e01e
+DIST gcc-13-20230319.tar.xz 83729684 BLAKE2B b57681574691f7909017ea1b8a5d101e09c22632d9f2aef166eaafc55cd7b2f8bca065b16a7b902130da55edf5f16994608601dfb2dacd7661a477afc4482a32 SHA512 461a70570ae3944f317b778feb67cfc3bd29945c0a825b558abd9311cb5297b390725896b81a494c3c592c231d77a7147338cb4962a1feba304f13e6e19b4538
 DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37 SHA512 ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681
 DIST gcc-13.1.0-patches-8.tar.xz 11644 BLAKE2B aaa135a7d22badc22eeba42fe92c2de40e1a779836f42b5ba15884ad3d756020421b99e29b9a27f40368013fb9d8348e3ca1ef3541a6de55129d66f4645caf8f SHA512 a71ef0f215451c840a99d7100489e8364e4e7a71d83e9be42e35fb06d4276afadb64834801ef3469a4edb78eede5a03c18104215fef3039f98da3b3d0c8e69af
+DIST gcc-13.1.0-patches-9.tar.xz 11720 BLAKE2B c26a2924fa8aab318a1f4a4974ca4aeba255f3605fa0cbf448a4e48b6f3e9359012aeae15726299059257b93043c5cdd86bf1b2f2fffd4b9a096ab411a0503ba SHA512 98e48abaa664ea18bf00ba7bdb29cc1e908cc55ba9d12d52061e86fc917753ade8e38a190c04d23c63102808ac5a9e8ecf085dcc29a1568a329ceb5d43cf0290
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230316.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230316.ebuild
new file mode 100644
index 0000000000..07a2b5e91a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230316.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 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="5"
+MUSL_VER="2"
+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-11.3.1_p20230317.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230317.ebuild
new file mode 100644
index 0000000000..371a6269fe
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230317.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 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="8"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="2"
+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-12.2.1_p20230121-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
index 148aa2769b..fff578a428 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
@@ -35,7 +35,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 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+	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.
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230311.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
similarity index 98%
rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230311.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
index 3a7a472a2f..cb82e22284 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230311.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="13"
+PATCH_VER="14"
 PATCH_GCC_VER="12.2.0"
 MUSL_VER="7"
 MUSL_GCC_VER="12.2.0"
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230318.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230318.ebuild
new file mode 100644
index 0000000000..cb82e22284
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230318.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="14"
+PATCH_GCC_VER="12.2.0"
+MUSL_VER="7"
+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-13.0.1_pre20230312-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
new file mode 100644
index 0000000000..1f65b8ba8a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
+PATCH_GCC_VER="13.1.0"
+MUSL_VER="1"
+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.1_pre20230319.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230319.ebuild
new file mode 100644
index 0000000000..1f65b8ba8a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230319.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
+PATCH_GCC_VER="13.1.0"
+MUSL_VER="1"
+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
+}

From 1f8e0a95764ca22e6d06e97aff4541f85b97b7a6 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:26:23 +0000
Subject: [PATCH 59/62] sys-devel/libtool: Sync with Gentoo

It's from Gentoo commit dd04356572de7d570b230f62c2094eaa68ef4fdc.
---
 .../portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild
index 2eefdb92bc..2024dee023 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.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 ~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"
+	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"

From 18aa0ea4a924609cf0d41cfb6db26cf47f888d12 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:26:34 +0000
Subject: [PATCH 60/62] sys-libs/libseccomp: Sync with Gentoo

It's from Gentoo commit fade17c365155fc535fa3fcab4799effdcd58825.
---
 .../third_party/portage-stable/sys-libs/libseccomp/metadata.xml  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/metadata.xml
index 75b652d432..72ee48a1f8 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/metadata.xml
@@ -10,7 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">seccomp/libseccomp</remote-id>
-		<remote-id type="sourceforge">libseccomp</remote-id>
 		<remote-id type="cpe">cpe:/a:libseccomp_project:libseccomp</remote-id>
 	</upstream>
 </pkgmetadata>

From 1aef3760b902cc94a0996194460001d2c72018a3 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 20 Mar 2023 07:26:35 +0000
Subject: [PATCH 61/62] virtual/libcrypt: Sync with Gentoo

It's from Gentoo commit 1d86e13a6b6be300f4223115c638bbda6d999fb9.
---
 .../portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild
index ed66eaa1a4..7a5ad71cbd 100644
--- a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for libcrypt.so"
 
 SLOT="0/2"
-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="static-libs"
 
 RDEPEND="

From e29c89bab81b6f5586329ccca342596b1b3db626 Mon Sep 17 00:00:00 2001
From: Sayan Chowdhury <schowdhury@microsoft.com>
Date: Tue, 21 Mar 2023 11:42:56 +0530
Subject: [PATCH 62/62] changelog: Add weekly 20230320 changelog entries

Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
---
 .../changelog/updates/2023-03-21-weekly-package-updates.md      | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2023-03-21-weekly-package-updates.md

diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2023-03-21-weekly-package-updates.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2023-03-21-weekly-package-updates.md
new file mode 100644
index 0000000000..c5b7210cbb
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2023-03-21-weekly-package-updates.md
@@ -0,0 +1,2 @@
+- SDK: pahole ([1.24_p20221024](https://github.com/acmel/dwarves/releases/tag/v1.24))
+- SDK: Python ([3.10.10_p3](https://www.python.org/downloads/release/python-31010/))