Merge pull request #384 from flatcar/buildbot/weekly-package-updates-2022-11-14

Weekly package updates 2022-11-14
2025-08-16 01:16:59 +02:00 · 2022-11-18 10:14:45 +01:00 · 2022-11-18 10:14:45 +01:00 · 04e90140a2
commit 04e90140a2
parent 93c1feb6db 35c1c67d9f
127 changed files with 3649 additions and 411 deletions
--- a/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild
@ -73,6 +73,8 @@ src_configure() {
 		*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
 	esac

+	append-flags -std=gnu89
+
 	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
 	use bzip2 && append-cppflags -DUSE_BZIP2
 	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
--- 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,6 @@
 DIST xz-5.2.7.tar.gz 2105803 BLAKE2B 5363c5d0403e041c6d2e35b5d3321feeb8e63b8556496373c820975850b50e28e0da903446a49ba516fd9f40e0101dd39cfa9a9b8dd143c9849c84a715bb5d7b SHA512 06329fdbd1d897aa99dc96900c6246457288c586d02bb4869a92dd2f97973f95acb3a2fa9598a20613ea029f816836a8e3b65e36fec2b807b5e7553141429ab9
 DIST xz-5.2.7.tar.gz.sig 566 BLAKE2B 00702dff24d655ebf30f2bf8bee94406e002164408b9eabb4f461a789482584c2b9c90675b8d1d5e030913e674946aa7392b73fcedf6ac62e3b1e3bc05bf92e6 SHA512 556e05107437fae2c75cc1a93465fce04426707e979403f41c6ee5b748fe7c3f985812a4e3b07785a84f68ef9d9f362ded470af1cceb9f4e8c80620a2699163f
+DIST xz-5.2.8.tar.gz 2118089 BLAKE2B 28d4ede071ebd04fe6ce6b9ba88245aca432c7b3077a4857a14310001cbd1230026888d1813b5c163b86de3ec78c92418d9cb35f867f1a8ea65e5de593091676 SHA512 aaba9e4dfabc1ccb66b92f5930ca07219089c7c02396be80bd727073f90c824d2698f7aaaf156b881fdc6750da993e8a6289929d71225df8327bc3beed5cdee1
+DIST xz-5.2.8.tar.gz.sig 566 BLAKE2B c3f20d6fabd42839c0265b9c5a308b43392705f4923f83e9aba808d5d2b03814b1af566c1ff078dc0a69143420a47e5ee0a0f8dcc6773595d1ee2a8e3922a88a SHA512 253c0877357cd7305f4c852cc2b946b196a4007b48b58824446729f8f2390f6465d6d2bb9087d1147a40a707940142a5eb7ada91f0323b95482b92eff05904f2
 DIST xz-5.3.3alpha.tar.gz 2119150 BLAKE2B 031e1a1556cbbd49565c2b72676e46a22c00e0e25bca2938c21d56f2d7f585c294d2a3a5712a3ae5d62fe8fef6e7b2f411fcc3c0ccac4714786209599b599d25 SHA512 c780c6854cb7599ed97629dbf923f5c6802b48e12aa25638c863e2403e56557abffb2b501823d4d53c852b7d09360b9ede355989756fef1daa1fa8cd9395da8d
 DIST xz-5.3.3alpha.tar.gz.sig 566 BLAKE2B 2a02fd8a84c27967384021aa879efdf598b40ca9ff552080be2d057f402b3aace13bb0d98574e0185edd6ee3084793767f9941d4c1f21f5c5d55f886025cb845 SHA512 e6a849f2dd6f67ad3d51f50fe5f3e7f2a57e97e9d89499e2f88b94ab9716f1db5de34c3bb6f17b6fd55498ee5f4653d3d25e1a495b9c682b3200b2603a85479f
--- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.8.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.8.ebuild
@ -0,0 +1,113 @@
+# Copyright 1999-2022 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="https://tukaani.org/xz/${MY_P}.tar.gz"
+	SRC_URI+=" 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 ~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 )"
+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)
+}
--- a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest
@ -1 +1,2 @@
 DIST adcli-0.9.1.tar.bz2 89684 BLAKE2B deaf6d3a13ad29c77a35b9f9c195dd646f384ad7c9782c15b50b26efceabae268bbb287d488ec7ed8d783d92ce7d8399f05898d30201d0d7fab7c0369c22fce1 SHA512 7e41fb51bfcb8837f9e5f6fd1fceacece0762c237dbc0f58dd581e2be8841d7a613d57507aea4534a66a2bd10ef4d01c4e04885437038c71238739db6e357d6e
+DIST adcli-0.9.2.tar.bz2 93680 BLAKE2B b5958b276ee43a0ee54aa922f27ed266d4e9fbd1c86e0c007dac9fcf9cc022e1b3ba043b782fceb00066be2577390773dc99fb8d476a6b5e6523d44d008fb667 SHA512 ae8414a0af389b6845dd92d41446a80a9dc1734b874175323c0e491d99944eab442b95ae6d3a29fc69638d2e73bf8d2c369f6fa50e9ed3968527444b78606286
--- a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.2.ebuild
@ -0,0 +1,35 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tool for performing actions on an Active Directory domain"
+HOMEPAGE="https://www.freedesktop.org/software/realmd/adcli/adcli.html"
+SRC_URI="https://gitlab.freedesktop.org/realmd/adcli/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	app-crypt/mit-krb5
+	net-nds/openldap:=[sasl]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		app-text/docbook-xml-dtd:4.3
+		app-text/xmlto
+		dev-libs/libxslt
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable doc)
+}
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest
@ -1,4 +1,5 @@
 DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
 DIST vim-9.0.0399.tar.gz 16833387 BLAKE2B f9d6588920b49ef32b82d012e1c4f8a34dc505267b67027a3b4302dd99d7987645c29a91fdb234fffa873b342488b4d9c85d05d3fe7a332042781881a61bea5e SHA512 6b261bf3aaa355e7a42de1785b134bccc51086495578730b9bc3b8e048679caa3a901e576a360cba5f1aa4d164c7f162a3f916e945b3f5f71e893ea30e0ca826
 DIST vim-9.0.0655.tar.gz 16804127 BLAKE2B e021ff4dd370cdd9b39fb9df0a12309215abd780ec297760b92b6caf924882465b28f9ba65d94ad75a229eb01c8f393f24a29a11919a96d78bb6fb45ef2971e3 SHA512 aa267941e835eecbeeffa7989fb525bdf4269f84d9c88d135a26d74ab7d025487863405b6e0f1391023c30193a122ed3e85a7a71bd4dc48058f3fe3377798f38
+DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch
@ -0,0 +1,28 @@
+https://github.com/vim/vim/pull/11496
+
+From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 03:18:23 +0000
+Subject: [PATCH] configure.ac: Fix -Wimplicit-int
+
+Clang 16 makes -Wimplicit-int an error by default. Fixes errors like:
+```
+error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Werror,-Wimplicit-int]
+```
+
+We already use proper declarations with every other test anyway, so
+let's be consistent.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/configure.ac
+++ b/src/configure.ac
+@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI only)
+ AC_MSG_CHECKING(for struct sigcontext)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ #include <signal.h>
+-test_sig()
+int test_sig()
+ {
+     struct sigcontext *scont;
+     scont = (struct sigcontext *)0;
+
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild
@ -0,0 +1,234 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim and app-editors/gvim
+
+VIM_VERSION="9.0"
+inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+S="${WORKDIR}/vim-${PV}"
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="nls acl minimal"
+
+# ncurses is only needed by ./configure, so no subslot operator required
+DEPEND=">=sys-libs/ncurses-5.2-r2:0"
+BDEPEND="sys-devel/autoconf"
+
+PATCHES=(
+	"${FILESDIR}"/vim-0.0.0828-configure-clang16.patch
+)
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See bug #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+		echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug #18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
+	eapply_user
+}
+
+src_configure() {
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	local myconf=(
+		--with-modified-by=Gentoo-${PVR}
+		--enable-gui=no
+		--without-x
+		--disable-darwin
+		--disable-perlinterp
+		--disable-pythoninterp
+		--disable-rubyinterp
+		--disable-gpm
+		--disable-selinux
+		$(use_enable nls)
+		$(use_enable acl)
+	)
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r6 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# install gvim icon since both vim/gvim desktop files reference it
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest
@ -1,4 +1,5 @@
 DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
 DIST vim-9.0.0399.tar.gz 16833387 BLAKE2B f9d6588920b49ef32b82d012e1c4f8a34dc505267b67027a3b4302dd99d7987645c29a91fdb234fffa873b342488b4d9c85d05d3fe7a332042781881a61bea5e SHA512 6b261bf3aaa355e7a42de1785b134bccc51086495578730b9bc3b8e048679caa3a901e576a360cba5f1aa4d164c7f162a3f916e945b3f5f71e893ea30e0ca826
 DIST vim-9.0.0655.tar.gz 16804127 BLAKE2B e021ff4dd370cdd9b39fb9df0a12309215abd780ec297760b92b6caf924882465b28f9ba65d94ad75a229eb01c8f393f24a29a11919a96d78bb6fb45ef2971e3 SHA512 aa267941e835eecbeeffa7989fb525bdf4269f84d9c88d135a26d74ab7d025487863405b6e0f1391023c30193a122ed3e85a7a71bd4dc48058f3fe3377798f38
+DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-0.0.0828-configure-clang16.patch
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-0.0.0828-configure-clang16.patch
@ -0,0 +1,28 @@
+https://github.com/vim/vim/pull/11496
+
+From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 03:18:23 +0000
+Subject: [PATCH] configure.ac: Fix -Wimplicit-int
+
+Clang 16 makes -Wimplicit-int an error by default. Fixes errors like:
+```
+error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Werror,-Wimplicit-int]
+```
+
+We already use proper declarations with every other test anyway, so
+let's be consistent.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/configure.ac
+++ b/src/configure.ac
+@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI only)
+ AC_MSG_CHECKING(for struct sigcontext)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ #include <signal.h>
+-test_sig()
+int test_sig()
+ {
+     struct sigcontext *scont;
+     scont = (struct sigcontext *)0;
+
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.ebuild
@ -0,0 +1,374 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="9.0"
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? ( ${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	~app-editors/vim-core-${PV}
+	!<app-editors/vim-core-8.2.4328-r1
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+	sys-devel/autoconf
+	lua? ( ${LUA_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+PATCHES=(
+	"${FILESDIR}"/vim-0.0.0828-configure-clang16.patch
+)
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+		echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+
+	eapply_user
+}
+
+src_configure() {
+
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug #57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug #24447). The hvc
+	# things are for ppc64, see bug #86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	local myconf=()
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-canberra
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			$(use_enable sound canberra)
+			$(use_enable acl)
+			$(use_enable crypt libsodium)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python python3interp)
+			$(use_with python python3-command "${PYTHON}")
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		if use lua; then
+			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+			# deprecated (in 5.1) luaL_openlib API (#874690)
+			use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
+			myconf+=(
+				--enable-luainterp
+				$(use_with lua_single_target_luajit luajit)
+				--with-lua-prefix="${EPREFIX}/usr"
+			)
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if tc-is-cross-compiler ; then
+		export vim_cv_getcwd_broken=no \
+			   vim_cv_memmove_handles_overlap=yes \
+			   vim_cv_stat_ignores_slash=yes \
+			   vim_cv_terminfo=yes \
+			   vim_cv_toupper_broken=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Arch and opensuse seem to do this and at this point, I'm willing
+	# to try anything to avoid random test hangs!
+	export TERM=xterm
+
+	# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
+	# for more information on test variables we can use.
+	# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
+	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
+	#
+	# Skipped tests:
+	# - Test_expand_star_star
+	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
+	# - Test_exrc
+	# Looks in wrong location? (bug #742710)
+	# - Test_job_tty_in_out
+	# Fragile and depends on TERM(?)
+	# - Test_spelldump_bang
+	# Hangs.
+	# - Test_fuzzy_completion_env
+	# Too sensitive to leaked environment variables.
+	# - Test_term_mouse_multiple_clicks_to_select_mode
+	# Hangs.
+	# - Test_spelldump
+	# Hangs.
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)'
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug #187449)
+eselect_vi_update() {
+	ebegin "Calling eselect vi update"
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	domenu runtime/vim.desktop
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
--- a/sdk_container/src/third_party/portage-stable/changelog/security/2022-11-15-weekly-updates.md
+++ b/sdk_container/src/third_party/portage-stable/changelog/security/2022-11-15-weekly-updates.md
@ -0,0 +1 @@
+- vim ([CVE-2022-3705](https://nvd.nist.gov/vuln/detail/CVE-2022-3705))
--- a/sdk_container/src/third_party/portage-stable/changelog/updates/2022-11-15-weekly-updates.md
+++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-11-15-weekly-updates.md
@ -0,0 +1,3 @@
+- libcap ([2.66](https://sites.google.com/site/fullycapable/release-notes-for-libcap#h.d9ygdose5kw))
+- vim ([9.0.0828](https://github.com/vim/vim/releases/tag/v9.0.0828))
+- glib ([2.74.1](https://gitlab.gnome.org/GNOME/glib/-/tags/2.74.1))
--- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.80.0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.80.0-r1.ebuild
@ -0,0 +1,343 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122
+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 ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!<dev-libs/leatherman-1.12.0-r1
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/b2-4.9.2"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.80.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.79.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch
+	# Boost.MPI's __init__.py doesn't work on Py3
+	"${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch
+	"${FILESDIR}"/${PN}-1.80.0-fix-mips1-transition.patch
+	# (upstreamed)
+	"${FILESDIR}"/${PN}-1.80.0-unordered-fix.patch
+	"${FILESDIR}"/${PN}-1.80.0-unary-function.patch
+	"${FILESDIR}"/${PN}-1.80.0-python3.11.patch
+	"${FILESDIR}"/${PN}-1.80.0-unordered-ftm-malloc.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" <archiver>"$(tc-getAR)" <ranlib>"$(tc-getRANLIB)" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	# We don't want to end up with -L/usr/lib on our linker lines
+	# which then gives us lots of
+	#   skipping incompatible /usr/lib/libc.a when searching for -lc
+	# warnings
+	[[ -n ${ESYSROOT} ]] && local icuarg="-sICU_PATH=${ESYSROOT}/usr"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "${icuarg}" '--disable-icu boost.locale.icu=off')
+		$(usev !mpi --without-mpi)
+		$(usev !nls --without-locale)
+		$(usev !context '--without-context --without-coroutine --without-fiber')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/b2/src
+		--layout=system
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=shared
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++17 globally as of 1.80
+	append-cxxflags -std=c++17
+}
+
+multilib_src_compile() {
+	ejam \
+		--prefix="${EPREFIX}"/usr \
+		"${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			--prefix="${EPREFIX}"/usr \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		--prefix="${ED}"/usr \
+		--includedir="${ED}"/usr/include \
+		--libdir="${ED}"/usr/$(get_libdir) \
+		"${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				python_moduleinto boost
+				python_domodule "${S}"/libs/mpi/build/__init__.py
+
+				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
+				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
+
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+pkg_preinst() {
+	# Yay for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the Boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
--- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.80.0-python3.11.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.80.0-python3.11.patch
@ -0,0 +1,33 @@
+https://github.com/boostorg/python/commit/a218babc8daee904a83f550fb66e5cb3f1cb3013
+https://github.com/boostorg/python/pull/385
+
+From a218babc8daee904a83f550fb66e5cb3f1cb3013 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Mon, 25 Apr 2022 10:51:46 +0200
+Subject: [PATCH] Fix enum_type_object type on Python 3.11
+
+The enum_type_object type inherits from PyLong_Type which is not tracked
+by the GC. Instances doesn't have to be tracked by the GC: remove the
+Py_TPFLAGS_HAVE_GC flag.
+
+The Python C API documentation says:
+
+    "To create a container type, the tp_flags field of the type object
+    must include the Py_TPFLAGS_HAVE_GC and provide an implementation of
+    the tp_traverse handler."
+
+https://docs.python.org/dev/c-api/gcsupport.html
+
+The new exception was introduced in Python 3.11 by:
+https://github.com/python/cpython/issues/88429
+--- a/libs/python/src/object/enum.cpp
+++ b/libs/python/src/object/enum.cpp
+@@ -113,7 +113,6 @@ static PyTypeObject enum_type_object = {
+ #if PY_VERSION_HEX < 0x03000000
+     | Py_TPFLAGS_CHECKTYPES
+ #endif
+-    | Py_TPFLAGS_HAVE_GC
+     | Py_TPFLAGS_BASETYPE,                  /* tp_flags */
+     0,                                      /* tp_doc */
+     0,                                      /* tp_traverse */
+
--- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.80.0-unordered-ftm-malloc.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/files/boost-1.80.0-unordered-ftm-malloc.patch
@ -0,0 +1,21 @@
+https://github.com/boostorg/align/commit/5ad7df63cd792fbdb801d600b93cad1a432f0151
+https://github.com/boostorg/align/pull/19
+
+From 5ad7df63cd792fbdb801d600b93cad1a432f0151 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira=20Rolim?=
+ <34201958+ericonr@users.noreply.github.com>
+Date: Fri, 11 Nov 2022 18:29:45 -0300
+Subject: [PATCH] Don't use FTMs to determine implementation choice
+
+--- a/boost/align/aligned_alloc.hpp
+++ b/boost/align/aligned_alloc.hpp
+@@ -38,7 +38,7 @@ Distributed under the Boost Software License, Version 1.0.
+ #include <boost/align/detail/aligned_alloc_posix.hpp>
+ #elif defined(sun) || defined(__sun)
+ #include <boost/align/detail/aligned_alloc_sunos.hpp>
+-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
+#elif defined(_POSIX_VERSION)
+ #include <boost/align/detail/aligned_alloc_posix.hpp>
+ #else
+ #include <boost/align/detail/aligned_alloc.hpp>
+
--- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.1-gnome-keyring-cpu.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.1-gnome-keyring-cpu.patch
@ -0,0 +1,131 @@
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3029
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039 (backport PR we've used)
+https://bugs.gentoo.org/878995
+https://bugs.gentoo.org/878351
+
+From e2f283d7c8c5ab3aeb2f281a27ec7c0f24b86868 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 28 Oct 2022 11:21:04 -0400
+Subject: [PATCH 1/2] Revert "Handling collision between standard i/o file
+ descriptors and newly created ones"
+
+g_unix_open_pipe tries to avoid the standard io fd range
+when getting pipe fds. This turns out to be a bad idea because
+certain buggy programs rely on it using that range.
+
+This reverts commit d9ba6150909818beb05573f54f26232063492c5b
+--- a/glib/glib-unix.c
+++ b/glib/glib-unix.c
+@@ -108,17 +108,6 @@ g_unix_open_pipe (int     *fds,
+     ecode = pipe2 (fds, pipe2_flags);
+     if (ecode == -1 && errno != ENOSYS)
+       return g_unix_set_error_from_errno (error, errno);
+-    /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
+-    else if (fds[0] < 3 || fds[1] < 3)
+-      {
+-        int old_fds[2] = { fds[0], fds[1] };
+-        gboolean result = g_unix_open_pipe (fds, flags, error);
+-        close (old_fds[0]);
+-        close (old_fds[1]);
+-
+-        if (!result)
+-          g_unix_set_error_from_errno (error, errno);
+-      }
+     else if (ecode == 0)
+       return TRUE;
+     /* Fall through on -ENOSYS, we must be running on an old kernel */
+@@ -127,19 +116,6 @@ g_unix_open_pipe (int     *fds,
+   ecode = pipe (fds);
+   if (ecode == -1)
+     return g_unix_set_error_from_errno (error, errno);
+-  /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
+-  else if (fds[0] < 3 || fds[1] < 3)
+-    {
+-      int old_fds[2] = { fds[0], fds[1] };
+-      gboolean result = g_unix_open_pipe (fds, flags, error);
+-      close (old_fds[0]);
+-      close (old_fds[1]);
+-
+-      if (!result)
+-        g_unix_set_error_from_errno (error, errno);
+-
+-      return result;
+-    }
+ 
+   if (flags == 0)
+     return TRUE;
+GitLab
+From 4526620d8c485f5dfba6ddca33f91670982f82eb Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 31 Oct 2022 09:17:55 -0400
+Subject: [PATCH 2/2] glib-unix: Add test to make sure g_unix_open_pipe will
+ intrude standard range
+
+Now that we know it's a bad idea to avoid the standard io fd range
+when getting pipe fds for g_unix_open_pipe, we should test to make sure
+we don't inadvertently try to do it again.
+
+This commit adds that test.
+--- a/glib/tests/unix.c
+++ b/glib/tests/unix.c
+@@ -24,8 +24,11 @@
+ #include "config.h"
+ 
+ #include "glib-unix.h"
+#include "gstdio.h"
+
+ #include <string.h>
+ #include <pwd.h>
+#include <unistd.h>
+ 
+ static void
+ test_pipe (void)
+@@ -52,6 +55,39 @@ test_pipe (void)
+   g_assert (g_str_has_prefix (buf, "hello"));
+ }
+ 
+static void
+test_pipe_stdio_overwrite (void)
+{
+  GError *error = NULL;
+  int pipefd[2], ret;
+  gboolean res;
+  int stdin_fd;
+
+  stdin_fd = dup (STDIN_FILENO);
+  g_assert_cmpint (stdin_fd, >, 0);
+
+  g_close (STDIN_FILENO, &error);
+  g_assert_no_error (error);
+
+  res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error);
+  g_assert_no_error (error);
+  g_assert_true (res);
+
+  g_assert_cmpint (pipefd[0], ==, STDIN_FILENO);
+
+  g_close (pipefd[0], &error);
+  g_assert_no_error (error);
+
+  g_close (pipefd[1], &error);
+  g_assert_no_error (error);
+
+  ret = dup2 (stdin_fd, STDIN_FILENO);
+  g_assert_cmpint (ret, >=, 0);
+
+  g_close (stdin_fd, &error);
+  g_assert_no_error (error);
+}
+
+ static void
+ test_error (void)
+ {
+@@ -337,6 +373,7 @@ main (int   argc,
+   g_test_init (&argc, &argv, NULL);
+ 
+   g_test_add_func ("/glib-unix/pipe", test_pipe);
+  g_test_add_func ("/glib-unix/pipe-stdio-overwrite", test_pipe_stdio_overwrite);
+   g_test_add_func ("/glib-unix/error", test_error);
+   g_test_add_func ("/glib-unix/nonblocking", test_nonblocking);
+   g_test_add_func ("/glib-unix/sighup", test_sighup);
+GitLab
--- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1-r1.ebuild
@ -0,0 +1,288 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	elf? ( virtual/libelf:0= )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.74.0-crash-gparamspec.patch
+	"${FILESDIR}"/${P}-gnome-keyring-cpu.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	default
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		$(meson_native_use_feature elf libelf)
+		-Dmultiarch=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	export TZ=UTC
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# https://bugs.gentoo.org/839807
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /usr/b
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.74.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.74.0.ebuild
@ -11,7 +11,7 @@ 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"
+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:
--- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild
@ -15,7 +15,7 @@ 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"
+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="
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest
@ -1,4 +1,3 @@
-DIST libxml2-2.10.2.tar.xz 2636304 BLAKE2B 3ccc11ac73a81ee7ea3e565597c95e74923eba3d858c9a915aecf1dcf2fb6ab3e46c6ed2ea504261a822de2ac2132834ffa8ffd039e9e1390a9637a2dac7d6c5 SHA512 c26ee428ae2fae2326fcaec156ed36c5f5d63aeb4839d626f6544a3fad158a1602e9dc0d542b2f947e6a8de0c09ff130da2626a30aec27446ce09614f78466b5
 DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.2.ebuild
@ -1,194 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: Please bump in sync with dev-libs/libxslt
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit flag-o-matic python-r1 multilib-minimal
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20130923.tar.gz"
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
-	inherit autotools git-r3
-else
-	inherit gnome.org libtool
-	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
-
-SRC_URI+="
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
-	)"
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-LICENSE="MIT"
-SLOT="2"
-IUSE="debug examples +ftp icu lzma +python readline static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} == 9999 ]] ; then
-	BDEPEND+=" dev-util/gtk-doc-am"
-fi
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		local tarname=${P/_rc/-rc}.tar.xz
-
-		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
-		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-		unpack ${tarname}
-
-		if [[ -n ${PATCHSET_VERSION} ]] ; then
-			unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
-		fi
-	fi
-
-	cd "${S}" || die
-
-	if use test ; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		# Please do not remove, as else we get references to PORTAGE_TMPDIR
-		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	# Filter seemingly problematic CFLAGS (bug #26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# Notes:
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--enable-ipv6 \
-			$(use_with ftp) \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	# Build python bindings separately
-	libxml2_configure --without-python
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_configure --with-python
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}"/python >/dev/null || die
-
-	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
-
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python ; then
-		NATIVE_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl run_in_build_dir libxml2_py_emake all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-
-	emake check
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
-
-	# Hack until automake release is made for the optimise fix
-	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
-	multilib_is_native_abi && use python && python_foreach_impl python_optimize
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ -n "${ROOT}" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# Need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# We don't want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e "${CATALOG}" ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
--- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest
@ -5,3 +5,7 @@ DIST cmake-3.24.2-SHA-256.txt 1646 BLAKE2B 3c48226c96844c5ddd8567637a61eca697425
 DIST cmake-3.24.2-SHA-256.txt.asc 833 BLAKE2B fe6a3caa3db7b6be186e49ee5d86706f2cda9a45858bc964be5407f577195d0af74c10e66ea30faa0a35280f1c9f927732f9cc7fcb9dae8e521882955b6ef617 SHA512 a0fa1a002f2f23e8b3b8fb2689905ac618ca423b96f904bee172d6a62e6fb0c0a46394ce57474be9c9810e1d09abf3b192f595cb0e92d5c62d11b60f0c572b82
 DIST cmake-3.24.2-docs.tar.xz 492188 BLAKE2B 64e0d69ce8e739e6622b0cfde8956cb2bf67f9bf412b8d98afa1657bd30d8a2a1cf874e6422c78c222199616aac85d472ef398c83da29d5d64516384e9ed69aa SHA512 d0ef81dfe37ac2a225fe795fd3e6780e3b8fd5caa472a14ff8d036917172efd13126897c7a2a78d8269aa20e4f35c7b9be7bed14ecbfb24df332c332a4ff16c4
 DIST cmake-3.24.2.tar.gz 10396126 BLAKE2B fcfdbbce94ce6cdb3fa478afe591bc63ba25104a32edc3dd9395d7b6bd16e222f41428ef4f9982061d6d1e69b10efbc2a33cc9df4573400612b4b756b80ec348 SHA512 6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674
+DIST cmake-3.24.3-SHA-256.txt 1646 BLAKE2B 739503a16c2e333c9b05a3232e2dcc56105f6933414a4a2054a582b9cf53a12c2b1a37d2189077cbcd138b8cc2828ef1819ab0fc74ded926ef0df7c7ea8c79e1 SHA512 b670acc21b98d1da22b31743f83ba10d6dbfda60341457a02639ee6f15d50462ddcd90b5992eff275d77e7cce6f074aff72abd95c539d18f191682ad87d7884e
+DIST cmake-3.24.3-SHA-256.txt.asc 833 BLAKE2B f8797072c2d30facfbbebc972c68cd1a6510331e63c67e6b665bd97dd9013e354bab68e03d578698d2f9e50c173ff8e1cac40751c7a3645be294a717f4bfee3a SHA512 bc67eaf6dba935df85ae3d7c37600259b032579813b275087332d5cc4c72dd6bdf44762260729a15f237f69f772670291bb2f2dcc4b155fb17112e0e8fa01d6b
+DIST cmake-3.24.3-docs.tar.xz 492156 BLAKE2B 92edd031189673c46e8e13a5e1200917734b918651dc01d982c25602e48cd5d5f014fa8563bdc79b3d09d90ef07a52c9d5a570a5181c59c233ba5bf450cdd5df SHA512 75806743fca976098b9b7ee777c494478142ab5686dc8ccb18510b5938c7e88cf8b3bc47321022f55f33c04bb0a7f549d70be8c765d1ec143467e679c8863132
+DIST cmake-3.24.3.tar.gz 10399876 BLAKE2B 24e2ff8cf4f63ba182dd305c14367fa0163f6187da84f7ec10b1ad6241c7df5b48f329b67ba5f7b5d3b644cba89c7adb848a3ae7196bf5b4dbfaedf178dba250 SHA512 57edf2a8c1c9edeed7fd11271083f333d940b31e0e909d9c71671465961559c505e4e22f36e68bfe1a40a01eb05fe94bc8d37b062f9be613f959f864207e3764
--- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild
@ -0,0 +1,293 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+if [[ ${PV} == 9999 ]] ; then
+	CMAKE_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	if [[ ${PV} != *_rc* ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
+		inherit verify-sig
+
+		SRC_URI+=" verify-sig? (
+			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
+			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"
+
+		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
+	fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CMake"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND+="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# Prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# Handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# Respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+		default
+	else
+		cd "${DISTDIR}" || die
+
+		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
+		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
+		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
+
+		cd "${WORKDIR}" || die
+
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+
+		# Disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# Disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# Don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	# ODR warnings, bug #858335
+	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	# Fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+	local myctestargs=(
+		--output-on-failure
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
+	)
+
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"

 LICENSE="LGPL-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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"

 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.1.ebuild
@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

-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"

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

 inherit bash-completion-r1 distutils-r1 toolchain-funcs
--- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest
@ -1,2 +1,3 @@
 DIST patchelf-0.15.0.tar.gz 125803 BLAKE2B 08fc2cffd7d9e835c01c828c16762fb0b3c3e422990f2d0028a65a3e0ec849d01bdef699b6f68afa6bf307e34f5e76121fc94460793c95c055552e1d8a68d772 SHA512 3b2d3d6458be5b2d43cd2878dfb1a185a95cc13cd4c94abd0ee79979afb36f46e347acc292b8d9c2954a342b7291774e6a1b63930e9f90a1cf4179ec075ab046
 DIST patchelf-0.16.1.tar.gz 132450 BLAKE2B 047fe9900eff3a4fef19550b49ea3c53dc8fc77c1d110888af39362dce745c3568e493f91d96cd35d73291da8e0cf4f10121162f4e8a32d43a3c014716477a4c SHA512 62475b942ff07c2eb225760d69eab99af4e9aa14ca51aeb3b7d53a6a1943b02acffc1b2059d985a921f5af7bbaf40a096b8cdf592979260e1e2602db02e7f247
+DIST patchelf-0.17.0.tar.gz 143684 BLAKE2B ef32baae1d1e07c77442878977693849e2dd3d5c1c1b8d53eb54ee7b1b78eb77ebcf87cbd7caa683f0043e6d7b90ca2593968e9c95b0902e45c4634823be196b SHA512 0db2294cc16a919a84a1bb71194b3ed7a87bb669f684e4cc0943b33899d69690097c59d5c9f8e631bc1b4136db7f10f7cb0fbb1c96912aee567a0fd7dc9c9588
--- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.0.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
+HOMEPAGE="https://github.com/NixOS/patchelf"
+SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
+LICENSE="GPL-3"
+
+src_prepare() {
+	default
+	rm src/elf.h || die
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac || die
+
+	eautoreconf
+}
--- a/sdk_container/src/third_party/portage-stable/eclass/git-r3.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/git-r3.eclass
@ -887,6 +887,11 @@ git-r3_checkout() {
 			cp "${orig_repo}"/packed-refs "${GIT_DIR}"/packed-refs || die
 		fi

+		# mark this directory as "safe" so that src_install() can access it
+		# https://bugs.gentoo.org/879353
+		git config --global --add safe.directory \
+			"$(cd "${out_dir}" && echo "${PWD}")" || die
+
 		# (no need to copy HEAD, we will set it via checkout)

 		if [[ -f ${orig_repo}/shallow ]]; then
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
@ -100,6 +100,12 @@ tc_version_is_between() {
 # @DESCRIPTION:
 # Indicate the developer who hosts the patchset for an ebuild.

+# @ECLASS_VARIABLE: TOOLCHAIN_SPHINX_BUILD
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Indicate if Sphinx is needed for this build. Enabled by default for
+# >= 13.*.9999 (this is when upstream changed their docs from texinfo->sphinx).
+
 # @ECLASS_VARIABLE: GCC_PV
 # @INTERNAL
 # @DESCRIPTION:
@ -289,7 +295,8 @@ fi

 #---->> DEPEND <<----

-RDEPEND="sys-libs/zlib
+RDEPEND="
+	sys-libs/zlib
 	virtual/libiconv
 	nls? ( virtual/libintl )
 "
@ -320,10 +327,18 @@ BDEPEND="
 	test? (
 		>=dev-util/dejagnu-1.4.4
 		>=sys-devel/autogen-5.5.4
-	)"
+	)
+"
 DEPEND="${RDEPEND}"

+# Snapshots don't contain info or man pages.
 if [[ ${PN} == gcc && ${PV} == *_p* ]] ; then
+	# >= GCC 13 needs sphinx to generate the info and man pages.
+	# It still uses texinfo as well.
+	if [[ -n ${TOOLCHAIN_SPHINX_BUILD} ]] ; then
+		BDEPEND+=" dev-python/sphinx"
+	fi
+
 	# Snapshots don't contain info pages.
 	# If they start to, adjust gcc_cv_prog_makeinfo_modern logic in toolchain_src_configure.
 	# Needed unless/until https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106899 is fixed
--- a/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass
@ -141,6 +141,9 @@ verify-sig_verify_detached() {
 	einfo "Verifying ${filename} ..."
 	case ${VERIFY_SIG_METHOD} in
 		openpgp)
+			# gpg can't handle very long TMPDIR
+			# https://bugs.gentoo.org/854492
+			local -x TMPDIR=/tmp
 			gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
 				gpg --verify "${sig}" "${file}" ||
 				die "PGP signature verification failed"
@ -190,6 +193,9 @@ verify-sig_verify_message() {
 	einfo "Verifying ${filename} ..."
 	case ${VERIFY_SIG_METHOD} in
 		openpgp)
+			# gpg can't handle very long TMPDIR
+			# https://bugs.gentoo.org/854492
+			local -x TMPDIR=/tmp
 			gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
 				gpg --verify --output="${output_file}" "${file}" ||
 				die "PGP signature verification failed"
--- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.85.0-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.85.0-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz

 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
 IUSE+=" nghttp3 quiche"
--- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz

 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
 IUSE+=" nghttp3 quiche"
@ -112,10 +112,11 @@ multilib_src_configure() {
 	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
 	local myconf=()

-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl )
 	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
 	#myconf+=( --without-default-ssl-backend )
 	if use ssl ; then
+		myconf+=( -without-gnutls --without-mbedtls --without-nss )
+
 		if use gnutls || use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
 			myconf+=( --with-gnutls --with-nettle )
@ -150,6 +151,7 @@ multilib_src_configure() {
 		fi

 	else
+		myconf+=( --without-ssl )
 		einfo "SSL disabled"
 	fi

--- a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask
@ -1,10 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-# matoro <matoro_gentoo@matoro.tk> (2022-09-30)
-# Per Sam: avoid app-emacs/flycheck deptree, bug #873541
-dev-util/pkgcheck emacs
-
 # matoro <matoro_gentoo@matoro.tk> (2022-09-22)
 # Unable to test due to mask, bug #763963
 net-misc/openntpd constraints
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask
@ -91,7 +91,6 @@ games-rpg/dungeon-defenders
 games-rpg/eschalon-book-1-demo
 games-rpg/wasteland2
 games-server/etqw-ded
-games-simulation/bcs-demo
 games-strategy/darwinia
 games-strategy/darwinia-demo
 games-strategy/defcon-demo
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
@ -220,7 +220,7 @@ dev-util/catalyst -system-bootloader
 # Ilya Tumaykin <itumaykin+gentoo@gmail.com> (2018-06-17)
 # Vulkan support is only available on few selected arches atm.
 # Mask everywhere, unmask where appropriate.
-media-video/mpv -vulkan
+media-video/mpv -libplacebo -vulkan

 # Richard Yao <ryao@gentoo.org> (2018-04-16)
 # sys-fs/zfs is keyworded on amd64
--- 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
@ -176,3 +176,4 @@ sys-apps/yarn
 www-apps/jekyll-coffeescript
 www-apps/kibana-bin
 www-client/chromium
+>=www-apps/redmine-5.0.2
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask
@ -5,10 +5,6 @@
 # pandoc not keyworded here, bug #878355
 app-admin/conky doc

-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-08-09)
-# dev-java/jaxws-api not keyworded
->=dev-java/jmock-2.12.0 test
-
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2022-09-16)
 # dev-libs/optix depends on x11-drivers/nvidia-drivers,
 # which lacks arm support
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask
@ -1,10 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-08-09)
-# dev-java/jaxws-api not keyworded
->=dev-java/jmock-2.12.0 test
-
 # Alexey Shvetsov <alexxy@gentoo.org> (2022-09-15)
 # Mask nvml use flag for slurm
 sys-cluster/slurm nvml
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask
@ -214,7 +214,7 @@ dev-util/catalyst system-bootloader
 # Ilya Tumaykin <itumaykin+gentoo@gmail.com> (2018-06-17)
 # Vulkan support is only available on few selected arches atm.
 # Mask everywhere, unmask where appropriate.
-media-video/mpv vulkan
+media-video/mpv libplacebo vulkan

 # Richard Yao <ryao@gentoo.org> (2018-04-16)
 # sys-fs/zfs is not available everywhere.
--- 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,11 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.

+# Conrad Kostecki <conikost@gentoo.org> (2022-11-01)
+# Mask tests, as not all needed deps are available on this arch.
+# See #878933 for progress.
+net-dns/ddclient test
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-08-15)
 # deps not keyworded
 dev-util/pkgcheck emacs
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask
@ -17,6 +17,10 @@

 #--- END OF EXAMPLES ---

+# Michał Górny <mgorny@gentoo.org> (2022-11-06)
+# Unmask the target on python-exec while it's masked elsewhere.
+dev-lang/python-exec -python_targets_python3_11
+
 # Sam James <sam@gentoo.org> (2022-02-02)
 # net-analyzer/net-snmp is not marked stable on HPPA
 net-analyzer/ifstat snmp
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask
@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask

+# Sam James <sam@gentoo.org> (2022-11-08)
+# Mask until dev-lang/python:3.11 becomes stable.
+python_targets_python3_11
+python_single_target_python3_11
+
 # Rolf Eike Beer <eike@sf-mail.de> (2021-11-12)
 # dev-libs/nspr and dev-libs/nss are not stable on hppa
 nss
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask
@ -1,6 +1,10 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Ionen Wolkens <ionen@gentoo.org> (2022-11-04)
+# media-libs/libffado is not keyworded here yet.
+media-sound/jack2 ieee1394
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-10-04)
 # Sanitizers partially supported on this architecture.
 #
@ -36,7 +40,7 @@ sys-block/fio -io-uring -zbc
 # WANG Xuerui <xen0n@gentoo.org> (2022-04-18)
 # We never had non-deprecated libcrypt support from glibc, so disable compat
 # from libxcrypt for a world without libcrypt.so.1
->=sys-libs/libxcrypt-4.4.23-r1 compat
+sys-libs/libxcrypt compat

 # WANG Xuerui <xen0n@gentoo.org> (2022-04-18)
 # Catalyst has support for assembling bootloader on this arch
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask
@ -1,6 +1,10 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# WANG Xuerui <xen0n@gentoo.org> (2022-11-01)
+# qtwebengine isn't available on loong yet
+webengine
+
 # Unmask the flag which corresponds to ARCH.
 -loong

--- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask
@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Conrad Kostecki <conikost@gentoo.org> (2022-11-01)
+# Mask tests, as not all needed deps are available on this arch.
+# See #878933 for progress.
+net-dns/ddclient test
+
 # Mike Gilbert <floppym@gentoo.org> (2022-10-16)
 # Only supported on MIPS.
 dev-lang/gnat-gpl -fixed-point
--- 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
@ -13,10 +13,6 @@ media-gfx/geeqie heif
 # dev-cpp/notcurses not keyworded here
 media-sound/snd notcurses

-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-08-09)
-# dev-java/jaxws-api not keyworded
->=dev-java/jmock-2.12.0 test
-
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-09-23)
 # Only PyQt5 is keyworded on pcc64 at the moment.
 # Mask the other Qt4Python implementations
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask
@ -17,6 +17,10 @@

 #--- END OF EXAMPLES ---

+# Michał Górny <mgorny@gentoo.org> (2022-11-06)
+# Unmask the target on python-exec while it's masked elsewhere.
+dev-lang/python-exec -python_targets_python3_11
+
 # Sam James <sam@gentoo.org> (2021-10-25)
 # Various unstable dependencies:
 # gnome-base/nautilus
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask
@ -17,6 +17,10 @@

 #--- END OF EXAMPLES ---

+# Michał Górny <mgorny@gentoo.org> (2022-11-06)
+# Unmask the target on python-exec while it's masked elsewhere.
+dev-lang/python-exec -python_targets_python3_11
+
 # Sam James <sam@gentoo.org> (2022-07-27)
 # sys-devel/lld is not marked stable on ppc
 >=dev-lang/spidermonkey-78 lto
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/use.stable.mask
@ -1,6 +1,11 @@
 # Copyright 2014-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Sam James <sam@gentoo.org> (2022-11-08)
+# Mask until dev-lang/python:3.11 becomes stable.
+python_targets_python3_11
+python_single_target_python3_11
+
 # Sam James <sam@gentoo.org> (2022-03-03)
 # dev-lang/ocaml and dev-ml/* not marked stable here
 ocaml
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.mask
@ -1,6 +1,10 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Joonas Niilola <juippis@gentoo.org> (2022-11-10)
+# Doesn't work on ppc64, #871921
+sci-mathematics/gmp-ecm custom-tune
+
 # Michał Górny <mgorny@gentoo.org> (2021-12-31)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
@ -51,7 +55,7 @@ dev-qt/qtdeclarative -vulkan
 dev-qt/qtgui -vulkan
 dev-qt/qtwayland -vulkan
 media-libs/mesa -vulkan -vulkan-overlay
-media-video/mpv -vulkan
+media-video/mpv -libplacebo -vulkan
 media-video/vlc -libplacebo

 # Robin H. Johnson <robbat2@gentoo.org> (2019-12-06)
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.force
@ -1,6 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Georgy Yakovlev <gyakovlev@gentoo.org> (2022-11-10)
+# fails with bundled png, so force system one.
+# ld.lld: error: undefined symbol: png_init_filter_functions_vsx
+www-client/chromium system-png
+
 # Samuli Suominen <ssuominen@gentoo.org> (2012-10-30)
 # Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-plasma/kdm gets
 # stable keyword, this line can be removed.
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 # This file requires eapi 5 or later. New entries go on top.
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.force
@ -1,6 +1,10 @@
 # Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Georgy Yakovlev <gyakovlev@gentoo.org> (2022-11-13)
+# 1.64 segfaults, so we force 1.65 bootstrapping 1.65
+~dev-lang/rust-1.65.0 system-bootstrap
+
 # matoro <matoro_gentoo@matoro.tk> (2022-09-10)
 # GHC does not support native codegen for riscv at all.
 # It gains LLVM codegen in 9.2, but we maintain a backport of this,
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask
@ -1,6 +1,10 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Michał Górny <mgorny@gentoo.org> (2022-11-06)
+# Unmask the target on python-exec while it's masked elsewhere.
+dev-lang/python-exec -python_targets_python3_11
+
 # Sam James <sam@gentoo.org> (2022-09-12)
 # dev-lang/rust lacks wiring up to use our custom rust-bin bootstrap
 # tarball, so force system-bootstrap instead (i.e. force using rust-bin
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask
@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask

+# Sam James <sam@gentoo.org> (2022-11-08)
+# Mask until dev-lang/python:3.11 becomes stable.
+python_targets_python3_11
+python_single_target_python3_11
+
 # Matt Turner <mattst88@gentoo.org> (2022-09-16)
 # gui-libs/gtk is not stable here
 gtk4
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask
@ -1,6 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-08-19)
-# dev-java/hamcrest:0 is not keyworded
->=dev-java/jmock-2.12.0
+# Viorel Munteanu <ceamac@gentoo.org> (2022-11-04)
+# Upstream dropped the x86 build.  Bug #879519
+# Removal on 2022-12-04.
+net-im/mattermost-desktop-bin
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask
@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Ionen Wolkens <ionen@gentoo.org> (2022-11-07)
+# media-libs/libplacebo is keyworded here and vulkan is usable
+media-video/mpv -libplacebo -vulkan
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-10-07)
 # sys-libs/libsmbios is available here.
 app-laptop/pbbuttonsd -macbook
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask
@ -17,6 +17,10 @@

 #--- END OF EXAMPLES ---

+# Michał Górny <mgorny@gentoo.org> (2022-11-06)
+# Unmask the target on python-exec while it's masked elsewhere.
+dev-lang/python-exec -python_targets_python3_11
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2022-09-14)
 # sci-libs/vtk is not stable on x86 and we don't want to complicate
 # newer maxima stabilisation, bug #867547
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask
@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask

+# Sam James <sam@gentoo.org> (2022-11-08)
+# Mask until dev-lang/python:3.11 becomes stable.
+python_targets_python3_11
+python_single_target_python3_11
+
 # Sam James <sam@gentoo.org> (2020-11-10)
 # media-gfx/openvdb is not stable on x86
 # ... and has failing tests right now anyway
--- a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults
@ -104,6 +104,12 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 # Updated to include ruby27 on 2021-10-10
 RUBY_TARGETS="ruby27"

+# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-10-22)
+# These USE flags are what is common between the various sub-profiles. Stages 2
+# and 3 are built against these, so be careful what you add.
+# Moved here from releases/
+USE="acl bzip2 gdbm nptl unicode"
+
 # Enable extended filesystem attribute support by default.
 # https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
 USE="${USE} xattr"
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force
@ -130,7 +130,7 @@ sys-kernel/vanilla-kernel initramfs
 # distribution and rely on external providers like libxcrypt.
 # Here we are following that path too.
 <sys-libs/glibc-2.33-r2 crypt
->=sys-libs/libxcrypt-4.4.23-r1 system compat
+sys-libs/libxcrypt system compat

 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # <dev-scheme/guile-2 is package.mask'd, so force USE=guile2
@ -142,6 +142,11 @@ media-sound/lilypond guile2
 # to have a compiler not capable of C++, bug #692126.
 sys-devel/gcc cxx

+# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-27)
+# Force default-PIE build on 17.0 profiles and later.
+# Moved here from releases/17.0 (2022-10-22)
+sys-devel/gcc pie
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2019-04-14)
 # Make sure glibc static libs are installed for now. Not installing
 # them is an experimental feature and needs testing.
--- 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
@ -486,7 +486,6 @@ dev-python/statsmodels doc
 # distribution and rely on external providers like libxcrypt.
 # Here we are following that path too.
 >=sys-libs/glibc-2.33-r2 crypt
-<sys-libs/libxcrypt-4.4.23-r1 split-usr system

 # Craig Andrews <candrews@gentoo.org> (2019-09-12)
 # OpenSSL (as of version 1.1.1) doesn't have APIs for QUIC support
@ -639,10 +638,6 @@ sci-libs/linux-gpib php
 # Mask ruby20-only compatible packages
 ~media-libs/libcaca-0.99_beta19 ruby

-# Matthias Maier <tamiko@gentoo.org> (2017-05-11)
-# Globally mask pie use flag. Selectively unmask on specific profiles.
-sys-devel/gcc pie
-
 # Mike Gilbert <floppym@gentoo.org> (2017-02-16)
 # Multiple test failures.
 sys-boot/grub:2 test
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask

+# Michał Górny <mgorny@gentoo.org> (2022-11-06)
+# Unmask the target on python-exec while it's masked elsewhere.
+dev-lang/python-exec -python_targets_python3_11
+
 # Marek Szuba <marecki@gentoo.org> (2022-09-25)
 # This depends on app-admin/ansible-molecule, which is not stable yet.
 # Moreover, all but the most recent versions of ansible-molecule
--- a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask
@ -4,6 +4,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.

+# Matt Turner <mattst88@gentoo.org> (2022-11-11)
+# xf86-video-nv relies on function no longer present in the Xserver since v1.20
+# (released May 2018), and no user has noticed.
+# Bug #875053
+video_cards_nv
+
 # Brian Evans <grknight@gentoo.org> (2022-09-30)
 # PHP 8.2 is in RC
 php_targets_php8-2
--- a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask
@ -8,11 +8,6 @@
 # Postgres:15 is not stable yet
 postgres_targets_postgres15

-# Michał Górny <mgorny@gentoo.org> (2022-05-08)
-# Mask until dev-lang/python:3.11 becomes stable.
-python_targets_python3_11
-python_single_target_python3_11
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
 darcs
--- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.force
@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2

+# Sam James <sam@gentoo.org> (2022-11-02)
+# The libxcrypt migration is optional for musl.
+sys-libs/libxcrypt -system -compat
+
 # Sam James <sam@gentoo.org> (2022-10-04)
 # net-misc/netkit-rsh is masked on musl and USE=-crypt depends on it
 sys-cluster/torque crypt
@ -9,10 +13,6 @@ sys-cluster/torque crypt
 # The musl allocator works well with telegram
 net-im/telegram-desktop -jemalloc

-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
-# Do not force system install for libxcrypt here
-<sys-libs/libxcrypt-4.4.28-r2 -system -compat
-
 # Force system-libevent use flag on mozilla packages, since the building of
 # bundled libevent cannot accomodate a system without sysctl.h
 # See bug 574830 for more info.
--- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.mask
@ -1,13 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 # Benda Xu <heroxbd@gentoo.org> (2019-08-20)
 # systemd is set to invade pid 1, which is not possible for Prefix.
 # The following are its reverse dependencies.
 sys-apps/systemd
-dev-libs/libreport
-app-admin/abrt
-app-admin/gnome-abrt
 app-admin/systemdgenie
 dev-python/python-systemd
 games-util/gamemode
--- a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask
@ -1,3 +1,262 @@
-# Copyright 2011-2021 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

+# Kenton Groombridge <concord@gentoo.org> (2022-11-02)
+# SELinux policies 2.20221101-r1 were published in error
+# as they do not include any policy changes since the
+# previous release. Please upgrade to 2.20221101-r2.
+=sec-policy/selinux-abrt-2.20221101-r1
+=sec-policy/selinux-accountsd-2.20221101-r1
+=sec-policy/selinux-acct-2.20221101-r1
+=sec-policy/selinux-afs-2.20221101-r1
+=sec-policy/selinux-aide-2.20221101-r1
+=sec-policy/selinux-alsa-2.20221101-r1
+=sec-policy/selinux-amanda-2.20221101-r1
+=sec-policy/selinux-amavis-2.20221101-r1
+=sec-policy/selinux-android-2.20221101-r1
+=sec-policy/selinux-apache-2.20221101-r1
+=sec-policy/selinux-apcupsd-2.20221101-r1
+=sec-policy/selinux-apm-2.20221101-r1
+=sec-policy/selinux-arpwatch-2.20221101-r1
+=sec-policy/selinux-asterisk-2.20221101-r1
+=sec-policy/selinux-at-2.20221101-r1
+=sec-policy/selinux-automount-2.20221101-r1
+=sec-policy/selinux-avahi-2.20221101-r1
+=sec-policy/selinux-awstats-2.20221101-r1
+=sec-policy/selinux-backup-2.20221101-r1
+=sec-policy/selinux-bacula-2.20221101-r1
+=sec-policy/selinux-base-2.20221101-r1
+=sec-policy/selinux-base-policy-2.20221101-r1
+=sec-policy/selinux-bind-2.20221101-r1
+=sec-policy/selinux-bitcoin-2.20221101-r1
+=sec-policy/selinux-bitlbee-2.20221101-r1
+=sec-policy/selinux-bluetooth-2.20221101-r1
+=sec-policy/selinux-brctl-2.20221101-r1
+=sec-policy/selinux-cachefilesd-2.20221101-r1
+=sec-policy/selinux-calamaris-2.20221101-r1
+=sec-policy/selinux-canna-2.20221101-r1
+=sec-policy/selinux-cdrecord-2.20221101-r1
+=sec-policy/selinux-ceph-2.20221101-r1
+=sec-policy/selinux-certbot-2.20221101-r1
+=sec-policy/selinux-cgmanager-2.20221101-r1
+=sec-policy/selinux-cgroup-2.20221101-r1
+=sec-policy/selinux-chromium-2.20221101-r1
+=sec-policy/selinux-chronyd-2.20221101-r1
+=sec-policy/selinux-clamav-2.20221101-r1
+=sec-policy/selinux-cloudinit-2.20221101-r1
+=sec-policy/selinux-collectd-2.20221101-r1
+=sec-policy/selinux-colord-2.20221101-r1
+=sec-policy/selinux-container-2.20221101-r1
+=sec-policy/selinux-corosync-2.20221101-r1
+=sec-policy/selinux-couchdb-2.20221101-r1
+=sec-policy/selinux-courier-2.20221101-r1
+=sec-policy/selinux-cpucontrol-2.20221101-r1
+=sec-policy/selinux-cpufreqselector-2.20221101-r1
+=sec-policy/selinux-cups-2.20221101-r1
+=sec-policy/selinux-cvs-2.20221101-r1
+=sec-policy/selinux-cyphesis-2.20221101-r1
+=sec-policy/selinux-daemontools-2.20221101-r1
+=sec-policy/selinux-dante-2.20221101-r1
+=sec-policy/selinux-dbadm-2.20221101-r1
+=sec-policy/selinux-dbskk-2.20221101-r1
+=sec-policy/selinux-dbus-2.20221101-r1
+=sec-policy/selinux-ddclient-2.20221101-r1
+=sec-policy/selinux-devicekit-2.20221101-r1
+=sec-policy/selinux-dhcp-2.20221101-r1
+=sec-policy/selinux-dictd-2.20221101-r1
+=sec-policy/selinux-dirmngr-2.20221101-r1
+=sec-policy/selinux-dirsrv-2.20221101-r1
+=sec-policy/selinux-distcc-2.20221101-r1
+=sec-policy/selinux-djbdns-2.20221101-r1
+=sec-policy/selinux-dkim-2.20221101-r1
+=sec-policy/selinux-dmidecode-2.20221101-r1
+=sec-policy/selinux-dnsmasq-2.20221101-r1
+=sec-policy/selinux-docker-2.20221101-r1
+=sec-policy/selinux-dovecot-2.20221101-r1
+=sec-policy/selinux-dpkg-2.20221101-r1
+=sec-policy/selinux-dracut-2.20221101-r1
+=sec-policy/selinux-dropbox-2.20221101-r1
+=sec-policy/selinux-entropyd-2.20221101-r1
+=sec-policy/selinux-evolution-2.20221101-r1
+=sec-policy/selinux-exim-2.20221101-r1
+=sec-policy/selinux-fail2ban-2.20221101-r1
+=sec-policy/selinux-fetchmail-2.20221101-r1
+=sec-policy/selinux-finger-2.20221101-r1
+=sec-policy/selinux-flash-2.20221101-r1
+=sec-policy/selinux-fprintd-2.20221101-r1
+=sec-policy/selinux-ftp-2.20221101-r1
+=sec-policy/selinux-games-2.20221101-r1
+=sec-policy/selinux-gatekeeper-2.20221101-r1
+=sec-policy/selinux-git-2.20221101-r1
+=sec-policy/selinux-gitosis-2.20221101-r1
+=sec-policy/selinux-glusterfs-2.20221101-r1
+=sec-policy/selinux-gnome-2.20221101-r1
+=sec-policy/selinux-googletalk-2.20221101-r1
+=sec-policy/selinux-gorg-2.20221101-r1
+=sec-policy/selinux-gpg-2.20221101-r1
+=sec-policy/selinux-gpm-2.20221101-r1
+=sec-policy/selinux-gpsd-2.20221101-r1
+=sec-policy/selinux-gssproxy-2.20221101-r1
+=sec-policy/selinux-hddtemp-2.20221101-r1
+=sec-policy/selinux-hostapd-2.20221101-r1
+=sec-policy/selinux-icecast-2.20221101-r1
+=sec-policy/selinux-ifplugd-2.20221101-r1
+=sec-policy/selinux-inetd-2.20221101-r1
+=sec-policy/selinux-inn-2.20221101-r1
+=sec-policy/selinux-ipsec-2.20221101-r1
+=sec-policy/selinux-irc-2.20221101-r1
+=sec-policy/selinux-ircd-2.20221101-r1
+=sec-policy/selinux-irqbalance-2.20221101-r1
+=sec-policy/selinux-jabber-2.20221101-r1
+=sec-policy/selinux-java-2.20221101-r1
+=sec-policy/selinux-kdeconnect-2.20221101-r1
+=sec-policy/selinux-kdump-2.20221101-r1
+=sec-policy/selinux-kerberos-2.20221101-r1
+=sec-policy/selinux-kerneloops-2.20221101-r1
+=sec-policy/selinux-kismet-2.20221101-r1
+=sec-policy/selinux-ksmtuned-2.20221101-r1
+=sec-policy/selinux-ldap-2.20221101-r1
+=sec-policy/selinux-links-2.20221101-r1
+=sec-policy/selinux-lircd-2.20221101-r1
+=sec-policy/selinux-loadkeys-2.20221101-r1
+=sec-policy/selinux-logrotate-2.20221101-r1
+=sec-policy/selinux-logsentry-2.20221101-r1
+=sec-policy/selinux-logwatch-2.20221101-r1
+=sec-policy/selinux-lpd-2.20221101-r1
+=sec-policy/selinux-mailman-2.20221101-r1
+=sec-policy/selinux-makewhatis-2.20221101-r1
+=sec-policy/selinux-mandb-2.20221101-r1
+=sec-policy/selinux-matrixd-2.20221101-r1
+=sec-policy/selinux-mcelog-2.20221101-r1
+=sec-policy/selinux-memcached-2.20221101-r1
+=sec-policy/selinux-milter-2.20221101-r1
+=sec-policy/selinux-modemmanager-2.20221101-r1
+=sec-policy/selinux-mono-2.20221101-r1
+=sec-policy/selinux-mozilla-2.20221101-r1
+=sec-policy/selinux-mpd-2.20221101-r1
+=sec-policy/selinux-mplayer-2.20221101-r1
+=sec-policy/selinux-mrtg-2.20221101-r1
+=sec-policy/selinux-munin-2.20221101-r1
+=sec-policy/selinux-mutt-2.20221101-r1
+=sec-policy/selinux-mysql-2.20221101-r1
+=sec-policy/selinux-nagios-2.20221101-r1
+=sec-policy/selinux-ncftool-2.20221101-r1
+=sec-policy/selinux-networkmanager-2.20221101-r1
+=sec-policy/selinux-nginx-2.20221101-r1
+=sec-policy/selinux-node_exporter-2.20221101-r1
+=sec-policy/selinux-nslcd-2.20221101-r1
+=sec-policy/selinux-ntop-2.20221101-r1
+=sec-policy/selinux-ntp-2.20221101-r1
+=sec-policy/selinux-nut-2.20221101-r1
+=sec-policy/selinux-nx-2.20221101-r1
+=sec-policy/selinux-obfs4proxy-2.20221101-r1
+=sec-policy/selinux-oddjob-2.20221101-r1
+=sec-policy/selinux-oident-2.20221101-r1
+=sec-policy/selinux-openct-2.20221101-r1
+=sec-policy/selinux-openrc-2.20221101-r1
+=sec-policy/selinux-opensm-2.20221101-r1
+=sec-policy/selinux-openvpn-2.20221101-r1
+=sec-policy/selinux-pan-2.20221101-r1
+=sec-policy/selinux-pcscd-2.20221101-r1
+=sec-policy/selinux-phpfpm-2.20221101-r1
+=sec-policy/selinux-plymouthd-2.20221101-r1
+=sec-policy/selinux-podman-2.20221101-r1
+=sec-policy/selinux-policykit-2.20221101-r1
+=sec-policy/selinux-portmap-2.20221101-r1
+=sec-policy/selinux-postfix-2.20221101-r1
+=sec-policy/selinux-postgresql-2.20221101-r1
+=sec-policy/selinux-postgrey-2.20221101-r1
+=sec-policy/selinux-ppp-2.20221101-r1
+=sec-policy/selinux-prelude-2.20221101-r1
+=sec-policy/selinux-privoxy-2.20221101-r1
+=sec-policy/selinux-procmail-2.20221101-r1
+=sec-policy/selinux-psad-2.20221101-r1
+=sec-policy/selinux-publicfile-2.20221101-r1
+=sec-policy/selinux-pulseaudio-2.20221101-r1
+=sec-policy/selinux-puppet-2.20221101-r1
+=sec-policy/selinux-pyzor-2.20221101-r1
+=sec-policy/selinux-qemu-2.20221101-r1
+=sec-policy/selinux-qmail-2.20221101-r1
+=sec-policy/selinux-quota-2.20221101-r1
+=sec-policy/selinux-radius-2.20221101-r1
+=sec-policy/selinux-radvd-2.20221101-r1
+=sec-policy/selinux-razor-2.20221101-r1
+=sec-policy/selinux-redis-2.20221101-r1
+=sec-policy/selinux-remotelogin-2.20221101-r1
+=sec-policy/selinux-resolvconf-2.20221101-r1
+=sec-policy/selinux-rngd-2.20221101-r1
+=sec-policy/selinux-rootlesskit-2.20221101-r1
+=sec-policy/selinux-rpc-2.20221101-r1
+=sec-policy/selinux-rpcbind-2.20221101-r1
+=sec-policy/selinux-rpm-2.20221101-r1
+=sec-policy/selinux-rssh-2.20221101-r1
+=sec-policy/selinux-rtkit-2.20221101-r1
+=sec-policy/selinux-rtorrent-2.20221101-r1
+=sec-policy/selinux-salt-2.20221101-r1
+=sec-policy/selinux-samba-2.20221101-r1
+=sec-policy/selinux-sasl-2.20221101-r1
+=sec-policy/selinux-screen-2.20221101-r1
+=sec-policy/selinux-secadm-2.20221101-r1
+=sec-policy/selinux-sendmail-2.20221101-r1
+=sec-policy/selinux-sensord-2.20221101-r1
+=sec-policy/selinux-shorewall-2.20221101-r1
+=sec-policy/selinux-shutdown-2.20221101-r1
+=sec-policy/selinux-skype-2.20221101-r1
+=sec-policy/selinux-slocate-2.20221101-r1
+=sec-policy/selinux-slrnpull-2.20221101-r1
+=sec-policy/selinux-smartmon-2.20221101-r1
+=sec-policy/selinux-smokeping-2.20221101-r1
+=sec-policy/selinux-snmp-2.20221101-r1
+=sec-policy/selinux-snort-2.20221101-r1
+=sec-policy/selinux-soundserver-2.20221101-r1
+=sec-policy/selinux-spamassassin-2.20221101-r1
+=sec-policy/selinux-squid-2.20221101-r1
+=sec-policy/selinux-sssd-2.20221101-r1
+=sec-policy/selinux-stunnel-2.20221101-r1
+=sec-policy/selinux-subsonic-2.20221101-r1
+=sec-policy/selinux-sudo-2.20221101-r1
+=sec-policy/selinux-sxid-2.20221101-r1
+=sec-policy/selinux-syncthing-2.20221101-r1
+=sec-policy/selinux-sysstat-2.20221101-r1
+=sec-policy/selinux-tboot-2.20221101-r1
+=sec-policy/selinux-tcpd-2.20221101-r1
+=sec-policy/selinux-tcsd-2.20221101-r1
+=sec-policy/selinux-telnet-2.20221101-r1
+=sec-policy/selinux-tftp-2.20221101-r1
+=sec-policy/selinux-tgtd-2.20221101-r1
+=sec-policy/selinux-thunderbird-2.20221101-r1
+=sec-policy/selinux-timidity-2.20221101-r1
+=sec-policy/selinux-tmpreaper-2.20221101-r1
+=sec-policy/selinux-tor-2.20221101-r1
+=sec-policy/selinux-tripwire-2.20221101-r1
+=sec-policy/selinux-ucspitcp-2.20221101-r1
+=sec-policy/selinux-ulogd-2.20221101-r1
+=sec-policy/selinux-uml-2.20221101-r1
+=sec-policy/selinux-unconfined-2.20221101-r1
+=sec-policy/selinux-uptime-2.20221101-r1
+=sec-policy/selinux-usbguard-2.20221101-r1
+=sec-policy/selinux-usbmuxd-2.20221101-r1
+=sec-policy/selinux-uucp-2.20221101-r1
+=sec-policy/selinux-uwimap-2.20221101-r1
+=sec-policy/selinux-uwsgi-2.20221101-r1
+=sec-policy/selinux-varnishd-2.20221101-r1
+=sec-policy/selinux-vbetool-2.20221101-r1
+=sec-policy/selinux-vdagent-2.20221101-r1
+=sec-policy/selinux-vde-2.20221101-r1
+=sec-policy/selinux-virt-2.20221101-r1
+=sec-policy/selinux-vlock-2.20221101-r1
+=sec-policy/selinux-vmware-2.20221101-r1
+=sec-policy/selinux-vnstatd-2.20221101-r1
+=sec-policy/selinux-vpn-2.20221101-r1
+=sec-policy/selinux-watchdog-2.20221101-r1
+=sec-policy/selinux-webalizer-2.20221101-r1
+=sec-policy/selinux-wine-2.20221101-r1
+=sec-policy/selinux-wireguard-2.20221101-r1
+=sec-policy/selinux-wireshark-2.20221101-r1
+=sec-policy/selinux-wm-2.20221101-r1
+=sec-policy/selinux-xen-2.20221101-r1
+=sec-policy/selinux-xfs-2.20221101-r1
+=sec-policy/selinux-xscreensaver-2.20221101-r1
+=sec-policy/selinux-xserver-2.20221101-r1
+=sec-policy/selinux-zabbix-2.20221101-r1
+=sec-policy/selinux-zfs-2.20221101-r1
--- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask
@ -5,6 +5,8 @@
 app-admin/ansible
 app-admin/ansible-core
 >=app-antivirus/clamav-0.105.1
+app-backup/borgbackup
+app-backup/borgmatic
 app-crypt/acme
 app-crypt/certbot
 app-crypt/certbot-nginx
@ -32,8 +34,10 @@ dev-python/openstacksdk
 dev-python/os-client-config
 dev-python/osc-lib
 dev-python/paramiko
+dev-python/pyfuse3
 >=dev-python/pyopenssl-22
 dev-python/pyspnego
+dev-python/pytest-trio
 dev-python/python-daemon
 dev-python/python-glanceclient
 dev-python/python-ironicclient
@ -50,9 +54,10 @@ dev-python/spur
 dev-python/sshtunnel
 dev-python/tempest
 dev-python/trustme
->=dev-python/trio-0.22.0
+dev-python/trio
 dev-python/twine
 dev-python/watchfiles
+dev-python/watchgod
 dev-ros/roswtf
 dev-util/cargo-c
 dev-util/cbindgen
--- 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
@ -13,6 +13,7 @@ dev-python/libtmux test
 dev-python/locket test
 dev-python/pyjwt test
 dev-python/python-keystoneclient test
+dev-python/python-socks test

 # Michał Górny <mgorny@gentoo.org> (2022-07-29)
 # More packages requiring dev-python/pyopenssl or its revdeps.
--- 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,116 @@

 #--- END OF EXAMPLES ---

+# Jonas Stein <jstein@gentoo.org> (2022-11-13)
+# Dead upstream
+# Removal after 2023-01-01.  Bug #881249.
+net-mail/vchkuser
+
+# Matthew Smith <matthew@gentoo.org> (2022-11-13)
+# Please update to Erlang/OTP 25. Removal in 30 days.
+# Bug #864543
+<dev-lang/erlang-25
+<net-misc/rabbitmq-server-3.11.0
+
+# Ionen Wolkens <ionen@gentoo.org> (2022-11-11)
+# Had a handful of reports of unbootable systems with this new version.
+# Given it's a still-experimental new branch, mask for now in case.
+# Feel free to unmask if you've had no issues, but otherwise please
+# report to NVIDIA. https://bugs.gentoo.org/881025
+~x11-drivers/nvidia-drivers-525.53
+
+# Matt Turner <mattst88@gentoo.org> (2022-11-11)
+# Relies on function no longer present in the Xserver since v1.20
+# (released May 2018), and no user has noticed. Use xf86-video-nouveau instead.
+# Bug #875053
+# Removal on 2022-12-11
+x11-drivers/xf86-video-nv
+
+# Sam James <sam@gentoo.org> (2022-11-11)
+# Causes memory corruption when building x11-misc/colord on x86
+# bug #880865
+=media-libs/lcms-2.14-r2
+
+# Jaco Kroon <jaco@uls.co.za> (2022-11-05)
+# Some potentially breaking changes here, please check the UPGRADE.txt file.
+# Most important:  chan_sip no longer builds by default, if you've migrated to
+# PJSIP you should be OK and most likely you should be able to safely unmask.
+# For now to prevent accidental upgrades and to allow proper testing this will
+# be in place for minimum six months (2023-04-22).
+=net-misc/asterisk-20*
+=net-misc/asterisk-opus-20*
+=net-misc/asterisk-g729-20*
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-11-04)
+# Upstream repository is gone. Uses internally python 2 code, which
+# we patch into python 3. Only ebuild uses snapshot tarball from the
+# dead repo. Doesn't use PEP517 mode. Has issues with python 3.11.
+# No reverse dependencies in tree.
+# Removal: 2022-12-04.  Bug #879613.
+dev-python/tempita
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-04)
+# NIH version of dev-python/watchdog that was used by dev-python/uvicorn
+# only, and was replaced by rustified dev-python/watchfiles.
+# Removal on 2022-12-04.  Bug #879515.
+dev-python/watchgod
+
+# Matt Turner <mattst88@gentoo.org> (2022-11-01)
+# Added by a proxied maintainer in 2018 who then never touched it again before
+# disappearing. Doesn't build with Python 3.9. Depends on gnome-base/gconf.
+# Bugs #846233, #873877
+# Removal on 2022-12-01
+sci-electronics/drahnr-oregano
+
+# Matt Turner <mattst88@gentoo.org> (2022-11-01)
+# Dead slot. No reverse dependencies that are not masked for removal.
+# Removal on 2022-12-01
+x11-libs/gnome-pty-helper
+x11-libs/vte:0
+
+# Matt Turner <mattst88@gentoo.org> (2022-11-01)
+# No reverse dependencies. Depends on deprecated and unmaintained packages:
+# 	- media-libs/clutter
+# 	- media-libs/clutter-gst
+# 	- media-libs/clutter-gtk
+# 	- x11-libs/gtksourceview:2.0
+# 	- x11-libs/gtksourceview:3.0
+# 	- x11-libs/gtksourceview:4
+# 	- x11-libs/vte:0
+# Bug #877153
+# Removal on 2022-12-01
+dev-ruby/ruby-clutter
+dev-ruby/ruby-clutter-gdk
+dev-ruby/ruby-clutter-gstreamer
+dev-ruby/ruby-clutter-gtk
+dev-ruby/ruby-gdk3
+dev-ruby/ruby-gegl
+dev-ruby/ruby-gnome2
+dev-ruby/ruby-gnumeric
+dev-ruby/ruby-goffice
+dev-ruby/ruby-gsf
+dev-ruby/ruby-gstreamer
+dev-ruby/ruby-gtk3
+dev-ruby/ruby-gtksourceview
+dev-ruby/ruby-gtksourceview3
+dev-ruby/ruby-gtksourceview4
+dev-ruby/ruby-libsecret
+dev-ruby/ruby-rsvg
+dev-ruby/ruby-vte
+dev-ruby/ruby-vte3
+dev-ruby/ruby-webkit2-gtk
+dev-ruby/ruby-wnck3
+
+# Anton Fischl <github@fischl-online.de> (2022-10-23)
+# Version 3.1.* is not meant for production according to upstream
+=app-backup/burp-3.1*
+
+# David Seifert <soap@gentoo.org> (2022-10-31)
+# EAPI 6, last release over 17 years ago, requires <ghostscript-gpl-10
+# drivers, relies on -Wimplicit-function-declaration.
+# Removal on 2022-11-30. Bug #871216, #876382.
+media-gfx/peps
+
 # Matt Turner <mattst88@gentoo.org> (2022-10-30)
 # Dead package, last release 10 years ago. No reverse dependencies.
 # Removal on 2022-11-30
@ -114,17 +224,6 @@ dev-python/eventlet
 # Bug #722092, #749900, #762169, #840656, #845381, #858392, #866701.
 dev-util/nvidia-cuda-sdk

-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-10-17)
-# Hostile takeover ongoing, integrity cannot be guaranteed.
-# Use the release version only if you change the meta server setting.
-# Use games-action/multimc-bin or games-action/prismlauncher instead
-# to be completely safe.
-# https://bugs.gentoo.org/877495
-#
-# Update (2022-10-20)
-# Removal in 15 days, please install games-action/prismlauncher instead
-games-action/polymc
-
 # Michał Górny <mgorny@gentoo.org> (2022-10-17)
 # Unmaintained since 2018.  Requires dev-python/nose.  No revdeps left.
 # Removal on 2022-11-16.  Bug #877375.
@ -149,15 +248,6 @@ dev-python/nose_warnings_filters
 # Removal on 2022-11-14
 x11-terms/lilyterm

-# Matt Turner <mattst88@gentoo.org> (2022-10-14)
-# Unmaintained upstream with last commit in 2013. No reverse dependencies.
-# Depends on unmaintained packages:
-# 	- x11-libs/gtk+:2
-# 	- x11-libs/vte:0
-# Bugs #769131, #875704.
-# Removal on 2022-11-14
-x11-misc/gtkdialog
-
 # Matt Turner <mattst88@gentoo.org> (2022-10-14)
 # Unmaintained upstream. Last release in 2008. Only reverse dependency is
 # gnome-mud, which is masked for removal.
@ -186,12 +276,6 @@ games-mud/gnome-mud
 # Removal on 2022-11-13
 net-misc/spread

-# Matt Turner <mattst88@gentoo.org> (2022-10-12)
-# Unmaintained and archived upstream. Last release in 2017.
-# Bug #597960.
-# Removal on 2022-11-12
-net-im/empathy
-
 # Sam James <sam@gentoo.org> (2022-10-12)
 # Upstream has withdrawn these releases because of a (yet unexplained)
 # "significant regression".
@ -223,10 +307,6 @@ dev-python/setuptools-declarative-requirements
 # Removal on 2022-11-07.  Bug #834656.
 dev-python/kazoo

-# Matt Turner <mattst88@gentoo.org> (2022-10-07)
-# Unstable release. Masked for testing.
->=x11-libs/cairo-1.17
-
 # Sam James <sam@gentoo.org> (2022-10-07)
 # Ancient K&R C codebase which fails to compile with modern Clang; surface
 # level fixes are doable, but then get into various dangerous constructs
@ -235,13 +315,6 @@ dev-python/kazoo
 # Use media-sound/mpd if looking for a modern alternative. Removal on 2022-11-07.
 media-sound/rplay

-# Matt Turner <mattst88@gentoo.org> (2022-10-01)
-# Unmaintained upstream. Last commit was 10 years ago today.
-# Unclear if it does anything useful. Many open bugs: #584352, #833102,
-# #852728, #866557, #875278.
-# Removal on 2022-11-05
-x11-libs/libva-vdpau-driver
-
 # Michał Górny <mgorny@gentoo.org> (2022-10-05)
 # Originally added for dev-python/rapidfuzz.  Now the algorithm has been
 # inlined into rapidfuzz, and the package is semi-deprecated.
@ -274,57 +347,11 @@ dev-python/jarowinkler
 =sys-apps/portage-3.0.37
 =sys-apps/portage-3.0.38

-# Matt Turner <mattst88@gentoo.org> (2022-10-01)
-# Depends on lots of unmaintained packages:
-# 	- app-text/gnome-doc-utils
-# 	- dev-libs/libunique:1
-# 	- dev-util/gob
-# 	- x11-libs/gtk+:2
-# Last commit to upstream repository in 2015. Most plugins saw their last
-# upstream commit 10+ years ago. Unmaintained in Gentoo since 2016. Many open
-# bugs: #582138, #686800, #689364, #721246, #799263, #808447, #808450, #808456,
-# #831024.
-# Removal on 2022-11-01
-media-sound/gmpc
-media-plugins/gmpc-alarm
-media-plugins/gmpc-albumview
-media-plugins/gmpc-avahi
-media-plugins/gmpc-awn
-media-plugins/gmpc-discogs
-media-plugins/gmpc-extraplaylist
-media-plugins/gmpc-jamendo
-media-plugins/gmpc-last-fm
-media-plugins/gmpc-libnotify
-media-plugins/gmpc-lyrics
-media-plugins/gmpc-lyricwiki
-media-plugins/gmpc-magnatune
-media-plugins/gmpc-mdcover
-media-plugins/gmpc-mmkeys
-media-plugins/gmpc-mserver
-media-plugins/gmpc-playlistsort
-media-plugins/gmpc-shout
-media-plugins/gmpc-tagedit
-
-# Matt Turner <mattst88@gentoo.org> (2022-10-01)
-# Metapackage that has outlived its purpose. Made some sense in the immediate
-# aftermath of X.Org modularization 15 years ago.
-# Use these instead if desired:
-# - x11-base/xorg-apps
-# - x11-base/xorg-fonts
-# Removal on 2022-11-01. Bugs #755233, #872119.
-x11-base/xorg-x11
-
 # Brian Evans <grknight@gentoo.org> (2022-09-30)
 # Mask RC versions for initial testing
 <dev-lang/php-8.2.0:8.2
 virtual/httpd-php:8.2

-# Michał Górny <mgorny@gentoo.org> (2022-09-29)
-# Unfetchable mirror-restricted distfile.  No action from maintainer
-# in over a year.
-# Removal on 2022-10-29.  Bug #789477.
-games-simulation/bcs-demo
-
 # Stephan Hartmann <sultan@gentoo.org> (2022-09-29)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
@ -336,42 +363,10 @@ games-simulation/bcs-demo
 =app-shells/bash-5.2*
 =sys-libs/readline-8.2*

-# Michał Górny <mgorny@gentoo.org> (2022-09-26)
-# Bundles a vulnerable version of dev-libs/expat.  The current Gentoo
-# version is from 2014, pending bump to the last upstream release
-# from 2016.  Effectively unmaintained.  EAPI 6.
-# Removal on 2022-10-26.  Bug #253517.
-games-sports/torcs
-
-# Piotr Karbowski <slashbeast@gentoo.org> (2022-09-25)
-# No package in tree depends on dev-python/ssh2-python. Masked for removal.
-# Removal on 2022-10-25.
-dev-python/ssh2-python
-
 # John Helmert III <ajak@gentoo.org> (2022-09-18)
 # Unfixed root privilege escalation, bug #631552
 sys-cluster/slurm

-# Michał Górny <mgorny@gentoo.org> (2022-09-18)
-# Obsolete in favor of building via PEP517 mode.  Buggy.  No revdeps
-# left in ::gentoo.
-# Removal on 2022-10-18.  Bug #871522.
-dev-python/pyproject2setuppy
-
-# Pacho Ramos <pacho@gentoo.org> (2022-09-18)
-# ABRT environment keeps breaking more and more on non-Fedora systems.
-# Removal: 2022-10-18.  Bugs #849305, #849092, #849095, #713858.
-app-admin/abrt
-app-admin/gnome-abrt
-dev-libs/libreport
-dev-libs/satyr
-
-# Pacho Ramos <pacho@gentoo.org> (2022-09-18)
-# Unmaintained for a long time and unneeded with current pulseaudio and
-# pipewire versions.
-# Removal: 2022-10-18.
-media-sound/pulseaudio-modules-bt
-
 # Mike Gilbert <floppym@gentoo.org> (2022-09-12)
 # repoman is no longer maintained and has been removed from the portage
 # git repository. Please use dev-util/pkgcheck and dev-util/pkgdev instead.
@ -388,11 +383,6 @@ app-portage/repoman
 # https://bugs.gentoo.org/868567
 =sys-apps/gawk-5.2.0

-# Marc Schiffbauer <mschiff@gentoo.org> (2022-09-02)
-# Dead upstream, open bugs, removal in 30 days
-# bugs #829447, #836227, #862504
-mail-filter/sigh
-
 # hololeap <hololeap@protonmail.com> (2022-08-21)
 # doctest-parallel does not currently work with Setup.hs (used internally by
 # haskell-cabal.eclass)
@ -413,6 +403,7 @@ dev-python/PyQt6
 dev-python/PyQt6-WebEngine
 dev-qt/qt5compat:6
 dev-qt/qtbase:6
+dev-qt/qtcharts:6
 dev-qt/qtdeclarative:6
 dev-qt/qtimageformats:6
 dev-qt/qtlocation:6
@ -513,10 +504,6 @@ dev-util/patdiff:0/0.15
 sys-devel/automake:1.13
 sys-devel/automake:1.15

-# Anton Fischl <github@fischl-online.de> (2022-02-23)
-# Version 2.5.* is not meant for production according to upstream
-=app-backup/burp-2.5*
-
 # Maciej Barć <xgqt@gentoo.org> (2022-02-20)
 # Masked for testing, builds and passes tests but randomly segfaults,
 # meaningless backtrace, debugging (flags, symbols) do not help
@ -577,6 +564,7 @@ sys-devel/automake:1.11
 >=app-arch/file-roller-43
 >=app-backup/deja-dup-43
 >=app-crypt/seahorse-43
+>=app-misc/bijiben-40.1-r1
 >=app-misc/tracker-3.4.0-r1
 >=app-misc/tracker-miners-3.4.0-r1
 >=app-text/gtranslator-42
@ -677,12 +665,6 @@ media-plugins/kodi-game-libretro-dosbox
 # bug #705554, bug #689408.
 >=dev-scheme/guile-3.0.4

-# Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
-# Breaks archives containing relative paths
-# when being called with --no-absolute-filenames
-# bug #700020
-=app-arch/cpio-2.13
-
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # TeXmacs is the only remaining package in tree that requires guile-1.8, which
 # is unsupported upstream. A TeXmacs port to Guile-2 has been in progress for a
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/eapi
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/eapi
@ -0,0 +1 @@
+5
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/gcc/eapi
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/gcc/eapi
@ -0,0 +1 @@
+5
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/gcc/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/gcc/parent
@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-nold
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/gcc/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/gcc/use.mask
@ -0,0 +1,5 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# SSP seems to cause asm/assembly errors with GCC, so disable it
+ssp
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/make.defaults
@ -0,0 +1,5 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="arm64-apple-darwin22"
+CHOST_arm64="${CHOST}"
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/arm64/parent
@ -0,0 +1,2 @@
+..
+../../arch/arm64
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/eapi
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/eapi
@ -0,0 +1 @@
+5
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/make.defaults
@ -0,0 +1,4 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+MACOSX_DEPLOYMENT_TARGET="13.0"
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/package.use.mask
@ -0,0 +1,7 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2011-04-10)
+# as long as util-linux installs uuid.h which breaks the system headers
+# (hence we don't) we can't do uuid support here
+x11-libs/libSM -uuid
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/parent
@ -0,0 +1 @@
+..
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/profile.bashrc
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/profile.bashrc
@ -0,0 +1,4 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+export MACOSX_DEPLOYMENT_TARGET=13.0
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/eapi
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/eapi
@ -0,0 +1 @@
+5
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/gcc/eapi
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/gcc/eapi
@ -0,0 +1 @@
+5
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/gcc/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/gcc/parent
@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-ld64
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/make.defaults
@ -0,0 +1,5 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-apple-darwin22"
+CHOST_amd64="${CHOST}"
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/parent
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/parent
@ -0,0 +1,2 @@
+..
+../../arch/x64
--- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/13.0/x64/use.mask
@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile.  This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_vmware
+
+# ibm is only used for ppc64 stuff
+ibm
--- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
@ -388,10 +388,12 @@ x64-macos		prefix/darwin/macos/11.0/x64			exp
 x64-macos		prefix/darwin/macos/11.0/x64/gcc		exp
 x64-macos		prefix/darwin/macos/12.0/x64			exp
 x64-macos		prefix/darwin/macos/12.0/x64/gcc		exp
+x64-macos		prefix/darwin/macos/13.0/x64/gcc		exp
 arm64-macos		prefix/darwin/macos/11.0/arm64			exp
 arm64-macos		prefix/darwin/macos/11.0/arm64/gcc		exp
 arm64-macos		prefix/darwin/macos/12.0/arm64			exp
 arm64-macos		prefix/darwin/macos/12.0/arm64/gcc		exp
+arm64-macos		prefix/darwin/macos/13.0/arm64/gcc		exp

 # Solaris Profiles
 sparc-solaris		prefix/sunos/solaris/5.11/sparc			exp
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/make.defaults
@ -1,5 +1,2 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-
-# Adding this one, since it makes sense.
-USE="bzip2"
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.force
@ -1,6 +1,2 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-27)
-# Force default-PIE build on 17.0 profiles.
-sys-devel/gcc pie
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.mask
@ -1,6 +1,2 @@
 # Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-27)
-# Unmask default-PIE on 17.0 profiles.
-sys-devel/gcc -pie
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/eapi
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/eapi
@ -0,0 +1 @@
+5
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/make.defaults
@ -0,0 +1,11 @@
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# This just makes sense nowadays, if only for distfiles...
+USE="xz zstd"
+
+# bug 831045
+USE="${USE} -cli"
+
+# bug 849875
+USE="${USE} -dri"
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/package.use.force
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/package.use.force
@ -0,0 +1,2 @@
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
--- a/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/releases/23.0/package.use.mask
@ -0,0 +1,2 @@
+# Copyright 2017-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`- vim ([CVE-2022-3705](https://nvd.nist.gov/vuln/detail/CVE-2022-3705))`