diff --git 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
index fd6c0d611f..651ac2f1d2 100644
--- 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
@@ -23,7 +23,7 @@ else
 	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"
+		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}"
diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2022-11-30-weekly-updates.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-11-30-weekly-updates.md
new file mode 100644
index 0000000000..9ad5ce00d4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-11-30-weekly-updates.md
@@ -0,0 +1,3 @@
+- XZ utils ([5.2.8](https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;h=c244b42a6771a6e8af206318dfc500d78929fd6f;hb=5476089d9c42b9b04e92b80e1800b384a98265cb))
+- GnuTLS ([3.7.8](https://lists.gnupg.org/pipermail/gnutls-help/2022-September/004765.html))
+- gettext ([0.21.1](https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=blob;f=NEWS;h=cdbb16746c23555e70bb1e16917f5c349ce92d9e;hb=8b38ee827251cadbb90cb6cb576ae98702566288))
diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest
index 11aa4a26f9..e65aab0ff7 100644
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest
@@ -1,2 +1,4 @@
 DIST sqlite-doc-3390400.zip 10853153 BLAKE2B 617927351809e5ec7489011f963337e92b539a83b135daa7ccd48f840d35716d08e8adc08a67e17d674a6bc64ca24fa92b56573c0065105386fc9c75f1f7f9ef SHA512 75d97b0f2f0d530b2e0ad505574af3bf657d82f0859bb5de7ee45c40a80351e933944845cedca56b579925a3d07505c6f4721f756f27862ffafdfc2caff539fb
+DIST sqlite-doc-3400000.zip 10921883 BLAKE2B 786bba5f4eec32114b0e12d0a42eb763c3be999506edb65e72a1ea32499c9972be9e546b4773a96165273e3eac4da9c2e3c2c696e07494d8af8f273da72e44fd SHA512 3557fe49e08fd24890da584f3fa7fb93d1e3317787f98a8ce1062dcac07733782026e50dfef7db72582739ddf0a77095cc4d3a81f3df097a69e85c672591bf7e
 DIST sqlite-src-3390400.zip 13405169 BLAKE2B aa0e0abbdcafced086a604ec910dbfd1e4df28e83e0edb6056019391e96367050e59478ee8847d930191a65b21cf0bf9957c35ef056abd9be4947a3838d78eb2 SHA512 0acb8afc87f911c91ec555cc97af5b77b6b0e80cc8672711ddd87c651d9e11b697c9669ff9ba2b58da12b972bb46acdf8b8fe35993950f10735b4036501b73bb
+DIST sqlite-src-3400000.zip 13723231 BLAKE2B 4b4d3119f3210497e4e41f1305558e7ed49505b635fed18f466b5fb8dcc60712d0c053a0e569f9af4b2b37803d2670528244bdcf6ef580fd3f85510e8d4dba78 SHA512 c3bb3829f99c663f3381f4c610e401173f133fe944558b70da7521cc44116d048e4e1651993feb128b0f3814381aa4fa93f48ba3e277abca3442af805159287d
diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.39.4-icu-72-test.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.39.4-icu-72-test.patch
new file mode 100644
index 0000000000..54de04d11f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.39.4-icu-72-test.patch
@@ -0,0 +1,29 @@
+https://sqlite.org/src/vpatch?from=18e89a436daa18a8&to=a2b6883ac2ef878f
+https://sqlite.org/forum/forumpost/072d2fddc4
+https://bugs.gentoo.org/882605
+--- a/test/fts3expr4.test
++++ b/test/fts3expr4.test
+@@ -48,11 +48,20 @@
+ 
+ # In "col:word", if "col" is not the name of a column, the entire thing
+ # is passed to the tokenizer.
+ #
+ do_icu_expr_test 1.7 {a:word} {PHRASE 0 0 word}
+-do_icu_expr_test 1.8 {d:word} {PHRASE 3 0 d:word}
++# do_icu_expr_test 1.8 {d:word} {PHRASE 3 0 d:word}
++do_test 1.8 {
++  set res [
++    db one {SELECT fts3_exprtest('icu en_US', 'd:word', 'a', 'b', 'c')}
++  ]
++  expr {
++    $res=="PHRASE 3 0 d:word" ||
++    $res=="AND {AND {PHRASE 3 0 d} {PHRASE 3 0 :}} {PHRASE 3 0 word}"
++  }
++} 1
+ 
+ set sqlite_fts3_enable_parentheses 0
+ 
+ do_icu_expr_test 2.1 {
+   f (e NEAR/2 a)
+
+
diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.39.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.39.4.ebuild
index a2eb7c1e98..ffcf6d0880 100644
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.39.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.39.4.ebuild
@@ -53,6 +53,10 @@ else
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.39.4-icu-72-test.patch
+)
+
 _fossil_fetch() {
 	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
 	local repo_id="${1}"
@@ -139,7 +143,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 
 	eautoreconf
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.0.ebuild
new file mode 100644
index 0000000000..c10b8c754d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.0.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+
+# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
+# for hints regarding test failures, backports, etc.
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}"/${PN}
+	PROPERTIES="live"
+else
+	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+	DOC_PV="${SRC_PV}"
+	#DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+
+	SRC_URI="
+		https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )
+	"
+	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )
+"
+BDEPEND=">=dev-lang/tcl-8.6:0"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" dev-vcs/fossil"
+else
+	BDEPEND+=" app-arch/unzip"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.39.4-icu-72-test.patch
+)
+
+_fossil_fetch() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local repo_uri="${2}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	mkdir -p "${T}/fossil/${repo_id}" || die
+	pushd "${T}/fossil/${repo_id}" > /dev/null || die
+
+	if [[ -n "${EVCS_OFFLINE}" ]]; then
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+		fi
+	else
+		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
+			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
+			echo
+		else
+			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
+			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
+			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
+			echo
+		fi
+
+		(
+			addwrite "${distdir}"
+			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
+			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
+		)
+	fi
+
+	popd > /dev/null || die
+}
+
+_fossil_checkout() {
+	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+	local repo_id="${1}"
+	local branch_or_commit="${2}"
+	local target_directory="${3}"
+
+	local -x FOSSIL_HOME="${HOME}"
+
+	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
+		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
+	fi
+
+	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
+		mkdir -p "${T}/fossil/${repo_id}" || die
+		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
+	fi
+
+	mkdir "${target_directory}" || die
+	pushd "${target_directory}" > /dev/null || die
+
+	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
+	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
+	echo
+
+	popd > /dev/null || die
+}
+
+fossil_fetch() {
+	local repo_id="${1}"
+	local repo_uri="${2}"
+	local target_directory="${3}"
+
+	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
+
+	_fossil_fetch "${repo_id}" "${repo_uri}"
+	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
+		if use doc; then
+			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
+		fi
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+	local options=()
+
+	options+=(
+		--enable-load-extension
+		--enable-threadsafe
+	)
+
+	# Support detection of misuse of SQLite API.
+	# https://sqlite.org/compile.html#enable_api_armor
+	append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+	# Support bytecode and tables_used virtual tables.
+	# https://sqlite.org/compile.html#enable_bytecode_vtab
+	# https://sqlite.org/bytecodevtab.html
+	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+	# Support column metadata functions.
+	# https://sqlite.org/compile.html#enable_column_metadata
+	# https://sqlite.org/c3ref/column_database_name.html
+	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+	# Support sqlite_dbpage virtual table.
+	# https://sqlite.org/compile.html#enable_dbpage_vtab
+	# https://sqlite.org/dbpage.html
+	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+	# Support dbstat virtual table.
+	# https://sqlite.org/compile.html#enable_dbstat_vtab
+	# https://sqlite.org/dbstat.html
+	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
+	# https://sqlite.org/compile.html#enable_deserialize
+	# https://sqlite.org/c3ref/serialize.html
+	# https://sqlite.org/c3ref/deserialize.html
+	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+	# Support comments in output of EXPLAIN.
+	# https://sqlite.org/compile.html#enable_explain_comments
+	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+	# Support Full-Text Search versions 3, 4 and 5.
+	# https://sqlite.org/compile.html#enable_fts3
+	# https://sqlite.org/compile.html#enable_fts3_parenthesis
+	# https://sqlite.org/compile.html#enable_fts4
+	# https://sqlite.org/compile.html#enable_fts5
+	# https://sqlite.org/fts3.html
+	# https://sqlite.org/fts5.html
+	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+	options+=( --enable-fts5 )
+
+	# Support hidden columns.
+	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+	# Support memsys5 memory allocator.
+	# https://sqlite.org/compile.html#enable_memsys5
+	# https://sqlite.org/malloc.html#memsys5
+	append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+	# Support sqlite3_normalized_sql() function.
+	# https://sqlite.org/c3ref/expanded_sql.html
+	append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+	# Support sqlite_offset() function.
+	# https://sqlite.org/compile.html#enable_offset_sql_func
+	# https://sqlite.org/lang_corefunc.html#sqlite_offset
+	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+	# Support pre-update hook functions.
+	# https://sqlite.org/compile.html#enable_preupdate_hook
+	# https://sqlite.org/c3ref/preupdate_count.html
+	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+	# Support Resumable Bulk Update extension.
+	# https://sqlite.org/compile.html#enable_rbu
+	# https://sqlite.org/rbu.html
+	append-cppflags -DSQLITE_ENABLE_RBU
+
+	# Support R*Trees.
+	# https://sqlite.org/compile.html#enable_rtree
+	# https://sqlite.org/compile.html#enable_geopoly
+	# https://sqlite.org/rtree.html
+	# https://sqlite.org/geopoly.html
+	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+	# Support Session extension.
+	# https://sqlite.org/compile.html#enable_session
+	# https://sqlite.org/sessionintro.html
+	append-cppflags -DSQLITE_ENABLE_SESSION
+
+	# Support scan status functions.
+	# https://sqlite.org/compile.html#enable_stmt_scanstatus
+	# https://sqlite.org/c3ref/stmt_scanstatus.html
+	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+	# Support sqlite_stmt virtual table.
+	# https://sqlite.org/compile.html#enable_stmtvtab
+	# https://sqlite.org/stmt.html
+	append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+	# Support unknown() function.
+	# https://sqlite.org/compile.html#enable_unknown_sql_function
+	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+	# Support unlock notification.
+	# https://sqlite.org/compile.html#enable_unlock_notify
+	# https://sqlite.org/c3ref/unlock_notify.html
+	# https://sqlite.org/unlock_notify.html
+	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+	# https://sqlite.org/compile.html#enable_update_delete_limit
+	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+	# Support soundex() function.
+	# https://sqlite.org/compile.html#soundex
+	# https://sqlite.org/lang_corefunc.html#soundex
+	append-cppflags -DSQLITE_SOUNDEX
+
+	# Support URI filenames.
+	# https://sqlite.org/compile.html#use_uri
+	# https://sqlite.org/uri.html
+	append-cppflags -DSQLITE_USE_URI
+
+	options+=( $(use_enable debug) )
+
+	if use icu; then
+		# Support ICU extension.
+		# https://sqlite.org/compile.html#enable_icu
+		append-cppflags -DSQLITE_ENABLE_ICU
+		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+	fi
+
+	options+=(
+		--disable-editline
+		$(use_enable readline)
+	)
+
+	if use readline; then
+		options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" )
+	fi
+
+	if use secure-delete; then
+		# Enable secure_delete pragma by default.
+		# https://sqlite.org/compile.html#secure_delete
+		# https://sqlite.org/pragma.html#pragma_secure_delete
+		append-cppflags -DSQLITE_SECURE_DELETE
+	fi
+
+	options+=( $(use_enable static-libs static) )
+
+	# tcl, test, tools USE flags.
+	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
+		options+=(
+			--enable-tcl
+			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
+		)
+	else
+		options+=( --disable-tcl )
+	fi
+
+	if [[ "${ABI}" == "x86" ]]; then
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+			append-cflags -mfpmath=sse
+		else
+			append-cflags -ffloat-store
+		fi
+
+		# Skip known-broken test for now
+		# https://sqlite.org/forum/forumpost/d97caf168f
+		# https://sqlite.org/forum/forumpost/50f136d91d
+		if use test ; then
+			rm test/atof1.test || die
+		fi
+	fi
+
+	econf "${options[@]}"
+}
+
+multilib_src_compile() {
+	emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+	if use tools && multilib_is_native_abi; then
+		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+	fi
+
+	if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then
+		emake tclsqlite3.c
+
+		local build_directory="$(pwd)"
+		build_directory="${build_directory##*/}"
+
+		mkdir "${WORKDIR}/${PN}-doc-build" || die
+		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
+
+		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
+		rmdir doc/matrix{/*,} || die
+
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions"
+		return
+	fi
+
+	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+	# e_uri.test tries to open files in /.
+	# bug #839798
+	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict "/test.db:/ÿ.db"
+
+	emake HAVE_TCL="$(usex tcl 1 "")" $(usex debug 'fulltest' 'test')
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+	if use tools && multilib_is_native_abi; then
+		install_tool() {
+			if [[ -f ".libs/${1}" ]]; then
+				newbin ".libs/${1}" "${2}"
+			else
+				newbin "${1}" "${2}"
+			fi
+		}
+
+		install_tool changeset sqlite3-changeset
+		install_tool dbdump sqlite3-db-dump
+		install_tool dbhash sqlite3-db-hash
+		install_tool dbtotxt sqlite3-db-to-txt
+		install_tool index_usage sqlite3-index-usage
+		install_tool rbu sqlite3-rbu
+		install_tool scrub sqlite3-scrub
+		install_tool showdb sqlite3-show-db
+		install_tool showjournal sqlite3-show-journal
+		install_tool showshm sqlite3-show-shm
+		install_tool showstat4 sqlite3-show-stat4
+		install_tool showwal sqlite3-show-wal
+		install_tool sqldiff sqlite3-diff
+		install_tool sqlite3_analyzer sqlite3-analyzer
+		install_tool sqlite3_checker sqlite3-checker
+		install_tool sqlite3_expert sqlite3-expert
+		install_tool sqltclsh sqlite3-tclsh
+
+		unset -f install_tool
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	doman sqlite3.1
+
+	if use doc; then
+		if [[ ${PV} == 9999 ]]; then
+			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
+		else
+			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
+		fi
+
+		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
+		if [[ ${PV} != 9999 ]]; then
+			rm search search.d/admin || die
+			rmdir search.d || die
+			find -name "*~" -delete || die
+		fi
+
+		(
+			docinto html
+			dodoc -r *
+		)
+
+		popd > /dev/null || die
+	fi
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-9999.ebuild
index 89f000f493..45db3caab4 100644
--- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-9999.ebuild
@@ -1,56 +1,53 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
-if [[ "${PV}" != "9999" ]]; then
-	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-	DOC_PV="${SRC_PV}"
-	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
 DESCRIPTION="SQL database engine"
 HOMEPAGE="https://sqlite.org/"
 
 # On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
 # for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
+if [[ ${PV} == 9999 ]]; then
+	S="${WORKDIR}"/${PN}
+	PROPERTIES="live"
 else
-	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
-		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-	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"
+	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+	DOC_PV="${SRC_PV}"
+	#DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+
+	SRC_URI="
+		https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
+		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )
+	"
+	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="public-domain"
 SLOT="3"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
-	PROPERTIES="live"
-fi
 RESTRICT="!test? ( test )"
 
-if [[ "${PV}" == "9999" ]]; then
-	BDEPEND=">=dev-lang/tcl-8.6:0
-		dev-vcs/fossil"
+RDEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )
+	tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] )
+	tools? ( dev-lang/tcl:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )
+"
+BDEPEND=">=dev-lang/tcl-8.6:0"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" dev-vcs/fossil"
 else
-	BDEPEND="app-arch/unzip
-		>=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-	tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-else
-	S="${WORKDIR}/${PN}-src-${SRC_PV}"
+	BDEPEND+=" app-arch/unzip"
 fi
 
 _fossil_fetch() {
@@ -128,7 +125,7 @@ fossil_fetch() {
 }
 
 src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
+	if [[ ${PV} == 9999 ]]; then
 		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
 		if use doc; then
 			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
@@ -139,10 +136,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 
 	eautoreconf
-
 	multilib_copy_sources
 }
 
@@ -197,7 +193,7 @@ multilib_src_configure() {
 	# https://sqlite.org/fts3.html
 	# https://sqlite.org/fts5.html
 	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
-	options+=(--enable-fts5)
+	options+=( --enable-fts5 )
 
 	# Support hidden columns.
 	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
@@ -275,10 +271,8 @@ multilib_src_configure() {
 	# https://sqlite.org/uri.html
 	append-cppflags -DSQLITE_USE_URI
 
-	# debug USE flag.
-	options+=($(use_enable debug))
+	options+=( $(use_enable debug) )
 
-	# icu USE flag.
 	if use icu; then
 		# Support ICU extension.
 		# https://sqlite.org/compile.html#enable_icu
@@ -286,16 +280,15 @@ multilib_src_configure() {
 		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
 	fi
 
-	# readline USE flag.
 	options+=(
 		--disable-editline
 		$(use_enable readline)
 	)
+
 	if use readline; then
-		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
+		options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" )
 	fi
 
-	# secure-delete USE flag.
 	if use secure-delete; then
 		# Enable secure_delete pragma by default.
 		# https://sqlite.org/compile.html#secure_delete
@@ -303,8 +296,7 @@ multilib_src_configure() {
 		append-cppflags -DSQLITE_SECURE_DELETE
 	fi
 
-	# static-libs USE flag.
-	options+=($(use_enable static-libs static))
+	options+=( $(use_enable static-libs static) )
 
 	# tcl, test, tools USE flags.
 	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
@@ -313,7 +305,7 @@ multilib_src_configure() {
 			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
 		)
 	else
-		options+=(--disable-tcl)
+		options+=( --disable-tcl )
 	fi
 
 	if [[ "${ABI}" == "x86" ]]; then
@@ -335,13 +327,13 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+	emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 
 	if use tools && multilib_is_native_abi; then
 		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
 	fi
 
-	if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
+	if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then
 		emake tclsqlite3.c
 
 		local build_directory="$(pwd)"
@@ -366,11 +358,11 @@ multilib_src_test() {
 	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
 
 	# e_uri.test tries to open files in /.
-	# https://bugs.gentoo.org/839798
+	# bug #839798
 	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
 	addpredict "/test.db:/ÿ.db"
 
-	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+	emake HAVE_TCL="$(usex tcl 1 "")" $(usex debug 'fulltest' 'test')
 }
 
 multilib_src_install() {
@@ -413,14 +405,14 @@ multilib_src_install_all() {
 	doman sqlite3.1
 
 	if use doc; then
-		if [[ "${PV}" == "9999" ]]; then
+		if [[ ${PV} == 9999 ]]; then
 			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
 		else
 			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
 		fi
 
 		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
-		if [[ "${PV}" != "9999" ]]; then
+		if [[ ${PV} != 9999 ]]; then
 			rm search search.d/admin || die
 			rmdir search.d || die
 			find -name "*~" -delete || die
diff --git 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
index 5509346c04..36767a3386 100644
--- 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
@@ -16,7 +16,7 @@ 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"
+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
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/Manifest
new file mode 100644
index 0000000000..7b18c4778b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/Manifest
@@ -0,0 +1 @@
+DIST cJSON-1.7.15.tar.gz 352278 BLAKE2B e0de3b8d56020853d56f5512e6e7216adafd238b6f69bbf6965b153bfe8ebfc23593dfa7cfb8543d8730d90820153d263c8af276c8e9588ba8a5ad76a50f8b72 SHA512 0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/cJSON-1.7.15.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/cJSON-1.7.15.ebuild
new file mode 100644
index 0000000000..9f043a529b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/cJSON-1.7.15.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Ultralightweight JSON parser in ANSI C"
+HOMEPAGE="https://github.com/DaveGamble/cJSON"
+SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e '/-Werror/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CJSON_TEST=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/metadata.xml
new file mode 100644
index 0000000000..f6c7e060f7
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mattst88@gentoo.org</email>
+    <name>Matt Turner</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">DaveGamble/cJSON</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest
index 8714876d64..e298847984 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest
@@ -1,3 +1,3 @@
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
-DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
+DIST glib-2.74.2.tar.xz 5182312 BLAKE2B 319a8fb793adb7343b77119d7b7839efad6f91b9c7af079f53d54b435067ab12162c4791ca6b8e9b7fd6d269975e9559951cbf80a065072541f407a0d8e2ce74 SHA512 90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.0-clang-build.patch b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.0-clang-build.patch
deleted file mode 100644
index 23bb0630d0..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.0-clang-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://gitlab.gnome.org/GNOME/glib/-/commit/37dba1c425f6c3254e9ce72f1c4b7d0f95c2be3e
-https://bugs.gentoo.org/871174
-
-From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
-Date: Thu, 15 Sep 2022 12:55:18 +0200
-Subject: [PATCH] gio-launch-desktop: Fix the G_STATIC_ASSERT expressions for
- clang
-
-The clang compiler requires the static_assert expression to be an integral
-constant expression. `"text"` is not, but `sizeof "text"` is.
-
-Fixes #2740
---- a/gio/gio-launch-desktop.c
-+++ b/gio/gio-launch-desktop.c
-@@ -121,8 +121,8 @@ journal_stream_fd (const char *identifier,
-   /* Arbitrary large size for the sending buffer, from systemd */
-   int large_buffer_size = 8 * 1024 * 1024;
- 
--  G_STATIC_ASSERT (LOG_EMERG == 0 && "Linux ABI defines LOG_EMERG");
--  G_STATIC_ASSERT (LOG_DEBUG == 7 && "Linux ABI defines LOG_DEBUG");
-+  G_STATIC_ASSERT (LOG_EMERG == 0 && sizeof "Linux ABI defines LOG_EMERG");
-+  G_STATIC_ASSERT (LOG_DEBUG == 7 && sizeof "Linux ABI defines LOG_DEBUG");
- 
-   fd = socket (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
- 
-GitLab
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.0-crash-gparamspec.patch b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.0-crash-gparamspec.patch
deleted file mode 100644
index 84edcde418..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.0-crash-gparamspec.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://gitlab.gnome.org/GNOME/glib/-/commit/ea3f17d598d550345e94e4571130e429443e91cb
-https://gitlab.gnome.org/GNOME/glib/-/issues/2770
-
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec   *pspec,
- {
-   GParamSpec *param = value->data[0].v_pointer;
- 
-+  if (param == NULL)
-+    return FALSE;
-+
-   return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
- 
-GitLab
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0-r1.ebuild
deleted file mode 100644
index 505345d239..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0-r1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# 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.64.1-mark-gdbus-server-auth-test-flaky.patch
-	"${FILESDIR}"/${P}-clang-build.patch
-	"${FILESDIR}"/${P}-crash-gparamspec.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
-}
diff --git 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
index 0ab9007ca2..cf1afe7d1d 100644
--- 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
@@ -16,7 +16,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u
 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"
+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
@@ -68,7 +68,6 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.74.0-crash-gparamspec.patch
 	"${FILESDIR}"/${P}-gnome-keyring-cpu.patch
 )
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.2.ebuild
similarity index 99%
rename from sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.2.ebuild
index de789c7521..c62ece284c 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.2.ebuild
@@ -68,7 +68,7 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.74.0-crash-gparamspec.patch
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
 )
 
 pkg_setup() {
diff --git 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
index 8a873e82dd..6e70bb93eb 100644
--- 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:
diff --git 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
index 16e09b0f1f..6ac6d58ec4 100644
--- 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="
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest
new file mode 100644
index 0000000000..1879967af9
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest
@@ -0,0 +1 @@
+DIST b2-4.9.2.tar.gz 975882 BLAKE2B 83c2ef85c9f1ae20922541ca8c344316f1660ee069426e3a9907c0a19e1c94db470c67d0c29a1f31788eddb86ab414ab06b9713f8ea53d974d1d8f0ca29f4aa5 SHA512 eab180770608b863dcf6a5fbc626e1733cf4353cf62f4189bd28258a03591fdb7853f5dddb4d3dad60f1bb06db5415025b792a30c2c65f7b1278f61e33f903e3
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild
new file mode 100644
index 0000000000..3adfbfd963
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://www.bfgroup.xyz/b2/"
+SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+RESTRICT="test"
+
+RDEPEND="!dev-util/boost-build"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-4.9.2-respect-user-flags.patch
+	"${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch
+	"${FILESDIR}"/${PN}-4.9.2-odr.patch
+)
+
+src_configure() {
+	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
+	append-lfs-flags
+}
+
+src_compile() {
+	cd engine || die
+	edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python
+}
+
+src_test() {
+	# Forget tests, b2 is a lost cause
+	:
+}
+
+src_install() {
+	dobin engine/b2
+
+	insinto /usr/share/b2/src
+	doins -r "${FILESDIR}/site-config.jam" \
+		bootstrap.jam build-system.jam ../example/user-config.jam \
+		build kernel options tools util
+
+	find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.73.0-add-none-feature-options.patch b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-add-none-feature-options.patch
similarity index 65%
rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.73.0-add-none-feature-options.patch
rename to sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-add-none-feature-options.patch
index 1918a2456a..620dea0af5 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.73.0-add-none-feature-options.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-add-none-feature-options.patch
@@ -1,6 +1,6 @@
 --- a/tools/features/debug-feature.jam
 +++ b/tools/features/debug-feature.jam
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ common usage is to build release variant with debugging information.
  |# # end::doc[]
  
  feature.feature debug-symbols
@@ -11,12 +11,12 @@
  #| tag::prof-doc[]
 --- a/tools/features/optimization-feature.jam
 +++ b/tools/features/optimization-feature.jam
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ smaller binary.
  |# # end::doc[]
  
  feature.feature optimization
--    : off speed space
-+    : off none speed space
+-    : off speed space minimal debug
++    : off none speed space minimal debug
      : propagated ;
  
  #| tag::inline-doc[]
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-darwin-gentoo-toolchain.patch b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-darwin-gentoo-toolchain.patch
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-darwin-gentoo-toolchain.patch
rename to sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-darwin-gentoo-toolchain.patch
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-disable_python_rpath.patch
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch
rename to sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-disable_python_rpath.patch
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-no-implicit-march-flags.patch b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-no-implicit-march-flags.patch
new file mode 100644
index 0000000000..2845d6e52f
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-no-implicit-march-flags.patch
@@ -0,0 +1,148 @@
+--- a/tools/gcc.jam
++++ b/tools/gcc.jam
+@@ -1131,145 +1131,11 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
+ # x86 and compatible
+ # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default.
+ # Use i686 instead for 32-bit.
+-toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ;
+-cpu-flags gcc OPTIONS : x86 : native : -march=native ;
+-cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;
+-cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ;
+-cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;
+-cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ;
+-cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ;
+-cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ;
+-cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ;
+-cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ;
+-cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ;
+-cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ;
+-cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ;
+-cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ;
+-cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ;
+-cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ;
+-cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ;
+-cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ;
+-cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ;
+-cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ;
+-cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ;
+-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
+-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
+-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
+-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
+-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
+-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
+-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
+-cpu-flags gcc OPTIONS : x86 : icelake-client : -march=icelake-client ;
+-cpu-flags gcc OPTIONS : x86 : icelake-server : -march=icelake-server ;
+-cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ;
+-cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ;
+-cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ;
+-cpu-flags gcc OPTIONS : x86 : rocketlake : -march=rocketlake ;
+-cpu-flags gcc OPTIONS : x86 : alderlake : -march=alderlake ;
+-cpu-flags gcc OPTIONS : x86 : sapphirerapids : -march=sapphirerapids ;
+-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
+-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
+-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
+-cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ;
+-cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ;
+-cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ;
+-cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ;
+-cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ;
+ ##
+-cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ;
+-cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ;
+-cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ;
+-cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ;
+-cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ;
+-cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ;
+-cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ;
+-cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ;
+-cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ;
+-cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
+-cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
+-cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
+-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
+-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
+-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
+-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
+-cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ;
+-cpu-flags gcc OPTIONS : x86 : znver3 : -march=znver3 ;
+-cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
+-cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
+-cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
+-cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
+-cpu-flags gcc OPTIONS : x86 : c7 : -march=c7 ;
+ ##
+-cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
+ # Sparc
+-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
+-cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
+-cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
+-cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
+-cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
+-cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
+-cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
+-cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
+-cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
+-cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
+-cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
+-cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
+-cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
+-cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
+ # RS/6000 & PowerPC
+-cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
+-cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
+-cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ;
+-cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ;
+-cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ;
+-cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ;
+-cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ;
+-cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ;
+-cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ;
+-cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ;
+-cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ;
+-cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ;
+-cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ;
+-cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ;
+-cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ;
+-cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ;
+-cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ;
+-cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ;
+-cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ;
+-cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ;
+-cpu-flags gcc OPTIONS : power : power : -mcpu=power ;
+-cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ;
+-cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ;
+-cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ;
+-cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ;
+-cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ;
+-cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ;
+-cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ;
+-cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ;
+-cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ;
+-cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ;
+-cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ;
+-cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ;
+-cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
+-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
+-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
+-cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
+ # ARM
+-cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ;
+-cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ;
+-cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ;
+-cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ;
+ # AIX variant of RS/6000 & PowerPC
+ toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
+ 
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-odr.patch b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-odr.patch
new file mode 100644
index 0000000000..62cbca1896
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-odr.patch
@@ -0,0 +1,54 @@
+Avoid ODR violations by giving "_stack" internal linkage
+https://bugs.gentoo.org/858320
+
+--- a/engine/function.cpp
++++ b/engine/function.cpp
+@@ -213,11 +213,11 @@
+ } JAM_FUNCTION;
+ 
+ 
++namespace
++{
+ typedef struct _stack STACK;
+ typedef STACK* stack_ptr;
+ 
+-namespace
+-{
+     template <typename T>
+     using remove_cref_t
+         = typename std::remove_const<
+@@ -260,7 +260,6 @@
+         typename select_last_impl<(sizeof...(A) == 1), type_list<A...> >
+             ::template type<A...>;
+     #endif
+-}
+ 
+ struct _stack
+ {
+@@ -439,6 +438,8 @@
+     cleanups_size += n;
+ }
+ 
++}
++
+ static STACK * stack_global()
+ {
+     static _stack singleton;
+--- a/engine/make1.cpp
++++ b/engine/make1.cpp
+@@ -86,6 +86,7 @@
+ #define T_STATE_MAKE1B  1  /* make1b() should be called */
+ #define T_STATE_MAKE1C  2  /* make1c() should be called */
+ 
++namespace {
+ typedef struct _state state;
+ struct _state
+ {
+@@ -94,6 +95,7 @@
+     TARGET * parent;    /* parent argument necessary for MAKE1A */
+     int32_t  curstate;  /* current state */
+ };
++}
+ 
+ static void make1a( state * const );
+ static void make1b( state * const );
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-respect-user-flags.patch b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch
similarity index 83%
rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-respect-user-flags.patch
rename to sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch
index 2289e706ca..b0de4f0e88 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.76.0-respect-user-flags.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch
@@ -1,11 +1,11 @@
 --- a/engine/build.sh
 +++ b/engine/build.sh
-@@ -496,7 +496,7 @@
+@@ -496,7 +496,7 @@ modules/set.cpp \
      if test_true ${B2_DEBUG_OPT} ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}"
      else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG"
      fi
 -    ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 )
 +    ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${CPPFLAGS} ${B2_CXXFLAGS} ${LDFLAGS} ${B2_SOURCES} -o b2 )
-     ( B2_VERBOSE_OPT=${TRUE} echo_run cp b2 bjam )
  }
  
+ if test_true ${B2_VERBOSE_OPT} ; then
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/site-config.jam b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/site-config.jam
similarity index 100%
rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/site-config.jam
rename to sdk_container/src/third_party/portage-stable/dev-util/b2/files/site-config.jam
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/b2/metadata.xml
similarity index 84%
rename from sdk_container/src/third_party/portage-stable/dev-util/boost-build/metadata.xml
rename to sdk_container/src/third_party/portage-stable/dev-util/b2/metadata.xml
index 95721d4f81..97a8de7cc2 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/metadata.xml
@@ -6,6 +6,6 @@
 		<name>David Seifert</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">boost</remote-id>
+		<remote-id type="github">bfgroup/b2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest
deleted file mode 100644
index 7e0c565941..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.79.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.79.0-r1.ebuild
deleted file mode 100644
index 74cea514f5..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/boost-build-1.79.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="$(ver_rs 1- _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://www.boost.org/build/"
-SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-RESTRICT="test"
-
-RDEPEND="!dev-util/b2"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
-	"${FILESDIR}"/${PN}-1.78.0-darwin-gentoo-toolchain.patch
-	"${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch
-	"${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch
-	"${FILESDIR}"/${PN}-1.78.0-no-implicit-march-flags.patch
-)
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd .. >/dev/null || die
-	eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
-	popd >/dev/null || die
-}
-
-src_configure() {
-	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
-	append-lfs-flags
-}
-
-src_compile() {
-	cd engine || die
-	${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed"
-}
-
-src_test() {
-	# Forget tests, bjam is a lost cause
-	:
-}
-
-src_install() {
-	dobin engine/{bjam,b2}
-
-	insinto /usr/share/boost-build/src
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die
-
-	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r ../example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch
deleted file mode 100644
index 3f8b177c71..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test/startup_v2.py
-+++ b/test/startup_v2.py
-@@ -50,7 +50,7 @@
-     return re.match(expected, actual, re.DOTALL) != None
- 
- 
--t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0)
-+t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0)
- t.set_tree("startup")
- check_for_existing_boost_build_jam(t)
- 
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-no-implicit-march-flags.patch b/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-no-implicit-march-flags.patch
deleted file mode 100644
index 093f40d030..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-util/boost-build/files/boost-build-1.78.0-no-implicit-march-flags.patch
+++ /dev/null
@@ -1,284 +0,0 @@
---- a/tools/gcc.jam
-+++ b/tools/gcc.jam
-@@ -1129,140 +1129,10 @@
- # x86 and compatible
- # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default.
- # Use i686 instead for 32-bit.
--toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ;
--cpu-flags gcc OPTIONS : x86 : native : -march=native ;
--cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;
--cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ;
--cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;
--cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ;
--cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ;
--cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ;
--cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ;
--cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ;
--cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ;
--cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ;
--cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ;
--cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ;
--cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ;
--cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ;
--cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ;
--cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ;
--cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ;
--cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ;
--cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ;
--cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
--cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
--cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
--cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
--cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
--cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
--cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
--cpu-flags gcc OPTIONS : x86 : icelake-client : -march=icelake-client ;
--cpu-flags gcc OPTIONS : x86 : icelake-server : -march=icelake-server ;
--cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ;
--cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ;
--cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ;
--cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
--cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
--cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
--cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ;
--cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ;
--cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ;
--cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ;
--cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ;
- ##
--cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ;
--cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ;
--cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ;
--cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ;
--cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ;
--cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ;
--cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ;
--cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ;
--cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ;
--cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
--cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
--cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
--cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
--cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
--cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
--cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
--cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ;
--cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
--cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
--cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
--cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
--cpu-flags gcc OPTIONS : x86 : c7 : -march=c7 ;
- ##
--cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
- # Sparc
--cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
--cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
--cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
--cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
--cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
--cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
--cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
--cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
--cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
--cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
- # RS/6000 & PowerPC
--cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
--cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
--cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ;
--cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ;
--cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ;
--cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ;
--cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ;
--cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ;
--cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ;
--cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ;
--cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ;
--cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ;
--cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ;
--cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ;
--cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ;
--cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ;
--cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ;
--cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ;
--cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ;
--cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ;
--cpu-flags gcc OPTIONS : power : power : -mcpu=power ;
--cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ;
--cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ;
--cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ;
--cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ;
--cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ;
--cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ;
--cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ;
--cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ;
--cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ;
--cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ;
--cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ;
--cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ;
--cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
--cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
--cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
--cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
- # ARM
--cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ;
--cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ;
--cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ;
--cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ;
- # AIX variant of RS/6000 & PowerPC
- toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
---- a/tools/gcc.py
-+++ b/tools/gcc.py
-@@ -737,138 +737,14 @@
- # x86 and compatible
- flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'i586', ['-march=i586'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'i686', ['-march=i686'], default=True)
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium', ['-march=pentium'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-mmx', ['-march=pentium-mmx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentiumpro', ['-march=pentiumpro'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium2', ['-march=pentium2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3', ['-march=pentium3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3m', ['-march=pentium3m'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-m', ['-march=pentium-m'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4', ['-march=pentium4'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4m', ['-march=pentium4m'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'prescott', ['-march=prescott'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'nocona', ['-march=nocona'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'core2', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-xe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-l', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'allendale', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'wolfdale', ['-march=core2', '-msse4.1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'merom', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'merom-xe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield-xe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'yorksfield', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'penryn', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7', ['-march=corei7'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'nehalem', ['-march=corei7'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7-avx', ['-march=corei7-avx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'sandy-bridge', ['-march=corei7-avx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'core-avx-i', ['-march=core-avx-i'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'ivy-bridge', ['-march=core-avx-i'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'haswell', ['-march=core-avx-i', '-mavx2', '-mfma', '-mbmi', '-mbmi2', '-mlzcnt'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'broadwell', ['-march=broadwell'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'skylake', ['-march=skylake'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'skylake-avx512', ['-march=skylake-avx512'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'cannonlake', ['-march=skylake-avx512', '-mavx512vbmi', '-mavx512ifma', '-msha'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'icelake-client', ['-march=icelake-client'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'icelake-server', ['-march=icelake-server'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'cascadelake', ['-march=skylake-avx512', '-mavx512vnni'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'cooperlake', ['-march=cooperlake'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'tigerlake', ['-march=tigerlake'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k6', ['-march=k6'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-2', ['-march=k6-2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-3', ['-march=k6-3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon', ['-march=athlon'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-tbird', ['-march=athlon-tbird'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-4', ['-march=athlon-4'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-xp', ['-march=athlon-xp'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-mp', ['-march=athlon-mp'])
- ##
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k8', ['-march=k8'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron', ['-march=opteron'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64', ['-march=athlon64'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-fx', ['-march=athlon-fx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k8-sse3', ['-march=k8-sse3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron-sse3', ['-march=opteron-sse3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64-sse3', ['-march=athlon64-sse3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'amdfam10', ['-march=amdfam10'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'barcelona', ['-march=barcelona'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver1', ['-march=bdver1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver2', ['-march=bdver2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver3', ['-march=bdver3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'btver1', ['-march=btver1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'btver2', ['-march=btver2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'znver1', ['-march=znver1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'znver2', ['-march=znver2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip-c6', ['-march=winchip-c6'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip2', ['-march=winchip2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'c3', ['-march=c3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'c3-2', ['-march=c3-2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'c7', ['-march=c7'])
- ##
--cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom'])
- # Sparc
- flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True)
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3'])
- # RS/6000 & PowerPC
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'power', '403', ['-mcpu=403'])
--cpu_flags('gcc', 'OPTIONS', 'power', '505', ['-mcpu=505'])
--cpu_flags('gcc', 'OPTIONS', 'power', '601', ['-mcpu=601'])
--cpu_flags('gcc', 'OPTIONS', 'power', '602', ['-mcpu=602'])
--cpu_flags('gcc', 'OPTIONS', 'power', '603', ['-mcpu=603'])
--cpu_flags('gcc', 'OPTIONS', 'power', '603e', ['-mcpu=603e'])
--cpu_flags('gcc', 'OPTIONS', 'power', '604', ['-mcpu=604'])
--cpu_flags('gcc', 'OPTIONS', 'power', '604e', ['-mcpu=604e'])
--cpu_flags('gcc', 'OPTIONS', 'power', '620', ['-mcpu=620'])
--cpu_flags('gcc', 'OPTIONS', 'power', '630', ['-mcpu=630'])
--cpu_flags('gcc', 'OPTIONS', 'power', '740', ['-mcpu=740'])
--cpu_flags('gcc', 'OPTIONS', 'power', '7400', ['-mcpu=7400'])
--cpu_flags('gcc', 'OPTIONS', 'power', '7450', ['-mcpu=7450'])
--cpu_flags('gcc', 'OPTIONS', 'power', '750', ['-mcpu=750'])
--cpu_flags('gcc', 'OPTIONS', 'power', '801', ['-mcpu=801'])
--cpu_flags('gcc', 'OPTIONS', 'power', '821', ['-mcpu=821'])
--cpu_flags('gcc', 'OPTIONS', 'power', '823', ['-mcpu=823'])
--cpu_flags('gcc', 'OPTIONS', 'power', '860', ['-mcpu=860'])
--cpu_flags('gcc', 'OPTIONS', 'power', '970', ['-mcpu=970'])
--cpu_flags('gcc', 'OPTIONS', 'power', '8540', ['-mcpu=8540'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power', ['-mcpu=power'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power2', ['-mcpu=power2'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power3', ['-mcpu=power3'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power4', ['-mcpu=power4'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power5', ['-mcpu=power5'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc', ['-mcpu=powerpc'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc64', ['-mcpu=powerpc64'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rios', ['-mcpu=rios'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rios1', ['-mcpu=rios1'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rios2', ['-mcpu=rios2'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rsc', ['-mcpu=rsc'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rs64a', ['-mcpu=rs64'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'z196', ['-march=z196'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'zEC12', ['-march=zEC12'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'z13', ['-march=z13'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'z14', ['-march=z14'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'z15', ['-march=z15'])
- # AIX variant of RS/6000 & PowerPC
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32/<target-os>aix'], ['-maix32'])
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64/<target-os>aix'], ['-maix64'])
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest
index 8714876d64..878c1cbe29 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest
@@ -1,3 +1,4 @@
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
+DIST glib-2.74.2.tar.xz 5182312 BLAKE2B 319a8fb793adb7343b77119d7b7839efad6f91b9c7af079f53d54b435067ab12162c4791ca6b8e9b7fd6d269975e9559951cbf80a065072541f407a0d8e2ce74 SHA512 90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895
diff --git 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
index 13e4f6328c..99d18cefba 100644
--- 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}"
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.2.ebuild
new file mode 100644
index 0000000000..6964fb9fd4
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+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"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest
index 8714876d64..878c1cbe29 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest
@@ -1,3 +1,4 @@
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 DIST glib-2.74.0.tar.xz 5183072 BLAKE2B b21e5a72e2ce3390cbf13601aa902104f1ac1cfbd75181d30cd340f24b5875753f898b229f99c71d47d499be86cddb0191a0072c0c2decc82956a46c16255905 SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225
 DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
+DIST glib-2.74.2.tar.xz 5182312 BLAKE2B 319a8fb793adb7343b77119d7b7839efad6f91b9c7af079f53d54b435067ab12162c4791ca6b8e9b7fd6d269975e9559951cbf80a065072541f407a0d8e2ce74 SHA512 90bb2410f038e47401fc985ff7fe6d1abecec9417254e039ac18e6b0d77e0b8539b975bef84d5f933be8e43c8ceca236bd466622504491e08e71d079d8804895
diff --git 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
index 9a907a69e5..fb40867171 100644
--- 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}"
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.2.ebuild
new file mode 100644
index 0000000000..c715c1e6fd
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+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"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest
index 59291c291e..d32c8f907f 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest
@@ -1,4 +1,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
+DIST meson-0.64.1.tar.gz 2089752 BLAKE2B e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07 SHA512 4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.2-r1.ebuild
index 4001abf8a0..8c8f381c95 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.2-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.2-r1.ebuild
@@ -36,6 +36,9 @@ DEPEND="
 		virtual/pkgconfig
 	)
 "
+RDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.3.ebuild
index f2e31397c0..8c8f381c95 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.3.ebuild
@@ -13,7 +13,7 @@ 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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs
@@ -36,6 +36,9 @@ DEPEND="
 		virtual/pkgconfig
 	)
 "
+RDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.0.ebuild
index 9bcc50e7e8..7eaa764dfc 100644
--- 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
@@ -39,6 +39,9 @@ DEPEND="
 		virtual/pkgconfig
 	)
 "
+RDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.62.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.1.ebuild
similarity index 85%
rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.62.2.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.1.ebuild
index f424a7baab..7eaa764dfc 100644
--- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.62.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.1.ebuild
@@ -10,8 +10,13 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
 	inherit git-r3
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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"
+	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
@@ -34,6 +39,13 @@ DEPEND="
 		virtual/pkgconfig
 	)
 "
+RDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
+)
 
 python_prepare_all() {
 	local disable_unittests=(
diff --git 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
index 9bcc50e7e8..7eaa764dfc 100644
--- 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
@@ -39,6 +39,9 @@ DEPEND="
 		virtual/pkgconfig
 	)
 "
+RDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest
index dcefedeb85..7d66728032 100644
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest
@@ -4,15 +4,18 @@ DIST git-2.37.3.tar.xz 6987464 BLAKE2B b672ed0a99532b2e2e69babbea9155e39f05590a7
 DIST git-2.37.4.tar.xz 6990080 BLAKE2B 731ae7ff4247fd9d300b2b2b27074cce2d62b6333051bbdb161cdf644b4b40247963a978e1ed25a4f8fc9b544b52aa94ef97abf16db46ffcb688efab380efaec SHA512 f13a25548f6463ee0c3e662819a4af13dfafa8d18108534aeaebafd9a36c84dbea913402d781f7bc1436560c9937d76fd78b39cafa5864f576a1278ed96a9a80
 DIST git-2.38.0.tar.xz 7086664 BLAKE2B 800f46dc08b5a4df7437e07c7c9c23c29a3bfcbcc624e482590bbd15c046691922799e7d8650ef0b10825363b57060211f4692a639f095dcc1c6dcf0c43d726d SHA512 5c475d25b40a01cc62be28478b9b5a1b0cedf91c3e007d4869019a25bdc980b5ef9b761e7ee02d7c581bff6c7dbf2696a624431a718dcd976bad34a3f2be5cb6
 DIST git-2.38.1.tar.xz 7088208 BLAKE2B 50e4e9ef04d9eef7c10aba1f0d53d5d15f50ea9a8c344733e7a7865e2f2a833edb4f4b5882f47dd39389dfdedf22a813cfe3d35ab950d6543d21e0294ce17f2d SHA512 e62ca6f54f01d2e4ccffb5f94e8e5cd2f3e098b766d909c694a8daf4d00d5cdeb9cc5ff8e9bc55d888406f292ba99433d334d4da9689c0ce5d7299a3c67c90e0
+DIST git-2.39.0.rc0.tar.xz 7145656 BLAKE2B 16d83de063441928a0dde93c879173f33343a6836ff4fc2983846b31e3b2590c5152b6c7e140a12727f47083af5aad69f88965d23df9c7be3fd207af87dff31a SHA512 da92b6b8ec804712f035cb4017ab5d277ca3149749921455cc362a11f7cb96d4347d1eb9e7d02fc31bc0c06f3bdc5ef7c4f40d02f9b92f42e708a2f474e28ea6
 DIST git-htmldocs-2.35.1.tar.xz 1410148 BLAKE2B 68c3d12341271b861f42135bd4bd6e68ebcc6466931d383378b49aac42f77187f3fadc237974349cb0b50e4c5fb7a8ab185114341dd3012d159e420405d9ef91 SHA512 52a40644a7cd38caddecc43182863ca2f456644fff918ed4c8f826cbf269352c73d6bdc9119d25fcf537bc2fa38750791013329e4b0e32c8d14f0769dab85804
 DIST git-htmldocs-2.35.5.tar.xz 1412776 BLAKE2B a76fafacd1f27f6c9e1acbf14a6b924228f1a66b0d69a7e533213aad3e3bacd38a353fb163fcfa3e5eca2a2c5396b4b9f1d34fbd27c3bbe002a8cebd3e3416c5 SHA512 4eca490371d4ba3c917a93f5f1d4a0ccb047ab177bb0080d91db0ba524895923ad7aaf61cd6bf404817d0d17fe7dfca687f44f3e8117df3b0f57dd3d5972d8ef
 DIST git-htmldocs-2.37.3.tar.xz 1447620 BLAKE2B 4efb86fb5431fd96ec4bcad7ecd9d5ae1d3f81f57f17dab4d8343948758f66b549b2442330b20cdb4ecd96f2029f4e7a376de5561fd9eda70acc46d2cffd7090 SHA512 ecc483a1fecf8c056a57e14a59950dc8a00f7940453dd5e2ccfd8dab966a9fee47178a7bbf8988e2c9a67ea6d84ffc33be790c49f812fb0ba661b57b7ff7b6ef
 DIST git-htmldocs-2.37.4.tar.xz 1448376 BLAKE2B 2414b2f18e3c75c377400623f9e804b6fd5623724834ce52d2680cc10839466d52a8407cac9ed0c8c5928d65058963fe62e9ae2e31f1b695ea3a6fc18ea1938a SHA512 638feee014498af63ea083540b065778d3e3b7fdec9bb7f6e915bbc524e1525e0c4056f8af7d859376b60fcc936cb0ac1e6f83ff940e09f822dfa11570465db4
 DIST git-htmldocs-2.38.0.tar.xz 1478392 BLAKE2B d90dff60ed0acbf4b86049c06bc2978839906ebcc6aa6a12d8e78408bb79f8f62f38431f58bff18afec69ba99953de9d3815ddc270c3381b7ce7ea62980d9287 SHA512 460720021db8cef9125f9dfdfea54af05986b658958346d68e5dd8b6b13cb21797b3d6393888fb31b509d76b1e722f6e646bc5857daee507fa410dada4273924
 DIST git-htmldocs-2.38.1.tar.xz 1479360 BLAKE2B 72d33a04c94ccb250def2136a2967fd333f3704f8e525f065b508cee890058546fec4e5b1349285b83768a7bd1513c0fac8d9ca287e5e964e6f1ec0d055ef7de SHA512 740da4546bdc0e9c4131e9dd0775662525aeb30a468fc4be63bb09c728da2903d479da5b7ef25d5ee029690ff5c9640de0271c7defcba1fadfa4a21f96d0aa8b
+DIST git-htmldocs-2.39.0.rc0.tar.xz 1502740 BLAKE2B 50a58c86c31f9f2f9c05f61f12ac3a3754bcd2d41ef2c61ca8ae21f75caed6fa09d06a4c5a1291b99c063a0d1d6571a04eaee4077f10e48c20c0751de1df4511 SHA512 7a471b89a62081c4369bb7db90d8804e8c71b67d798c39ff58c79feed190f98c9eb08e68b72acd50b802b83c67ad64311854f47f13116ce201893ccefb6d298f
 DIST git-manpages-2.35.1.tar.xz 497284 BLAKE2B 2d0d633320982243316575cc278df6c6a9ef181bf45ea9c1c8288e2677e4e71a33af96bada9bd90b03310be7dd33f2762b6b95489e267e2c191dcc7d1a715fe7 SHA512 0f4c46880f0e6d493112dcd4753fbe3702c06aa68be09bcbfc90263a355deba080995a08916b1f2404e4e17d720ee0de46a55e450c6cabeb1c147dcb2cd919d5
 DIST git-manpages-2.35.5.tar.xz 497864 BLAKE2B f68b528006e5393435f059f35dccb79250bf27fb79fd80fe72de70fa2e0c5158b8d9f7be95a4ed8c53dd40fa1aae874d529b0c73a1dfd378e85f84e382560d2c SHA512 efb2595a69f2c2548d0a10e6ad692a0da9c2b1b5b480f52ae9dc184f9de4ea4ddf5b05caaf9b567f9a3fbbf3a6b7aa5949b9c62e73f1a11ef40093c34353baf2
 DIST git-manpages-2.37.3.tar.xz 510096 BLAKE2B 0bc0b8c1818a06a6c7126119c04d2936bd38e997027bb31be5ad6bea2b43d71c5e9a76a29c576d84bd00c11f09bca7a67aa78a72f0171b41b93f6322c3b23808 SHA512 b25d4925f64e4de220dc9133d6e3ed13a397b160c27550c8700b76226f2b3a1611aec9ee24110ae16ebaceedc6617c6a04aa1b44270c7a0f166dd40d8f2f1132
 DIST git-manpages-2.37.4.tar.xz 510016 BLAKE2B 03cba56a27039547429eca6a3dfda600d2b1332a6b0da321a1abc8bb311b03e46c389fdbbd7aafc8b5863730e9417ebbd3195ce04408e3f229e646d134a2ac13 SHA512 8cf5ae54ae3e86929f375ea2d229ecda7d8b5c8a7f7fbe790334fcd38069285b58636320b1886030402ac9d46ed324c1d26784fff14077f661c43ef98b5f5ec7
 DIST git-manpages-2.38.0.tar.xz 553512 BLAKE2B e2498a2363859ba21b65d7582090725f34e3b50fb7448e847d2711ef0c921aa7ec459e90dd8fa70bf43f04c40efc585d90c285c66241496a354f0cc3b6a37e49 SHA512 45e074a44840b00115546105bfd7bc1c3433234eee5777ecf0698b2f36f34c62effd6b258e06f67a22a8321654a0be5aaab0197c7e2ab615716c7015adfe6693
 DIST git-manpages-2.38.1.tar.xz 553484 BLAKE2B 991e7f3916106e346921f6ae281df803b663b7fb4584f98f48f61a121030db8e5a1a97ecb147bf1559408893d3c9692c58b2890ff5a5a00bd451d8f20b73efdb SHA512 d2c75efc497ec62733be0ae0092a256dedb2a24b765e516218c9d96466aef34a0f2a118f68618ea457bf0fb39f5986c52022870116de974b21f541e0994c7d67
+DIST git-manpages-2.39.0.rc0.tar.xz 557232 BLAKE2B 4a685d324c2ad44b9cc1e3e95ab24157bff2e11712913de1583e2d5ad9bfb3afb01ce0c0f136ff83f9c381403e5d1f5cf1e3a3d21a3a67ec9e2b5889ea1061c7 SHA512 9698c673b4d00c68b6bbbc2c21ea8eb701bdd1a2b6028dcba161e7342638aabdf4969fd4e00b24a43aa78066d37cd560e53c2ab3ba8e36fa0a86dd94dc0927ec
diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.0_rc0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.0_rc0.ebuild
new file mode 100644
index 0000000000..40e868cbc0
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.0_rc0.ebuild
@@ -0,0 +1,657 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+
+	inherit git-r3
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case ${PVR} in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+
+	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
+
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	dev-libs/openssl:=
+	sys-libs/zlib
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	iconv? ( virtual/libiconv )
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:= )
+"
+RDEPEND="
+	${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	gnome-keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Avoid automagic CVS, bug #350330
+	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned!"
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+
+		$(usev elibc_musl NO_REGEX=YesPlease)
+		$(usev !cvs NO_CVS=YesPlease)
+		$(usev !iconv NO_ICONV=YesPlease)
+		$(usev !nls NO_GETTEXT=YesPlease)
+		$(usev !perforce NO_PYTHON=YesPlease)
+		$(usev !subversion NO_SVN_TESTS=YesPlease)
+		$(usev !tk NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# Broken assumptions because of static build system
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# Can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+
+		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	myopts+=( ASCIIDOC8=YesPlease )
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
+	fi
+
+}
+
+src_prepare() {
+	# Add experimental patches to improve mediawiki support,
+	# see patches for origin.
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	if ! use safe-directory ; then
+		# This patch neuters the "safe directory" detection.
+		# bugs #838271, #838223
+		PATCHES+=(
+			"${FILESDIR}"/git-2.37.2-unsafe-directory.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+
+	local mymakeargs=(
+		${MY_MAKEOPTS}
+
+		prefix="${EPREFIX}"/usr
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
+		sysconfdir="${EPREFIX}"/etc
+
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+		# TODO: --verbose?
+		GIT_TEST_OPTS="--no-color"
+
+		OPTAR="$(tc-getAR)"
+		OPTCC="$(tc-getCC)"
+		OPTCFLAGS="${CFLAGS}"
+		OPTLDFLAGS="${LDFLAGS}"
+
+		PERL_PATH="${EPREFIX}/usr/bin/perl"
+		PERL_MM_OPT=""
+
+		PYTHON_PATH="${PYTHON_PATH}"
+
+		V=1
+		"$@"
+	)
+
+	emake "${mymakeargs[@]}"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake
+
+	if use perl && use cgi ; then
+		git_emake gitweb
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		git_emake -C contrib/credential/osxkeychain
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man
+		if use doc ; then
+			git_emake info html
+		fi
+	else
+		if use doc ; then
+			git_emake info
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		git_emake -C contrib/credential/libsecret
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	git_emake -C contrib/diff-highlight
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git
+	fi
+}
+
+src_test() {
+	local disabled=(
+		# We make safe-directory optional
+		t0033-safe-directory.sh
+	)
+
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - removed upstream
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+		elog "completion."
+		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+		elog "Note that the prompt bash code is now in that separate script"
+	fi
+
+	optfeature_header "Some scripts require additional dependencies:"
+	optfeature git-quiltimport dev-util/quilt
+	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
+
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
diff --git a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass
index ab9040d99c..e93338ac6b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass
@@ -93,15 +93,15 @@ fi
 if [[ -n ${WANT_AUTOCONF} ]] ; then
 	case ${WANT_AUTOCONF} in
 		none)       _autoconf_atom="" ;; # some packages don't require autoconf at all
-		2.1)        _autoconf_atom="~sys-devel/autoconf-2.13" ;;
+		2.1)        _autoconf_atom=">=sys-devel/autoconf-2.13-r7:2.1" ;;
 		# if you change the "latest" version here, change also autotools_env_setup
-		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.71" ;;
+		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.71-r5" ;;
 		*)          die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;;
 	esac
 	export WANT_AUTOCONF
 fi
 
-_libtool_atom=">=sys-devel/libtool-2.4"
+_libtool_atom=">=sys-devel/libtool-2.4.7"
 if [[ -n ${WANT_LIBTOOL} ]] ; then
 	case ${WANT_LIBTOOL} in
 		none)   _libtool_atom="" ;;
diff --git a/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass
index 0dffd2eb86..9be502fa8a 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass
@@ -62,6 +62,16 @@ case "${NINJA}" in
 	;;
 esac
 
+# @FUNCTION: get_NINJAOPTS
+# @DESCRIPTION:
+# Get the value of NINJAOPTS, inferring them from MAKEOPTS if unset.
+get_NINJAOPTS() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		NINJAOPTS="-j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
+	fi
+	echo "${NINJAOPTS}"
+}
+
 # @FUNCTION: eninja
 # @USAGE: [<args>...]
 # @DESCRIPTION:
@@ -72,11 +82,8 @@ eninja() {
 	local nonfatal_args=()
 	[[ ${EAPI} != 5 ]] && nonfatal_args+=( -n )
 
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		NINJAOPTS="-j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0)"
-	fi
 	[[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}"
-	set -- "${NINJA}" -v ${NINJAOPTS} "$@"
+	set -- "${NINJA}" -v $(get_NINJAOPTS) "$@"
 	echo "$@" >&2
 	"$@" || die "${nonfatal_args[@]}" "${*} failed"
 }
diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
index 4b96a08735..2bed15110e 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass
@@ -100,12 +100,6 @@ 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:
@@ -295,8 +289,7 @@ fi
 
 #---->> DEPEND <<----
 
-RDEPEND="
-	sys-libs/zlib
+RDEPEND="sys-libs/zlib
 	virtual/libiconv
 	nls? ( virtual/libintl )
 "
@@ -327,18 +320,10 @@ 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
diff --git a/sdk_container/src/third_party/portage-stable/licenses/Artistic b/sdk_container/src/third_party/portage-stable/licenses/Artistic
index 5f221241e8..bf190b2d47 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/Artistic
+++ b/sdk_container/src/third_party/portage-stable/licenses/Artistic
@@ -1,131 +1,144 @@
+The Artistic License
 
-
-
-
-			 The "Artistic License"
-
-				Preamble
+Preamble
 
 The intent of this document is to state the conditions under which a
 Package may be copied, such that the Copyright Holder maintains some
 semblance of artistic control over the development of the package,
 while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
+the Package in a more-or-less customary fashion, plus the right to
+make reasonable modifications.
 
 Definitions:
 
-	"Package" refers to the collection of files distributed by the
-	Copyright Holder, and derivatives of that collection of files
-	created through textual modification.
+    "Package" refers to the collection of files distributed by the
+    Copyright Holder, and derivatives of that collection of files
+    created through textual modification.
 
-	"Standard Version" refers to such a Package if it has not been
-	modified, or has been modified in accordance with the wishes
-	of the Copyright Holder as specified below.
+    "Standard Version" refers to such a Package if it has not been
+    modified, or has been modified in accordance with the wishes of
+    the Copyright Holder {as specified below}.
 
-	"Copyright Holder" is whoever is named in the copyright or
-	copyrights for the package.
+    "Copyright Holder" is whoever is named in the copyright or
+    copyrights for the package.
 
-	"You" is you, if you're thinking about copying or distributing
-	this Package.
+    "You" is you, if you're thinking about copying or distributing
+    this Package.  "Reasonable copying fee" is whatever you can
+    justify on the basis of media cost, duplication charges, time of
+    people involved, and so on. (You will not be required to justify
+    it to the Copyright Holder, but only to the computing community at
+    large as a market that must bear the fee.)
 
-	"Reasonable copying fee" is whatever you can justify on the
-	basis of media cost, duplication charges, time of people involved,
-	and so on.  (You will not be required to justify it to the
-	Copyright Holder, but only to the computing community at large
-	as a market that must bear the fee.)
+    "Freely Available" means that no fee is charged for the item
+    itself, though there may be fees involved in handling the item.
+    It also means that recipients of the item may redistribute it
+    under the same conditions they received it.
 
-	"Freely Available" means that no fee is charged for the item
-	itself, though there may be fees involved in handling the item.
-	It also means that recipients of the item may redistribute it
-	under the same conditions they received it.
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
+1. You may make and give away verbatim copies of the source form of
+   the Standard Version of this Package without restriction, provided
+   that you duplicate all of the original copyright notices and
+   associated disclaimers.
 
 2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.
+   derived from the Public Domain or from the Copyright Holder. A
+   Package modified in such a way shall still be considered the
+   Standard Version.
 
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
+3. You may otherwise modify your copy of this Package in any way,
+   provided that you insert a prominent notice in each changed file
+   stating how and when you changed that file, and provided that you
+   do at least ONE of the following:
 
-    a) place your modifications in the Public Domain or otherwise make them
-    Freely Available, such as by posting said modifications to Usenet or
-    an equivalent medium, or placing the modifications on a major archive
-    site such as uunet.uu.net, or by allowing the Copyright Holder to include
-    your modifications in the Standard Version of the Package.
+    a) place your modifications in the Public Domain or otherwise make
+       them Freely Available, such as by posting said modifications to
+       Usenet or an equivalent medium, or placing the modifications on
+       a major archive site such as uunet.uu.net, or by allowing the
+       Copyright Holder to include your modifications in the Standard
+       Version of the Package.
 
-    b) use the modified Package only within your corporation or organization.
+    b) use the modified Package only within your corporation or
+       organization.
 
-    c) rename any non-standard executables so the names do not conflict
-    with standard executables, which must also be provided, and provide
-    a separate manual page for each non-standard executable that clearly
-    documents how it differs from the Standard Version.
+    c) rename any non-standard executables so the names do not
+       conflict with standard executables, which must also be
+       provided, and provide a separate manual page for each
+       non-standard executable that clearly documents how it differs
+       from the Standard Version.
 
     d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
+   executable form, provided that you do at least ONE of the
+   following:
 
-    a) distribute a Standard Version of the executables and library files,
-    together with instructions (in the manual page or equivalent) on where
-    to get the Standard Version.
+    a) distribute a Standard Version of the executables and library
+       files, together with instructions (in the manual page or
+       equivalent) on where to get the Standard Version.
 
     b) accompany the distribution with the machine-readable source of
-    the Package with your modifications.
+       the Package with your modifications.
 
-    c) give non-standard executables non-standard names, and clearly
-    document the differences in manual pages (or equivalent), together
-    with instructions on where to get the Standard Version.
+    c) [accompany any non-standard executables with their
+       corresponding Standard Version executables, giving the] {give}
+       non-standard executables non-standard names, and clearly
+       [documenting] {document} the differences in manual pages (or
+       equivalent), together with instructions on where to get the
+       Standard Version.
 
     d) make other distribution arrangements with the Copyright Holder.
 
-5. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this
-Package.  You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own.  You may embed this Package's interpreter within
-an executable of yours (by linking); this shall be construed as a mere
-form of aggregation, provided that the complete Standard Version of the
-interpreter is so embedded.
+5. You may charge a reasonable copying fee for any distribution of
+   this Package. You may charge any fee you choose for support of this
+   Package. You may not charge a fee for this Package itself. However,
+   you may distribute this Package in aggregate with other (possibly
+   commercial) programs as part of a larger (possibly commercial)
+   software distribution provided that you do not advertise this
+   Package as a product of your own. {You may embed this Package's
+   interpreter within an executable of yours (by linking); this shall
+   be construed as a mere form of aggregation, provided that the
+   complete Standard Version of the interpreter is so embedded.}
 
 6. The scripts and library files supplied as input to or produced as
-output from the programs of this Package do not automatically fall
-under the copyright of this Package, but belong to whoever generated
-them, and may be sold commercially, and may be aggregated with this
-Package.  If such scripts or library files are aggregated with this
-Package via the so-called "undump" or "unexec" methods of producing a
-binary executable image, then distribution of such an image shall
-neither be construed as a distribution of this Package nor shall it
-fall under the restrictions of Paragraphs 3 and 4, provided that you do
-not represent such an executable image as a Standard Version of this
-Package.
+   output from the programs of this Package do not automatically fall
+   under the copyright of this Package, but belong to whomever
+   generated them, and may be sold commercially, and may be aggregated
+   with this Package. {If such scripts or library files are aggregated
+   with this Package via the so-called "undump" or "unexec" methods of
+   producing a binary executable image, then distribution of such an
+   image shall neither be construed as a distribution of this Package
+   nor shall it fall under the restrictions of Paragraphs 3 and 4,
+   provided that you do not represent such an executable image as a
+   Standard Version of this Package.}
 
-7. C subroutines (or comparably compiled subroutines in other
-languages) supplied by you and linked into this Package in order to
-emulate subroutines and variables of the language defined by this
-Package shall not be considered part of this Package, but are the
-equivalent of input as in Paragraph 6, provided these subroutines do
-not change the language in any way that would cause it to fail the
-regression tests for the language.
+7. C [or perl] subroutines {(or comparably compiled subroutines in
+   other languages)} supplied by you and linked into this Package
+   shall not be considered part of this Package{, but are the
+   equivalent of input as in Paragraph 6, provided these subroutines
+   do not change the language in any way that would cause it to fail
+   the regression tests for the language}.
 
-8. Aggregation of this Package with a commercial distribution is always
-permitted provided that the use of this Package is embedded; that is,
-when no overt attempt is made to make this Package's interfaces visible
-to the end user of the commercial distribution.  Such use shall not be
-construed as a distribution of this Package.
+{8. Aggregation of this Package with a commercial distribution is
+   always permitted provided that the use of this Package is embedded;
+   that is, when no overt attempt is made to make this Package's
+   interfaces visible to the end user of the commercial distribution.
+   Such use shall not be construed as a distribution of this Package.}
 
-9. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
+9. The name of the Copyright Holder may not be used to endorse or
+   promote products derived from this software without specific prior
+   written permission.
 
 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-				The End
+The End
+
+---
+
+Gentoo license note: The original Artistic License and the license
+distributed with Perl differ in some points. Square brackets hold text
+that occurs in the original license, e.g. [or perl]; curly braces hold
+text that occurs in the Perl license, e.g. {as specified below}.
+
+For the sake of readability, minor differences like changed numbering
+of paragraphs, spelling corrections, or updated URLs are not marked.
diff --git a/sdk_container/src/third_party/portage-stable/licenses/Intel-SDP b/sdk_container/src/third_party/portage-stable/licenses/Intel-SDP
index e8bc8b63d0..1319fbc975 100644
--- a/sdk_container/src/third_party/portage-stable/licenses/Intel-SDP
+++ b/sdk_container/src/third_party/portage-stable/licenses/Intel-SDP
@@ -25,384 +25,480 @@ terms (and not this Agreement) govern Your use of the Third Party Programs, and
 Intel is not liable for the Third Party Programs.
 
 End User License Agreement for the Intel(R) Software Development Products
-                            (Version March 2015)
+(Version May 2018)
 
+IMPORTANT INFORMATION ABOUT YOUR RIGHTS, OBLIGATIONS AND THE USE OF YOUR DATA -
+PLEASE READ AND AGREE BEFORE COPYING, INSTALLING OR USING
 
-1. LICENSE DEFINITIONS:
+This Agreement forms a legally binding contract between you, or the company or
+other legal entity ("Legal Entity") for which you represent and warrant that you
+have the legal authority to bind that Legal Entity, (each, "You" or "Your") and
+Intel Corporation and its subsidiaries (collectively "Intel") regarding Your use
+of the Materials. By copying, installing, distributing, publicly displaying, or
+otherwise using the Materials, You agree to be bound by the terms of this
+Agreement. If You do not agree to the terms of this Agreement, do not copy,
+install, distribute, publicly display, or use the Materials. You affirm that You
+are 18 years old or older or, if not, Your parent, legal guardian or Legal
+Entity must agree and enter into this Agreement.
 
-   A. "Confidential Information" means all Materials (as defined below),
-   including without limitation, any Pre-Release Materials, that are identified
-   (in the product release notes, on Intel's download website for the Materials
-   or elsewhere) or labeled as Intel confidential information or a similar
-   legend.
+1. LICENSE DEFINITIONS.
 
-   B. "Excluded License" means a license that requires, as a condition of use,
-   modification, or distribution, that the licensed software or other software
-   incorporated into, derived from or distributed with such software (a) be
-   disclosed or distributed in Source Code form; (b) be licensed by the user to
-   third parties for the purpose of making and/or distributing derivative works;
-   or (c) be redistributable at no charge.  Excluded Licenses include, without
-   limitation, licenses that license or distribute software under any of the
-   following licenses or distribution models, or licenses or distribution models
-   substantially similar to any of the following: (a) GNU's General Public
-   License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g.,
-   PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e)
-   the Sun Community Source License (SCSL), (f) the Sun Industry Source License
-   (SISL), and (g) the Common Public License (CPL).
-   
-   C. "IPP Sample Source" is the Source Code file(s) that: (i) demonstrates
-   certain limited functions included in the binary libraries of the Intel(R)
-   Integrated Performance Primitives ("Intel(R) IPP"); (ii) is identified as
-   Intel IPP sample source code; (iii) is obtained separately from Intel after
-   You register Your copy of the Intel(R) IPP product with Intel; and (iv) is
-   subject to all of the terms and conditions of this Agreement.
-   
-   D. "Licensed Patent Claims" means the claims of Intel's patents that are
-   necessarily and directly infringed by the reproduction and distribution of
-   the Materials that is authorized in Section 2 below, when the Materials is in
-   its unmodified form as delivered by Intel to You and not modified or combined
-   with anything else.  Licensed Patent Claims are only those claims that Intel
-   can license without paying, or getting the consent of, a third party.
-   
-   E. "Materials" are defined as the software, documentation, the software
-   product serial number and license key codes (if applicable), and other
-   materials, including any modifications, updates and upgrades thereto, that
-   are provided to You under this Agreement.  Materials also include any
-   Redistributables, Source Code, and Pre-Release Materials, as defined below
-   but do not include Third Party Programs.
-   
-   F. "Microsoft Platforms" means any current and future Microsoft operating
-   system products, Microsoft run-time technologies (such as the .NET
-   Framework), and Microsoft application platforms (such as Microsoft Office or
-   Microsoft Dynamics) that Microsoft offers.
-   
-   G. "Redistributables" are the files listed in the following text files that
-   may be included in the Materials for the applicable Intel Software
-   Development Product: clredist.txt, credist.txt, fredist.txt, redist.txt, and
-   redist-rt.txt.
-   
-   H. "Sample Source Code" is those portions of the Materials that are Source
-   Code files and are identified as sample source code, including without
-   limitation, the IPP Sample Source.
+ A. "Confidential Information" means all Materials (as defined below),
+    including any portions thereof, that are identified (in the product release
+    notes, on Intel's download website for the Materials or elsewhere) or
+    labeled as Intel confidential information or a similar legend.
 
-   I. "Source Code" is defined as the software (and not documentation or text)
-   portion of the Materials provided in human readable format, and includes
-   modifications that You make or are made on Your behalf as expressly permitted
-   under the terms of this Agreement.
-   
-   J. "Third Party Programs" (if any) are the files listed in the
-   "third-party-programs.txt" text file that may be included in the Materials
-   for the applicable software.
-   
-   K. "Your Product" means one or more applications or products developed by or
-   for You using the Materials.
-   
+ B. "Excluded License" means a license that requires, as a condition of use,
+    modification, or distribution, that the licensed software or other software
+    incorporated into, derived from or distributed with such software (a) be
+    disclosed or distributed in Source Code form; (b) be licensed by the user to
+    third parties for the purpose of making and/or distributing derivative
+    works; or (c) be redistributable at no charge. Excluded Licenses include,
+    without limitation, licenses that license or distribute software under any
+    of the following licenses or distribution models, or licenses or
+    distribution models substantially similar to any of the following: (a) GNU's
+    General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic
+    License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape
+    Public License, (e) the Sun Community Source License (SCSL), (f) the Sun
+    Industry Source License (SISL), and (g) the Common Public License (CPL).
 
-2. CONSENT.  You agree that Intel, its subsidiaries or suppliers may collect and
-use technical and related information, including but not limited to the software
-product serial number, technical information about Your computer, system and
-application software, and peripherals, that is gathered periodically to
-facilitate the provision of software updates, product support and other services
-to You (if any) related to the Materials, and to verify compliance with the
-terms of this Agreement.  Intel may use this information, as long as it is in a
-form that does not personally identify You, to improve our products or to
-develop and provide services or technologies.
+ C. "Licensed Patent Claims" mean the claims of Intel's patents that are
+    necessarily and directly infringed by the reproduction and distribution of
+    the Materials that is authorized in Section 2 below, when the Materials are
+    in their unmodified form as delivered by Intel to You and not modified or
+    combined with anything else. Licensed Patent Claims are only those claims
+    that Intel can license without paying, or getting the consent of, a third
+    party.
 
-3. LICENSE GRANT:
+ D. "Materials" mean the software, documentation, the software product serial
+    number, and other materials, including any modifications, updates and
+    upgrades thereto, that are provided to You under this Agreement. Materials
+    also include any Redistributables, Source Code, and Pre-Release Materials,
+    as defined below, but do not include Third Party Programs.
 
-3.1 Subject to the terms and conditions of this Agreement, and timely
-payment of any fees (if applicable), Intel grants You a non-exclusive,
-worldwide, perpetual, non-assignable (except as expressly permitted hereunder),
-limited right and license:
+ E. "Microsoft Platforms" mean any current and future Microsoft operating
+    system products, Microsoft run-time technologies (such as the .NET
+    Framework), and Microsoft application platforms (such as Microsoft Office or
+    Microsoft Dynamics) that Microsoft offers.
 
-A. under its copyrights, to:
+ F. "Pre-Release Materials" mean the Materials, or portions thereof, that are
+    identified (in the product release notes, on Intel's download website for
+    the Materials or elsewhere) or labeled as pre-release, prototype, alpha or
+    beta code and as such the Pre-Release Materials are deemed to be pre-release
+    code not suitable for commercial release, which may not be fully functional
+    or tested and may contain bugs or errors, which Intel may substantially
+    modify in its development of a  commercial version, and for which Intel
+    makes no assurances that it will ever develop or make generally available a
+    commercial version.
 
-   (1)     reproduce internally copies of the Materials for your internal use in
-   accordance with the applicable license rights and restrictions specified in
-   Section 4.D below; provided, however, that this license does not include the
-   right to sublicense and may only be exercised by You or Your employees and
-   only within Your facilities;
+ G. "Redistributables" mean the files (if any) listed in the "redist.txt",
+    "redist-rt.txt" or similarly-named text files that may be included in the
+    Materials for the applicable "Intel Software Development Product."
 
-   (2)     use the Materials solely for Your internal use to develop Your
-   Product, in accordance with the applicable license rights and restrictions
-   specified in Section 4.D below and the documentation or text files included
-   as part of the Materials; provided, however, that this license does not
-   include the right to sublicense and may only be exercised by You or Your
-   employees and only within Your facilities;
+ H. "Sample Source Code" means those portions of the Materials that are
+    Source Code files and are identified as sample source code.
 
-   (3)     modify or create derivative works of the Materials, or any portions
-   thereof, that are provided in Source Code form, provided, however, that this
-   license does not include the right to sublicense and may be exercised only by
-   You or Your employees and only within Your facilities;
-   
-   (4)     publicly perform, display, and distribute (directly and through Your
-   distributors, resellers and other channel partners) or otherwise make
-   publicly available the Redistributables, including any modifications to or
-   derivative works of the Redistributables made pursuant to Section 3.1.A(3),
-   or any portions thereof, subject to the following restrictions:
-   
-      (i)     any distribution of the Redistributables must only be as part of
-      Your Product which must add significantly more functionality than the
+ I. "Source Code" means the software (and not documentation or text) portion
+    of the Materials provided in human readable format, and includes
+    modifications to the Source Code that You make or are made on Your behalf as
+    expressly permitted under the terms of this Agreement.
+
+ J. "Third Party Programs" mean the files (if any) listed in the
+    "third-party-programs.txt" text file that may be included in the Materials
+    for the applicable software.
+
+ K. "Your Product" means one or more commercial applications or products
+    developed by or for You using the Materials.
+
+ L. "Your Project" means one or more noncommercial applications, which may
+    include open source applications, developed by or for You using the
+    Materials.
+
+2. LICENSE GRANTS.
+
+2.1 License for Commercial License Types. Subject to the terms and conditions of
+this Agreement, including the applicable license type use restrictions in
+Section 3.1 and other restrictions in Section 4 below, and timely payment of any
+fees (if applicable), Intel grants You a non-exclusive, worldwide,
+non-assignable (except as expressly permitted hereunder), limited right and
+license for the term You obtained pursuant to Section 3:
+
+ A. under its copyrights, to:
+
+  (1) reproduce internally a reasonable number of copies of the Materials
+      for Your internal business use in accordance with the documentation or
+      text files included as part of the Materials; provided, however, that this
+      license does not include the right to sublicense and may only be exercised
+      by You or Your employees;
+
+  (2) use the Materials solely for Your internal business use to develop
+      Your Product, in accordance with the documentation or text files included
+      as part of the Materials, provided, however, that this license does not
+      include the right to sublicense and may only be exercised by You or Your
+      employees;
+
+  (3) modify or create derivative works of the Materials, or any portions
+      thereof, that are provided in Source Code form, provided, however, that
+      this license does not include the right to sublicense and may be exercised
+      only by You or Your employees;
+
+  (4) publicly perform, publicly display, and distribute (directly and
+      through Your distributors, resellers and other channel partners) or
+      otherwise make publicly available the Redistributables, including any
+      modifications to or derivative works of the Redistributables made pursuant
+      to Section 2.1.A(3), or any portions thereof, subject to the following
+      restrictions:
+
+      (a) any distribution of the Redistributables must only be as part of
+          Your Product which must add significantly more functionality than the
+          Redistributables themselves;
+
+      (b) any additional restrictions which may appear in the
+          Redistributables text files specified in Section 1.G above and in
+          Section 4 below; and
+
+      (c) the license under Section 2.1.A(4) includes the right to
+          sublicense the Redistributables, but the sublicense rights are limited
+          only to the sublicensing of any Intel copyrights in the
+          Redistributables and only to the extent necessary to perform, display,
+          and distribute the Redistributables (including Your modifications and
+          derivative works thereto) solely as incorporated in Your Product.
+
+      (d) You (i) will be solely responsible to Your customers for any
+          update, support obligation or other liability which may arise from
+          Your distribution of Your Product, (ii) will not make any statement
+          that Your Product is "certified" or that its performance is guaranteed
+          by Intel, (iii) will not use Intel's name or trademarks to market Your
+          Product without written permission from Intel, (iv) will provide the
+          Redistributables subject to a license agreement that prohibits
+          disassembly and reverse engineering of the Redistributables except in
+          cases where You provide Your Product subject to an open source license
+          that is not an Excluded License, (e.g., the BSD license or the MIT
+          license), (v) will indemnify, hold harmless, and defend Intel and its
+          suppliers from and against any claims or lawsuits, including
+          attorney's fees, that arise or result from Your modifications,
+          derivative works or Your distribution of Your Product.
+
+    and
+
+ B. under Intel's Licensed Patent Claims, to:
+
+  (1) make copies of the Materials only as specified in Section 2.1.A(1);
+
+  (2) use the Materials only as specified in Section 2.1.A(2); and
+
+  (3) offer to distribute, and distribute, but not sell, the Redistributables
+      only as part of Your Product, under Intel's copyright license granted in
+      Section 2.1(A), but only under the terms of that copyright license and not
+      as a sale (but this right does not include the right to sub-license);
+
+    And, provided further, that the license under the Licensed Patent Claims
+    does not and will not apply to, and Intel does not expressly grant You a
+    patent license in this Agreement to, any modifications to, or derivative
+    works of, the Materials, whether made by You, Your contractor, Your customer
+    (which, for all purposes under this Agreement, will mean either a customer,
+    reseller, distributor or other channel partner), or any third party even if
+    the modification and derivative works are permitted under 2.1.A(3).
+
+2.2 License for Noncommercial License Types. Subject to the terms and conditions
+of this Agreement, including the applicable license type use restrictions in
+Section 3.2 and other restrictions in Section 4 below, and timely payment of any
+fees (if applicable), Intel grants You a non-exclusive, worldwide,
+non-assignable, limited right and license for the term You obtained pursuant to
+Section 3, and under its copyrights, to:
+
+ A. reproduce a reasonable number of copies of the Materials internally and
+    use the Materials solely for Your internal evaluation, business or personal
+    use in accordance with the documentation or text files included as part of
+    the Materials, and for no commercial uses whatsoever; provided, however,
+    that this license does not include the right to sublicense and may only be
+    exercised by You or Your employees (if any);
+
+ B. modify or create derivative works of the Materials, or any portions
+    thereof, that are provided in Source Code form, provided, however, that this
+    license does not include a right to redistribute the modifications or
+    derivative works of the Materials, or the right to sublicense and may be
+    exercised only by You or Your employees (if any);
+
+ C. except for an evaluation license type, publicly perform, publicly
+    display, and distribute or otherwise make publicly available the
+    Redistributables, including any modifications to or derivative works of the
+    Redistributables made pursuant to Section 2.2.B, or any portions thereof
+    only for noncommercial uses, subject to the following restrictions:
+
+  (1) any distribution of the Redistributables must only be as part of Your
+      Project which must add significantly more functionality than the
       Redistributables themselves;
-   
-      (ii)    any additional restrictions which may appear in the
-      Redistributables text files specified in Section 1.G above and in
-      Section 4 below; and
-    
-      (iii)   the license under Section 3.1.A(4) includes the right to
-      sublicense the Redistributables, but the sublicense rights are
-      limited to sublicensing of any Intel copyrights in the
-      Redistributables and only to the extent necessary to perform,
-      display, and distribute the Redistributables (including Your
-      modifications and derivative works thereto) solely as incorporated
-      in Your Product. IF YOU RECEIVED THE MATERIALS FOR EVALUATION,
-      HOWEVER, YOU HAVE NO RIGHTS TO DISTRIBUTE THE REDISTRIBUTABLES,
-      INCLUDING WITHOUT LIMITATION, ANY PORTIONS, MODIFICATIONS OR
-      DERIVATIVE WORKS.
-      ; and
 
-B.	under Intel's Licensed Patent Claims, to:
+  (2) any additional restrictions which may appear in the Redistributables
+      text files specified in Section 1.G above and in Section 4 below; and
 
-   (1)	make copies of the Materials internally only;
+  (3) the license under Section 2.2.C includes the right to sublicense the
+      Redistributables, but the sublicense rights are limited only to the
+      sublicensing of any Intel copyrights in the Redistributables and only to
+      the extent necessary to perform, display, and distribute the
+      Redistributables (including Your modifications and derivative works
+      thereto) solely as incorporated in Your Project.
 
-   (2)	use the Materials internally only; and
+  (4) You (i) will be solely responsible for any update, support obligation
+      or other liability which may arise from Your distribution of Your Project,
+      (ii) will not make any statement that Your Project is "certified" or that
+      its performance is guaranteed by Intel, (iii) will not use Intel's name or
+      trademarks in connection with Your Project without written permission from
+      Intel, (iv) will provide the Redistributables subject to a license
+      agreement that prohibits disassembly and reverse engineering of the
+      Redistributables except in cases where You provide Your Project subject to
+      an open source license that is not an Excluded License (e.g., the BSD
+      license or the MIT license), (v) will indemnify, hold harmless, and defend
+      Intel and its suppliers from and against any claims or lawsuits, including
+      attorney's fees, that arise or result from Your modifications, derivative
+      works or Your distribution of Your Project.
 
-   (3)  offer to distribute, and distribute, but not sell, the
-   Redistributables only as part of Your Product, under Intel's copyright
-   license granted in Section 3.1(A), but only under the terms of that copyright
-   license and not as a sale (but this right does not include the right to
-   sub-license);
+2.3 Third Party Programs and Other Intel Programs Licenses. Third Party
+Programs, even if included with the distribution of the Materials, are governed
+by separate license terms, including without limitation, third party license
+terms, other Intel software license terms, and open source software license
+terms. Such separate license terms (and not this Agreement) solely govern Your
+use of the Third Party Programs.
 
-   (4)  provided, further, that the license under the Licensed Patent Claims
-   does not and will not apply to any modifications to, or derivative works of,
-   the Materials, whether made by You, Your customer (which, for all purposes
-   under this Agreement, will mean either a customer, reseller, distributor or
-   other channel partner), or any third party even if the modification and
-   derivative works are permitted under 3.1(A)(3).
+3. LICENSE USE TYPES.
 
-3.2 If the Materials You receive are packaged, as a single orderable item
-(i.e., as a single SKU), with hardware that includes one or more Intel
-manufactured microprocessors ("Intel Target Hardware"), then the licenses
-granted in Section 3.1 above are restricted to the sole purpose of producing and
-releasing Your Product to execute on computer systems that include the same or
-new versions of the Intel manufactured microprocessor included in the Intel
-Target Hardware.
+3.1 Commercial License Types. Commercial license types are provided under the
+terms of the license set forth in Section 2.1.
 
-Intel expressly does not grant You a patent license in this Agreement to any
-modifications or derivative works of the Materials, whether made by You, Your
-contractor, Your customer, or any other third party in creating the derivative
-works even to the extent creation of derivative works is permitted under Section
-3.1(A)(3) above.
+ A. Single Named-User License. If You obtain the Materials under a single
+    named-user license type, You may install the Materials on no more than three
+    (3) computers for use by a single user, provided that same user is using the
+    Materials only on one (1) computer at a time, subject to their compliance
+    with all of the terms and conditions of this Agreement.  You may obtain
+    either a perpetual or time limited license. If You obtain a single
+    named-user license type that is also time limited, the term of Your license
+    is specified on Intel's download website, in the applicable documentation or
+    controlled by the serial number for the Materials.
 
+ B. Floating License. If You obtain the Materials under a floating license
+    type, You may (a) install the Materials on an unlimited number of computers
+    that are connected to the designated network and (b) use the Materials by no
+    more than the authorized number of concurrent users, subject to their
+    compliance with all of the terms and conditions of this Agreement. You may
+    obtain either a perpetual or time limited license. If You obtain a floating
+    license type that is also time limited, the term of Your license is
+    specified on Intel's download website, in the applicable documentation or
+    controlled by the serial number for the Materials.
 
-4. LICENSE CONDITIONS:
+ C. Site License. If You obtain the Materials under a site license type
+    (i.e., the Materials include the text file named
+    "site_license_materials.txt"), the files specified in that text file may be
+    installed on computer systems located only at a single site, and those files
+    may be accessed or used by an unlimited number of concurrent users, subject
+    to their compliance with all of the terms and conditions of this Agreement.
+    This is a perpetual license.
 
-   A. If You are an entity, each of Your employees and Your contractors may use
-   the Materials as specified in Section 3 above, provided: (i) their use of the
-   Materials is solely on behalf of and in support of Your business, (ii) they
-   agree to the terms and conditions of this Agreement, and (iii) You are solely
-   responsible for their use of the Materials.
+ D. Community License. If You obtain the Materials under a community license
+    type, You may install the Materials on no more than three (3) computers for
+    use by a single user, provided that same user is using the Materials only on
+    one (1) computer at a time, subject to their compliance with all of the
+    terms and conditions of this Agreement. The Materials are provided under a
+    time limited license as specified on Intel's download website, in the
+    applicable documentation or controlled by the serial number for the
+    Materials.
 
-   B. If Your Product is a software development library, then attribution (if
-   any), as specified in the product release notes of the corresponding
-   Materials shall be displayed prominently in Your Product's associated
-   documentation and on the web site (if any) for Your Product.
-   
-   C. If You receive Your first copy of the Materials electronically, and a
-   second copy on media, then you may use the second copy only in accordance
-   with Your applicable license stated in this Agreement, or for backup or
-   archival purposes.  You may not provide the second copy to another user.
-   
-   D. Except as expressly provided in this Agreement, You may NOT:  (i) use,
-   copy, distribute, or publicly display the Materials; (ii) rent or lease the
-   Materials to any third party; (iii) assign this Agreement or transfer the
-   Materials; (iv) modify, adapt, or translate the Materials in whole or in
-   part; (v) reverse engineer, decompile, or disassemble the Materials; (vi)
-   attempt to modify or tamper with the normal function of any license manager
-   that may regulate usage of the Materials; (vii) distribute, sublicense or
-   transfer the Source Code form of any components of the Materials or
-   derivatives thereof to any third party; (viii) distribute Redistributables
-   except as part of a larger program that adds significant primary
-   functionality different from that of the Redistributables; (ix) distribute
-   the Redistributables to run on a platform other than a Microsoft Platform if
-   according to the accompanying user documentation the Materials are meant to
-   execute only on a Microsoft Platform; (x) include the Redistributables in
-   malicious, deceptive, or unlawful programs or products; or (xi) modify,
-   create a derivative work, link, or distribute the Materials so that any part
-   of it becomes subject to an Excluded License.
-   
-   E. The scope and term of Your license depends on the type of license You are
-   provided by Intel.  The variety of license types are set forth below, which
-   may not be available for all "Intel(R) Software Development Products" and
-   therefore may not apply to the particular Materials You are licensing.  For
-   more information on the types of licenses, please contact Intel or Your sales
-   representative.
-   
-   i. PRE-RELEASE LICENSE: If the Materials, or portions thereof, are identified
-   (in the product release notes, on Intel's download website for the Materials
-   or elsewhere) or labeled as pre-release ("Pre-Release Materials"), (a) the
-   Pre-Release Materials are deemed to be pre-release code (e.g., alpha or beta
-   release, etc.), which may not be fully functional and which Intel may
-   substantially modify in development of a  commercial version, and for which
-   Intel makes no assurances that it will ever develop or make generally
-   available a commercial version,and (b) You have the right to use the
-   Pre-Release Materials only for the duration of the pre-release term, which is
-   specified in the product release notes, on Intel's download website for the
-   Materials or elsewhere, or until the commercial release, if any, of the
-   Pre-Release Materials, whichever is shorter, and (c) Your right to use the
-   Pre-Release Material is also restricted to the license type (i.e., Evaluation
-   License, Named-User License, Floating License, specified below) issued to You
-   for the Pre-Release Materials.
-   
-   ii. EVALUATION LICENSE: If You obtained the Materials pursuant to an
-   evaluation license, You may use the Materials only for internal evaluation
-   purposes and only for the term of the evaluation period, as specified on
-   Intel's download website or which may be controlled by the license key for
-   the Materials.  NOTWITHSTANDING ANYTHING TO THE CONTRARY ELSEWHERE IN THIS
-   AGREEMENT, YOU MAY NOT DISTRIBUTE ANY PORTION OF THE MATERIALS, AND THE
-   APPLICATION AND/OR PRODUCT DEVELOPED BY YOU MAY ONLY BE USED FOR EVALUATION
-   PURPOSES AND ONLY FOR THE TERM OF THE EVALUATION.  You may install copies of
-   the Materials on a reasonable number of computers to conduct Your evaluation
-   provided that You are the only individual using the Materials and only one
-   copy of the Materials is in use at any one time.  A separate license key is
-   required for each additional use and/or individual user in all other cases,
-   including without limitation, use by persons, computer systems, and other use
-   methods known now and in the future.  Intel may provide You with a license
-   key that enables the Materials for an evaluation license.  If You are an
-   entity, Intel grants You the right to designate one individual within Your
-   organization to have the sole right to use the Materials in the manner
-   provided above.
-   
-   iii. NONCOMMERCIAL USE LICENSE:  If You obtained the Materials under a
-   noncommercial use license, You may use the Materials only for non-commercial
-   use where You receive no fee, salary or any other form of compensation.  The
-   Materials may not be used for any other purpose, whether "for profit" or "not
-   for profit."  Any work performed or produced as a result of use of the
-   Materials cannot be performed or produced for the benefit of other parties
-   for a fee, compensation or any other reimbursement or remuneration.  You may
-   install copies of the Materials on an unlimited number of computers provided
-   that You are the only individual using the Materials and only one copy of the
-   Materials is in use at any one time.  A separate license is required for each
-   additional use and/or individual user in all other cases, including without
-   limitation, use by persons, computer systems, and other methods of use known
-   now and in the future.  Intel will provide You with a license key that
-   enables the Materials for a noncommercial-use license.  If You obtained a
-   time-limited noncommercial-use license, the duration (time period) of Your
-   license and Your ability to use the Materials is limited to the time period
-   of the obtained license, which is specified on Intel's download website,
-   specified in the applicable documentation or controlled by the license key
-   for the Materials.
-   
-   iv. NAMED-USER LICENSE: If You obtained the Materials under a named-user
-   license, You may allow only one (1) individual to install and use the
-   Materials on no more than three (3) computers provided that same individual
-   is using the Materials only on one (1) computer at a time.  If You obtained a
-   time-limited named-user license, the term of Your license and your ability to
-   use the Materials is limited to the time period of the obtained license,
-   which is specified on Intel's download website, specified in the applicable
-   documentation or controlled by the license key for the Materials.
-   
-   v. NODE-LOCKED LICENSE: If You obtained the Materials under a node-locked
-   license, You may use the Materials only on a single designated computer by no
-   more than the authorized number of concurrent users. If You obtained a
-   time-limited node-locked license, the term of Your license and Your ability
-   to use the Materials is limited to the time period of the obtained license,
-   which is specified on Intel's download website, specified in the applicable
-   documentation or controlled by the license key for the Materials.
-   
-   vi. FLOATING LICENSE: If You obtained the Materials under a floating license,
-   you may (a) install the Materials on an unlimited number of computers that
-   are connected to the designated network and (b) use the Material by no more
-   than the authorized number of concurrent individual users.  If You obtained a
-   time-limited Floating license key, the term of Your license and Your ability
-   to use the Materials is limited to the time period of the obtained license,
-   which is specified on Intel's download website, specified in the applicable
-   documentation or controlled by the license key for the Materials.
-   
-   F. DISTRIBUTION:  Distribution of the Redistributables is also subject to the
-   following limitations:  You (i) will be solely responsible to Your customers for
-   any update, support obligation or other liability which may arise from the
-   distribution, (ii) will not make any statement that Your Product is "certified"
-   or that its performance is guaranteed by Intel, (iii) will not use Intel's name
-   or trademarks to market Your Product without written permission from Intel, (iv)
-   will provide a license agreement with distribution of the Redistributables that
-   prohibits disassembly and reverse engineering of the Redistributables, (v) will
-   indemnify, hold harmless, and defend Intel and its suppliers from and against
-   any claims or lawsuits, including attorney's fees, that arise or result from
-   Your modifications, derivative works or Your distribution of Your Product.
-   
-   G. INTEL(R) INTEGRATED PERFORMANCE PRIMITIVES ("INTEL IPP"). The following terms
-   and conditions apply only to the Intel IPP.
-   
-   i. Notwithstanding anything in this Agreement to the contrary, if You
-   implement Intel IPP Sample Source Code in Your Product or if You use Intel
-   IPP to implement algorithms that are the intellectual property of third
-   parties, then you may need additional licenses from such entities.Should any
-   such additional licenses be required, You are solely responsible for
-   obtaining any such licenses and agree to obtain any such licenses at Your own
-   expense.
+3.2 Noncommercial License Types. Noncommercial license types are provided under
+the terms of the license set forth in Section 2.2.
 
-   ii. Notwithstanding anything herein to the contrary, a valid license to Intel
-   IPP is a prerequisite to any license for Intel IPP Sample Source Code, and
-   possession of Intel IPP Sample Source Code does not grant any license to
-   Intel IPP (or any portion thereof).  To access Intel IPP Sample Source Code,
-   You must first register Your licensed copy of the Intel IPP with Intel.  By
-   downloading, installing or copying any Intel IPP Sample Source Code file, You
-   agree to be bound by terms of this Agreement.
-   
-   H. MEDIA FORMAT CODECS AND DIGITAL RIGHTS MANAGEMENT. You acknowledge and agree
-   that your use of the Materials or distribution of the Materials with Your
-   Product as permitted by this license may require you to procure license(s) from
-   one or more third parties that may hold intellectual property rights applicable
-   to any media decoding, encoding or transcoding technology (such as, for example,
-   through use of an audio or video codec) and/or digital rights management
-   capabilities of the Materials, if any.  Should any such additional licenses be
-   required, You are solely responsible for obtaining any such licenses and agree
-   to obtain any such licenses at Your own expense.
-   
-   I. MATERIALS TRANSFER:  Except for the Pre-Release Licenses or Evaluation
-   Licenses or Non-Commercial Licenses, as specified above, You may permanently
-   transfer the Materials you received pursuant to a license type listed in Section
-   4(D) above, and all of Your rights under this Agreement, to another party
-   ("Recipient") solely in conjunction with a change of ownership, merger,
-   acquisition, sale or transfer of all or substantially all of Your business or
-   assets, either voluntarily, by operation of law or otherwise subject to the
-   following: You must notify Intel of the transfer by sending a letter to Intel
-   (i) identifying the legal entities of Recipient and You, (ii) identifying the
-   Materials (i.e., the specific Intel software and version) and the associated
-   serial numbers to be transferred, (iii) certifying that You retain no copies of
-   the Materials or portions thereof, (iv) certifying that the Recipient has agreed
-   in writing to be bound by all of the terms and conditions of this Agreement, (v)
-   certifying that the Recipient has been notified that in order to receive support
-   from Intel for the Materials they must notify Intel in writing of the transfer
-   and provide Intel with the information specified in subsection (ii) above along
-   with the name and email address of the individual assigned to use the Materials,
-   and (vi) providing Your email address so that Intel may confirm receipt of Your
-   letter.  Please send such letter to:
+ A. Evaluation License. If You obtain the Materials under an evaluation
+    license type, You may install the Materials on no more than three (3)
+    computers for use by a single user, provided that same user is using the
+    Materials only on one (1) computer at a time, subject to their compliance
+    with all of the terms and conditions of this Agreement. You may not
+    distribute any portion of the Materials, and any application and/or product
+    developed by You may only be used for evaluation purposes and only for the
+    term of the evaluation. The Materials are provided under a time limited
+    license as specified on Intel's download website, in the applicable
+    documentation or controlled by the serial number for the Materials.
 
-Intel Corporation
-2111 NE 25th Avenue
-Hillsboro, OR 97124
-Attn: DPD Contracts Management, JF1-15
+  1) Pre-Release Materials. If the Materials You receive are Pre-Release
+     Materials, in addition to the license restrictions in Section 2.2 and the
+     restrictions in 3.2.A above, (i) You may not modify or incorporate the
+     Pre-Release Materials into any product You are developing; (ii) You may
+     not continue to use the Pre-Release Materials if and once a commercial
+     version is released; and (iii) You may not disclose to any third party any
+     benchmarks, performance results, or other information relating to the
+     Pre-Release Materials.
 
-5. PRIVACY:
+ B. Noncommercial Use License. If You obtain the Materials under a
+    noncommercial use license type, You may install the Materials on an
+    unlimited number of computers for use by a single user, provided that same
+    user is using the Materials only on one (1) computer at a time, subject to
+    their compliance with all of the terms and conditions of this Agreement. Any
+    work performed or produced as a result of use of the Materials cannot be
+    performed or produced for the benefit of other parties, including but not
+    limited to, for a fee, compensation or any other reimbursement or
+    remuneration, or "not for profit." The Materials are provided under a time
+    limited license as specified on Intel's download website, in the applicable
+    documentation or controlled by the serial number for the Materials.
 
-   A. Data Collection:  Intel has collected or will collect certain personal
-   information from You in order to inform You of updates to the Materials, based
-   on the personal information collected when You registered the license to the
-   Materials with Intel.
-   
-   B. Revoking Consent to Data Collection:  You can revoke Your consent to this
-   collection of personal information at any time by clicking on the link to
-   "unsubscribe" at the bottom of any communication from Intel related to the
-   Materials which will allow You to opt-out of receiving future messages related
-   to the Materials.
-   
-   C. Intel's Privacy Notice:  Intel is committed to respecting Your privacy. To
-   learn more about Intel's privacy practices, please visit
-   http://www.intel.com/privacy.
+ C. Educational License. If You obtain the Materials under an educational
+    license type, You must be a teacher, professor, or a student and You may
+    only use the Materials for educational purposes. Any work performed or
+    produced as a result of use of the Materials cannot be performed or produced
+    for the benefit of other parties, including but not limited to, for a fee,
+    compensation or any other reimbursement or remuneration, or "not for
+    profit." The Materials are provided under a time limited license as
+    specified on Intel's download website, in the applicable documentation or
+    controlled by the serial number for the Materials. There are two educational
+    license types as follows:
 
-6. OWNERSHIP: Title to the Materials and all copies thereof remain with Intel or
+  1) Single Named-User Educational License. If You obtain the Materials
+     under a single named-user educational license type, You may install the
+     Materials on no more than three (3) computers for use by a single user,
+     provided that same user is using the Materials only on one (1) computer at
+     a time, subject to their compliance with all of the terms and conditions
+     of this Agreement.
+
+  2) Floating Educational License. If You obtain the Materials under a
+     floating educational license type, You may install the Materials on an
+     unlimited number of computers that are connected to a designated network
+     and have no more than the authorized number of concurrent individual users
+     use the Materials, subject to their compliance with all of the terms and
+     conditions of this Agreement.
+
+4. LICENSE CONDITIONS.
+
+4.1 Restrictions. Except as expressly provided in this Agreement, You may NOT:
+(i) use, copy, distribute, or publicly display the Materials; (ii) rent or lease
+the Materials to any third party; (iii) assign this Agreement or transfer the
+Materials; (iv) modify, adapt, or translate the Materials in whole or in part;
+(v) reverse engineer, decompile, or disassemble the Materials; (vi) attempt to
+modify or tamper with the normal function of any license manager that may
+regulate usage of the Materials; (vii) distribute, sublicense or transfer the
+Source Code form of any components of the Materials or derivatives thereof to
+any third party; (viii) distribute Redistributables except as part of a larger
+program that adds significant primary functionality different from that of the
+Redistributables; (ix) distribute the Redistributables to run on a platform
+other than a Microsoft Platform if according to the accompanying user
+documentation the Materials are meant to execute only on a Microsoft Platform;
+(x) include the Redistributables in malicious, deceptive, or unlawful programs
+or products; or (xi) modify, create a derivative work, link, or distribute the
+Materials so that any part of it becomes subject to an Excluded License.
+
+4.2 Safety, Critical, and Lifesaving Applications. Safety is Your
+responsibility. To the extent You use the Materials to create, or as part of,
+products used in safety-critical applications designed to comply with functional
+safety standards or requirements ("Safety-Critical Applications"), it is Your
+responsibility to design, manage and assure system-level safeguards to
+anticipate, monitor and control system failures, and You agree that You are
+solely responsible for all applicable regulatory standards and safety-related
+requirements concerning Your use of the Materials in Safety Critical
+Applications. The Materials are also not designed, intended, or authorized for
+use in any type of a system or application in which the failure of the Materials
+could create a situation where personal injury or death may occur (e.g.,
+medical systems, life sustaining or lifesaving systems) ("Lifesaving
+Applications").  Should You use the Materials for Safety-Critical Applications
+or Life-saving Applications, You agree to indemnify, defend, and hold Intel and
+its representatives harmless against all claims, costs, damages, and expenses,
+including reasonable attorney fees arising in any way out of Your use of the
+Materials in Safety-Critical Applications and claims of product liability,
+personal injury or death associated with Lifesaving Applications; even if, for
+either type of application, such claims alleges that Intel was negligent
+regarding the design or manufacture of the Materials.
+
+4.3 Third Party Contractor Use. If You are an entity with a license pursuant to
+Section 3.1, Your contractors may use the Materials as specified in Section 2
+above, provided: (i) their use of the Materials is solely on behalf of and in
+support of Your business, (ii) they agree to the terms and conditions of this
+Agreement, and (iii) You are solely responsible for their use of the Materials.
+
+4.4 Media Format Codecs and Digital Rights Management. You acknowledge and agree
+that Your use of the Materials or distribution of the Materials with Your
+Product or Your Project as permitted by this license may require You to procure
+license(s) from one or more third parties that may hold intellectual property
+rights applicable to any media decoding, encoding or transcoding technology
+(such as, for example, through use of an audio or video codec) and/or digital
+rights management capabilities of the Materials, if any.  Should any such
+additional licenses be required, You are solely responsible for obtaining any
+such licenses and agree to obtain any such licenses at Your own expense.
+
+4.5 Materials Transfer. You may only permanently transfer the Materials you
+received pursuant to a license type listed in Section 3.1 above, and all of Your
+rights under this Agreement, to another party ("Recipient") solely in
+conjunction with a change of ownership, merger, acquisition, sale or transfer of
+all or substantially all of Your business or assets, either voluntarily, by
+operation of law or otherwise subject to the following: You must notify Intel of
+the transfer by sending a letter to Intel (i) identifying the legal entities of
+Recipient and You, (ii) identifying the Materials (i.e., the specific Intel
+software and version) and the associated serial numbers to be transferred, (iii)
+certifying that You retain no copies of the Materials or portions thereof, (iv)
+certifying that the Recipient has agreed in writing to be bound by all of the
+terms and conditions of this Agreement, (v) certifying that the Recipient has
+been notified that in order to receive support from Intel for the Materials they
+must notify Intel in writing of the transfer and provide Intel with the
+information specified in subsection (ii) above along with the name and email
+address of the individual assigned to use the Materials, and (vi) providing Your
+email address so that Intel may confirm receipt of Your letter.  Please send
+such letter to:
+
+    Intel Corporation
+    2111 NE 25th Avenue
+    Hillsboro, OR 97124
+    Attn: DPD Contracts Management, JF2-28
+
+5. DATA COLLECTION AND PRIVACY.
+
+5.1 Anonymous Data Collection by Materials. Certain Materials may generate and
+collect anonymous data about the Materials and transmit it to Intel as a
+one-time event during installation. This anonymous data collection may include,
+but is not limited to, product name, product version, license type, support
+type, and installation status. Anonymous data collection by the Materials does
+not include: (a) any personal or personally identifiable data of You, an end
+user or a data subject; (b) data or information identifying a business entity;
+or (c) data or information about non-Intel software. The purpose of the
+anonymous data collection by the Materials is to enable Intel to develop,
+improve, and support Intel's products and services.
+
+5.2 Provisioning Data Collection. Provisioning data may be collected and
+transmitted to Intel as a one-time event during installation in order to
+activate the Materials.  This collection may be mandatory and a condition of
+using the Materials in order to verify the right to use the Materials.
+Provisioning data includes the Material's unique serial number and it may be
+combined with other information about the Materials and Your computer.
+Provisioning data is not shared with or disclosed to parties outside of Intel.
+Intel may retain the provisioning data indefinitely.
+
+5.3 Other Data Collection.
+
+ A. Collection of Registration Data. Some Materials may require registration
+    of the Materials with Intel during installation. The information currently
+    collected during registration is Your first name, Your last name, Your
+    email, Your company, and Your country. The registration information is
+    subject to change, however, You will be notified at the time of registration
+    what information will be collected, why it is being collected, how long it
+    will be retained by Intel, and how to have Your registration information
+    removed from Intel's registration database if You so choose to do so at a
+    later date.
+
+ B. Optional Collection of Analytical Data. You may be given the option
+    during installation of the Materials to consent to the collection of
+    analytical data. Analytical data may include technical information about
+    Your software installation and runtime status (such as installation metrics,
+    serial number, counters, flags, and timestamps), and Your development
+    environment (such as operating system, CPU architecture, and other Intel
+    products installed). You will be notified at the time of installation what
+    analytical data will be collected if You agree to such collection, why it is
+    being collected, how long it will be retained by Intel, and how to stop the
+    collection of analytical data if You so choose to do so at a later date.
+
+ C. Required Collection of Analytical Data. For certain Materials, the
+    collection of analytical data as described in Section 4.3 B may be a
+    requirement of use. In these cases, You will be given notice and the option
+    to cancel the download or installation of the Materials if you do not wish
+    to consent to the collection of analytical data.
+
+5.4 Intel's Privacy Notice. Intel is committed to respecting Your privacy. To
+learn more about Intel's privacy practices, please visit
+http://www.intel.com/privacy.
+
+6. OWNERSHIP. Title to the Materials and all copies thereof remain with Intel or
 its suppliers.  The Materials are protected by intellectual property rights,
 including without limitation, United States copyright laws and international
 treaty provisions.  You will not remove any copyright or other proprietary
@@ -412,9 +508,9 @@ to You directly or by implication, inducement, estoppel or otherwise;
 specifically Intel does not grant any express or implied right to You under
 Intel patents, copyrights, trademarks, or trade secrets.
 
-7. NO WARRANTY AND NO SUPPORT:  Disclaimer.  Intel disclaims all warranties of
-any kind and the terms and remedies provided in this Agreement are instead of
-any other warranty or condition, express, implied or statutory, including those
+7. NO WARRANTY AND NO SUPPORT. Disclaimer. Intel disclaims all warranties of any
+kind and the terms and remedies provided in this Agreement are instead of any
+other warranty or condition, express, implied or statutory, including those
 regarding merchantability, fitness for any particular purpose, non-infringement
 or any warranty arising out of any course of dealing, usage of trade, proposal,
 specification or sample.  Intel does not assume (and does not authorize any
@@ -422,53 +518,48 @@ person to assume on its behalf) any other liability.
 
 Intel may make changes to the Materials, or to items referenced therein, at any
 time without notice, but is not obligated to support, update or provide training
-for the Materials. Intel may in its sole discretion offer such support, update
-or training services under separate terms at Intel's then-current rates. You may
-request additional information on Intel's service offerings from an Intel sales
-representative.
+for the Materials under the terms of this Agreement. Intel may in its sole
+discretion offer such support, updates or training services under separate terms
+at Intel's then-current rates. You may request additional information on Intel's
+service offerings from an Intel representative.
 
-8. LIMITATION OF LIABILITY:  Neither Intel nor its suppliers shall be liable for
-any damages whatsoever (including, without limitation, damages for loss of
-business profits, business interruption, loss of business information, or other
-loss) arising out of the use of or inability to use the Materials, even if Intel
-has been advised of the possibility of such damages.  Because some jurisdictions
-prohibit the exclusion or limitation of liability for consequential or
-incidental damages, the above limitation may not apply to you.
+8. LIMITATION OF LIABILITY. Use of the Materials are at Licensee's own risk.  In
+no event will Intel or its suppliers be liable for any direct, indirect,
+incidental, consequential, special, or other losses or damages arising out of or
+related to this Agreement or Licensee's use of the Materials, including without
+limitation, any of the following losses or damages (whether such losses or
+damages were foreseen, foreseeable, known or otherwise):  (i) loss of revenue;
+(ii) loss of actual or anticipated profits; (iii) loss of the use of money; (iv)
+loss of anticipated savings; (v) loss of business; (vi) loss of opportunity;
+(vii) loss of goodwill; (viii) loss of use of the Software; (ix) loss of
+reputation; (x) loss of, damage to, or corruption of data; or (xi) any indirect,
+incidental special or consequential loss of damage however caused (including
+loss or damage of the type specified in this Section 6).
 
-9. UNAUTHORIZED USE:  The Materials are not designed, intended, or authorized
-for use in any type of a system or application in which the failure of the
-Materials could create a situation where personal injury or death may occur
-(e.g.,  medical systems, life sustaining or lifesaving systems).  Should You use
-the Materials for any such unintended or unauthorized use, You hereby indemnify,
-defend, and hold Intel and its officers, subsidiaries and affiliates harmless
-against all claims, costs, damages, expenses, and reasonable attorney fees
-arising out of, directly or indirectly, such use and any claim of product
-liability, personal injury or death associated with such unintended or
-unauthorized use, even if such claim alleges that Intel was negligent regarding
-the design or manufacture of the Materials.
-
-10. USER SUBMISSIONS:  This Agreement does not obligate You to provide Intel
-with materials, information, comments, suggestions or other communication
-regarding the Materials.  However, You agree that any material, information,
-comments, suggestions or other communication You transmit or post to an Intel
-website (including but not limited to, submissions to the Intel Premier Support
-and/or other customer support websites or online portals) or provide to Intel
-under this Agreement related to the features, functions, performance or use of
-the Materials are deemed non-confidential and non-proprietary
-("Communications").  Intel will have no obligations with respect to the
-Communications.  You hereby grant to Intel a non-exclusive, perpetual,
-irrevocable, royalty-free, copyright license to copy, modify, create derivative
-works, publicly display, disclose, distribute, license and sublicense through
-multiple tiers of distribution and licensees, incorporate and otherwise use the
-Communications and all data, images, sounds, text, and other things embodied
-therein, including derivative works thereto, for any and all commercial or
-non-commercial purposes. You are prohibited from posting or transmitting to or
-from an Intel website or provide to Intel any unlawful, threatening, libelous,
-defamatory, obscene, pornographic, or other material that would violate any law.
-If You wish to provide Intel with information that You intend to be treated as
-confidential information, Intel requires that such confidential information be
-provided pursuant to a non-disclosure agreement ("NDA"), so please contact Your
-Intel representative to ensure the proper NDA is in place.
+9. USER SUBMISSIONS. This Agreement does not obligate You to provide Intel with
+materials, information, comments, suggestions or other communication regarding
+the Materials.  However, You agree that any material, information, comments,
+suggestions or other communication You transmit or post to an Intel website
+(including but not limited to, submissions to the Intel Premier Support and/or
+other customer support websites or online portals) or provide to Intel under
+this Agreement are not controlled by the International Traffic in Arms
+Regulations (ITAR) or the Export Administration Regulation (EAR), and if related
+to the features, functions, performance or use of the Materials are deemed
+non-confidential and non-proprietary ("Communications").  Intel will have no
+obligations with respect to the Communications.  You hereby grant to Intel a
+non-exclusive, perpetual, irrevocable, royalty-free, copyright license to copy,
+modify, create derivative works, publicly display, disclose, distribute, license
+and sublicense through multiple tiers of distribution and licensees, incorporate
+and otherwise use the Communications and all data, images, sounds, text, and
+other things embodied therein, including derivative works thereto, for any and
+all commercial or non-commercial purposes. You are prohibited from posting or
+transmitting to or from an Intel website or provide to Intel any unlawful,
+threatening, libelous, defamatory, obscene, pornographic, or other material that
+would violate any law.  If You wish to provide Intel with information that You
+intend to be treated as confidential information, Intel requires that such
+confidential information be provided pursuant to a non-disclosure agreement
+("NDA"), so please contact Your Intel representative to ensure the proper NDA is
+in place.
 
 Nothing in this Agreement will be construed as preventing Intel from reviewing
 Your Communications and errors or defects in Intel products discovered while
@@ -479,18 +570,18 @@ defects in Intel products discovered while reviewing Your Communications or to
 implement bug fixes or enhancements in Intel products. The foregoing may include
 the right to include Your Communications in regression test suites.
 
-11.  NON-DISCLOSURE: The following provisions will apply if there is no existing
-non-disclosure agreement between You and Intel. You will maintain the
-confidentiality of the Confidential Information (if any) with at least the same
-degree of care that You use to protect Your own confidential and proprietary
-information, but no less than a reasonable degree of care under the
-circumstances.  You will not disclose the Confidential Information to any
-employees or to any third parties except to Your employees who have a need to
-know and who agree to abide by nondisclosure terms at least as comprehensive as
-those set forth herein; provided that You will be liable for breach by any such
-entity.  For the purposes of this Agreement, the term "employee" will include
+10. NON-DISCLOSURE. The following provisions will apply if there is no existing
+non-disclosure agreement between You and Intel. The Materials are the
+Confidential Information of Intel. You will maintain the confidentiality of
+Intel's Confidential Information with at least the same degree of care that You
+use to protect Your own confidential and proprietary information, but no less
+than a reasonable degree of care under the circumstances.  You will only
+disclose the Confidential Information to Your employees who have a need to know
+and who agree to abide by nondisclosure terms at least as comprehensive as those
+set forth herein; provided that You will be liable for breach by any such
+employee.  For the purposes of this Agreement, the term "employee" will include
 Your independent contractors, who have signed confidentiality agreements with
-You.  You will not make any copies of the Confidential Information except as
+You. You will not make any copies of the Confidential Information except as
 necessary for Your employees with a need to know.  Any copies which are made
 will be identified as belonging to Intel and marked "confidential",
 "proprietary" or with similar legend.  You will not be liable for the disclosure
@@ -504,23 +595,23 @@ judicial or other government order, provided that You will give Intel reasonable
 notice prior to such disclosure and will comply with any applicable protective
 order.
 
-12. TERMINATION OF THIS LICENSE: This Agreement becomes effective on the date
+11. TERMINATION OF THIS LICENSE. This Agreement becomes effective on the date
 You accept this Agreement and will continue until terminated as provided for in
-this Agreement.  If You are using the Materials under a time-limited license,
-for example an Evaluation License, this Agreement terminates without notice on
-the last day of the time period, which is specified in the Materials or on
-Intel's website, and/or controlled by the license key code for the Materials.
-Intel may terminate this license immediately if You are in breach of any of its
-terms and conditions and such breach is not cured within thirty (30) days of
-written notice from Intel.  Upon termination, You will immediately return to
-Intel or destroy the Materials and all copies thereof.  In the event of
-termination of this Agreement, the license grant to any Materials or
-Redistributables distributed by You in accordance with the terms and conditions
-of this Agreement, prior to the effective date of such termination, will survive
-any such termination of this Agreement. Sections 1, 5, 6, 7, 8, 9, 10, 11, 12,
-and 14 will survive expiration or termination of this Agreement.
+this Agreement. If You are using the Materials under a time-limited license, for
+example an Evaluation License, this Agreement terminates without notice on the
+last day of the time period, which is specified in the Materials or on Intel's
+website, and/or controlled by the serial number for the Materials. Intel may
+terminate this license immediately if You are in breach of any of its terms and
+conditions and such breach is not cured within thirty (30) days of written
+notice from Intel. Upon termination, You will immediately return to Intel or
+destroy the Materials and all copies thereof. In the event of termination of
+this Agreement, the license grant to any Materials or Redistributables
+distributed by You in accordance with the terms and conditions of this
+Agreement, prior to the effective date of such termination, will survive any
+such termination of this Agreement. Sections 1, 5, 6, 7, 8, 9, 10, 11, 12, and
+13 will survive expiration or termination of this Agreement.
 
-13. U.S. GOVERNMENT RESTRICTED RIGHTS: The technical data and computer software
+12. U.S. GOVERNMENT RESTRICTED RIGHTS. The technical data and computer software
 covered by this license is a "Commercial Item," as such term is defined by the
 FAR 2.101 (48 C.F.R. 2.101) and is "commercial computer software" and
 "commercial computer software documentation" as specified under FAR 12.212 (48
@@ -532,97 +623,101 @@ for or on behalf of the U.S. Government is permitted only if the party acquiring
 or using this software is properly authorized by an appropriate U.S. Government
 official. This use by or for the U.S. Government clause is in lieu of, and
 supersedes, any other FAR, DFARS, or other provision that addresses Government
-rights in the computer software or documentation covered by this license. All
+rights in the computer software or documentation covered by this license.  All
 copyright licenses granted to the U.S. Government are coextensive with the
 technical data and computer software licenses granted herein. The U.S.
 Government will only have the right to reproduce, distribute, perform, display,
 and prepare derivative works as needed to implement those rights.
 
-14. GENERAL PROVISIONS
+13. GENERAL PROVISIONS.
 
-   A. ENTIRE AGREEMENT: This Agreement contains the complete and exclusive
-   agreement and understanding between the parties concerning the subject matter
-   of this Agreement, and supersedes all prior and contemporaneous proposals,
-   agreements, understanding, negotiations, representations, warranties,
-   conditions, and communications, oral or written, between the parties relating
-   to the same subject matter. This Agreement, including without limitation its
-   termination, has no effect on any signed non-disclosure agreements between
-   the parties, which remain in full force and effect as separate agreements to
-   their terms. Each party acknowledges and agrees that in entering into this
-   Agreement it has not relied on, and will not be entitled to rely on, any oral
-   or written representations, warranties, conditions, understanding, or
-   communications between the parties that are not expressly set forth in this
-   Agreement. The express provisions of this Agreement control over any course
-   of performance, course of dealing, or usage of the trade inconsistent with
-   any of the provisions of this Agreement. The provisions of this Agreement
-   will prevail notwithstanding any different, conflicting, or additional
-   provisions that may appear on any purchase order, acknowledgement, invoice,
-   or other writing issued by either party in connection with this Agreement. No
-   modification or amendment to this Agreement will be effective unless in
-   writing and signed by authorized representatives of each party, and must
-   specifically identify this Agreement by its title (e.g., "End User License
-   Agreement for the Intel(R) software and version, i.e., March 2015).    If You
-   received a copy of this Agreement translated into another language, the
-   English language version of this Agreement will prevail in the event of any
-   conflict between versions.
+13.1 ENTIRE AGREEMENT. This Agreement contains the complete and exclusive
+agreement and understanding between the parties concerning the subject matter of
+this Agreement, and supersedes all prior and contemporaneous proposals,
+agreements, understanding, negotiations, representations, warranties,
+conditions, and communications, oral or written, between the parties relating to
+the same subject matter. This Agreement, including without limitation its
+termination, has no effect on any signed non-disclosure agreements between the
+parties, which remain in full force and effect as separate agreements to their
+terms. Each party acknowledges and agrees that in entering into this Agreement
+it has not relied on, and will not be entitled to rely on, any oral or written
+representations, warranties, conditions, understanding, or communications
+between the parties that are not expressly set forth in this Agreement. The
+express provisions of this Agreement control over any course of performance,
+course of dealing, or usage of the trade inconsistent with any of the provisions
+of this Agreement. The provisions of this Agreement will prevail notwithstanding
+any different, conflicting, or additional provisions that may appear on any
+purchase order, acknowledgement, invoice, or other writing issued by either
+party in connection with this Agreement. No modification or amendment to this
+Agreement will be effective unless in writing and signed by authorized
+representatives of each party, and must specifically identify this Agreement by
+its title and version (e.g., "End User License Agreement for the Intel(R)
+Software (Version May 2018)); except that Intel may make changes to the
+Agreement as it distributes new versions of the Materials. When these changes
+are made, Intel will make a new version of the Agreement available on its
+website: https://software.intel.com/en-us/articles/end-user-license-agreement.
+If You received a copy of this Agreement translated into another language, the
+English language version of this Agreement will prevail in the event of any
+conflict between versions.
 
-   B. EXPORT. You must comply with all laws and regulations of the United States
-   and other countries governing the export, re-export, import, transfer,
-   distribution, use, and servicing of Software.  In particular, You must not:
-   (a) sell or transfer Software to a country subject to sanctions, or to any
-   entity listed on a denial order published by the United States government or
-   any other relevant government; or (b) use, sell, or transfer Software for the
-   development, design, manufacture, or production of nuclear, missile, chemical
-   or biological weapons, or for any other purpose prohibited by the United
-   States government or other applicable government; without first obtaining all
-   authorizations required by all applicable laws.  For more details on Your
-   export obligations, please visit
-   http://www.intel.com/content/www/us/en/legal/export-compliance.html?wapkw=export.
+13.2 EXPORT. You acknowledge that the Materials and all related technical
+information are subject to export controls under the laws and regulations of the
+United States and any other applicable governments. You agree to comply with
+these laws and regulations governing export, re-export, import, transfer,
+distribution, and use of the Materials. In particular, but without limitation,
+the Materials may not be exported or re-exported (a) into any U.S. embargoed
+countries or (b) to any person or entity listed on a denial order published by
+the U.S. government or any other applicable governments. By using the Materials,
+You represent and warrant that You are not located in any such country or on any
+such list. You also agree that You will not use the Materials for any purposes
+prohibited by the U.S. government or other applicable governments, including,
+without limitation, the development, design, manufacture or production of
+nuclear, missile, chemical or biological weapons. You confirm that the Materials
+will not be re-exported or sold to a third party who is known or suspected to be
+involved in activities including, without limitation, the development, design,
+manufacture, or production of nuclear, missile, chemical or biological weapons.
 
+13.3 GOVERNING LAW, JURISDICTION, AND VENUE. All disputes arising out of or
+related to this Agreement, whether based on contract, tort, or any other legal
+or equitable theory, will in all respects be governed by, and construed and
+interpreted under, the laws of the United States of America and the State of
+Delaware, without reference to conflict of laws principles. The parties agree
+that the United Nations Convention on Contracts for the International Sale of
+Goods (1980) is specifically excluded from and will not apply to this Agreement.
+All disputes arising out of or related to this Agreement, whether based on
+contract, tort, or any other legal or equitable theory, will be subject to the
+exclusive jurisdiction of the courts of the State of Delaware or of the Federal
+courts sitting in that State. Each party submits to the personal jurisdiction of
+those courts and waives all objections to that jurisdiction and venue for those
+disputes.
 
-   C. GOVERNING LAW, JURISDICTION, AND VENUE: All disputes arising out of or
-   related to this Agreement, whether based on contract, tort, or any other
-   legal or equitable theory, will in all respects be governed by, and construed
-   and interpreted under, the laws of the United States of America and the State
-   of Delaware, without reference to conflict of laws principles. The parties
-   agree that the United Nations Convention on Contracts for the International
-   Sale of Goods (1980) is specifically excluded from and will not apply to this
-   Agreement. All disputes arising out of or related to this Agreement, whether
-   based on contract, tort, or any other legal or equitable theory, will be
-   subject to the exclusive jurisdiction of the courts of the State of Delaware
-   or of the Federal courts sitting in that State. Each party submits to the
-   personal jurisdiction of those courts and waives all objections to that
-   jurisdiction and venue for those disputes.
+13.4 SEVERABILITY. The parties intend that if a court holds that any provision
+or part of this Agreement is invalid or unenforceable under applicable law, the
+court will modify the provision to the minimum extent necessary to make it valid
+and enforceable, or if it cannot be made valid and enforceable, the parties
+intend that the court will sever and delete the provision or part from this
+Agreement. Any change to or deletion of a provision or part of this Agreement
+under this Section will not affect the validity or enforceability of the
+remainder of this Agreement, which will continue in full force and effect.
 
-   D. SEVERABILITY: The parties intend that if a court holds that any provision
-   or part of this Agreement is invalid or unenforceable under applicable law,
-   the court will modify the provision to the minimum extent necessary to make
-   it valid and enforceable, or if it cannot be made valid and enforceable, the
-   parties intend that the court will sever and delete the provision or part
-   from this Agreement. Any change to or deletion of a provision or part of this
-   Agreement under this Section will not affect the validity or enforceability
-   of the remainder of this Agreement, which will continue in full force and
-   effect.
-   
-   
 * Other names and brands may be claimed as the property of others
 
 
 
 
-	
+
 Common Public License Version 1.0
 
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
 PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 
+THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
-1. DEFINITIONS 
+1. DEFINITIONS
 
 "Contribution" means:
 
   a) in the case of the initial Contributor, the initial code and
-     documentation distributed under this Agreement, and 
+     documentation distributed under this Agreement, and
 
   b) in the case of each subsequent Contributor:
      i)  changes to the Program, and
@@ -636,18 +731,18 @@ THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
          conjunction with the Program under their own license
          agreement, and (ii) are not derivative works of the Program.
 
-"Contributor" means any person or entity that distributes the Program. 
+"Contributor" means any person or entity that distributes the Program.
 
 "Licensed Patents " mean patent claims licensable by a Contributor
 which are necessarily infringed by the use or sale of its Contribution
 alone or when combined with the Program.
 
 "Program" means the Contributions distributed in accordance with this
-Agreement.  
+Agreement.
 
 "Recipient" means anyone who receives the Program under this
-Agreement, including all Contributors. 
- 
+Agreement, including all Contributors.
+
 2. GRANT OF RIGHTS
 
   a) Subject to the terms of this Agreement, each Contributor hereby
@@ -690,7 +785,7 @@ Agreement, including all Contributors.
 3. REQUIREMENTS
 
 A Contributor may choose to distribute the Program in object code form
-under its own license agreement, provided that:  
+under its own license agreement, provided that:
 
   a) it complies with the terms and conditions of this Agreement; and
 
@@ -723,7 +818,7 @@ Each Contributor must identify itself as the originator of its
 Contribution, if any, in a manner that reasonably allows subsequent
 Recipients to identify the originator of the Contribution.
 
-4. COMMERCIAL DISTRIBUTION 
+4. COMMERCIAL DISTRIBUTION
 
 Commercial distributors of software may accept certain
 responsibilities with respect to end users, business partners and the
@@ -760,7 +855,7 @@ alone. Under this section, the Commercial Contributor would have to
 defend claims against the other Contributors related to those
 performance claims and warranties, and if a court requires any other
 Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.  
+must pay those damages.
 
 5. NO WARRANTY
 
@@ -774,9 +869,9 @@ distributing the Program and assumes all risks associated with its
 exercise of rights under this Agreement, including but not limited to
 the risks and costs of program errors, compliance with applicable
 laws, damage to or loss of data, programs or equipment, and
-unavailability or interruption of operations. 
+unavailability or interruption of operations.
 
-6. DISCLAIMER OF LIABILITY 
+6. DISCLAIMER OF LIABILITY
 
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
 ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
@@ -785,7 +880,7 @@ WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
 DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
 7. GENERAL
 
@@ -794,7 +889,7 @@ applicable law, it shall not affect the validity or enforceability of
 the remainder of the terms of this Agreement, and without further
 action by the parties hereto, such provision shall be reformed to the
 minimum extent necessary to make such provision valid and
-enforceable. 
+enforceable.
 
 If Recipient institutes patent litigation against a Contributor with
 respect to a patent applicable to software (including a cross-claim or
@@ -817,7 +912,7 @@ and distribution of the Program as soon as reasonably
 practicable. However, Recipient's obligations under this Agreement and
 any licenses granted by Recipient relating to the Program shall
 continue and survive.
- 
+
 Everyone is permitted to copy and distribute copies of this Agreement,
 but in order to avoid inconsistency the Agreement is copyrighted and
 may only be modified in the following manner. The Agreement Steward
@@ -835,7 +930,7 @@ the new version. Except as expressly stated in Sections 2(a) and 2(b)
 above, Recipient receives no rights or licenses to the intellectual
 property of any Contributor under this Agreement, whether expressly,
 by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved. 
+expressly granted under this Agreement are reserved.
 
 This Agreement is governed by the laws of the State of New York and
 the intellectual property laws of the United States of America. No
@@ -844,3 +939,464 @@ more than one year after the cause of action arose. Each party waives
 its rights to a jury trial in any resulting litigation.
 
 
+protobuf
+
+BSD 3-clause "New" or "Revised" License
+Copyright 2008 Google Inc. All rights reserved.
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are
+	met:
+	* Redistributions of source code must retain the above copyright
+	notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above
+	copyright notice, this list of conditions and the following disclaimer
+	in the documentation and/or other materials provided with the
+	distribution.
+	* Neither the name of Google Inc. nor the names of its
+	contributors may be used to endorse or promote products derived from
+	this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+	OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+	Code generated by the Protocol Buffer compiler is owned by the owner
+	of the input file used when generating it. This code is not
+	standalone and requires a support library to be linked with it. This
+	support library is itself covered by the above license.
+
+
+Instrumentation and Tracing Technology (ITT) Notify User API
+
+BSD 3-clause "New" or "Revised" License
+Copyright (c) 2015, Intel Corporation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+•	Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+•	Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the distribution.
+•	Neither the name of the Intel Corporation nor the names of its contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Intel® Threading Building Blocks (Intel® TBB); Khronos Group OpenCL Registry; Khronos Group SPIRV-Tools; Khronos Group EGL Headers; Khronos Group OpenGL Registry
+
+Apache License
+	                           Version 2.0, January 2004
+	                        http://www.apache.org/licenses/
+
+
+	   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+
+	   1. Definitions.
+
+
+	      "License" shall mean the terms and conditions for use, reproduction,
+	      and distribution as defined by Sections 1 through 9 of this document.
+
+
+	      "Licensor" shall mean the copyright owner or entity authorized by
+	      the copyright owner that is granting the License.
+
+
+	      "Legal Entity" shall mean the union of the acting entity and all
+	      other entities that control, are controlled by, or are under common
+	      control with that entity. For the purposes of this definition,
+	      "control" means (i) the power, direct or indirect, to cause the
+	      direction or management of such entity, whether by contract or
+	      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+	      outstanding shares, or (iii) beneficial ownership of such entity.
+
+
+	      "You" (or "Your") shall mean an individual or Legal Entity
+	      exercising permissions granted by this License.
+
+
+	      "Source" form shall mean the preferred form for making modifications,
+	      including but not limited to software source code, documentation
+	      source, and configuration files.
+
+
+	      "Object" form shall mean any form resulting from mechanical
+	      transformation or translation of a Source form, including but
+	      not limited to compiled object code, generated documentation,
+	      and conversions to other media types.
+
+
+	      "Work" shall mean the work of authorship, whether in Source or
+	      Object form, made available under the License, as indicated by a
+	      copyright notice that is included in or attached to the work
+	      (an example is provided in the Appendix below).
+
+
+	      "Derivative Works" shall mean any work, whether in Source or Object
+	      form, that is based on (or derived from) the Work and for which the
+	      editorial revisions, annotations, elaborations, or other modifications
+	      represent, as a whole, an original work of authorship. For the purposes
+	      of this License, Derivative Works shall not include works that remain
+	      separable from, or merely link (or bind by name) to the interfaces of,
+	      the Work and Derivative Works thereof.
+
+
+	      "Contribution" shall mean any work of authorship, including
+	      the original version of the Work and any modifications or additions
+	      to that Work or Derivative Works thereof, that is intentionally
+	      submitted to Licensor for inclusion in the Work by the copyright owner
+	      or by an individual or Legal Entity authorized to submit on behalf of
+	      the copyright owner. For the purposes of this definition, "submitted"
+	      means any form of electronic, verbal, or written communication sent
+	      to the Licensor or its representatives, including but not limited to
+	      communication on electronic mailing lists, source code control systems,
+	      and issue tracking systems that are managed by, or on behalf of, the
+	      Licensor for the purpose of discussing and improving the Work, but
+	      excluding communication that is conspicuously marked or otherwise
+	      designated in writing by the copyright owner as "Not a Contribution."
+
+
+	      "Contributor" shall mean Licensor and any individual or Legal Entity
+	      on behalf of whom a Contribution has been received by Licensor and
+	      subsequently incorporated within the Work.
+
+
+	   2. Grant of Copyright License. Subject to the terms and conditions of
+	      this License, each Contributor hereby grants to You a perpetual,
+	      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+	      copyright license to reproduce, prepare Derivative Works of,
+	      publicly display, publicly perform, sublicense, and distribute the
+	      Work and such Derivative Works in Source or Object form.
+
+
+	   3. Grant of Patent License. Subject to the terms and conditions of
+	      this License, each Contributor hereby grants to You a perpetual,
+	      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+	      (except as stated in this section) patent license to make, have made,
+	      use, offer to sell, sell, import, and otherwise transfer the Work,
+	      where such license applies only to those patent claims licensable
+	      by such Contributor that are necessarily infringed by their
+	      Contribution(s) alone or by combination of their Contribution(s)
+	      with the Work to which such Contribution(s) was submitted. If You
+	      institute patent litigation against any entity (including a
+	      cross-claim or counterclaim in a lawsuit) alleging that the Work
+	      or a Contribution incorporated within the Work constitutes direct
+	      or contributory patent infringement, then any patent licenses
+	      granted to You under this License for that Work shall terminate
+	      as of the date such litigation is filed.
+
+
+	   4. Redistribution. You may reproduce and distribute copies of the
+	      Work or Derivative Works thereof in any medium, with or without
+	      modifications, and in Source or Object form, provided that You
+	      meet the following conditions:
+
+
+	      (a) You must give any other recipients of the Work or
+	          Derivative Works a copy of this License; and
+
+
+	      (b) You must cause any modified files to carry prominent notices
+	          stating that You changed the files; and
+
+
+	      (c) You must retain, in the Source form of any Derivative Works
+	          that You distribute, all copyright, patent, trademark, and
+	          attribution notices from the Source form of the Work,
+	          excluding those notices that do not pertain to any part of
+	          the Derivative Works; and
+
+
+	      (d) If the Work includes a "NOTICE" text file as part of its
+	          distribution, then any Derivative Works that You distribute must
+	          include a readable copy of the attribution notices contained
+	          within such NOTICE file, excluding those notices that do not
+	          pertain to any part of the Derivative Works, in at least one
+	          of the following places: within a NOTICE text file distributed
+	          as part of the Derivative Works; within the Source form or
+	          documentation, if provided along with the Derivative Works; or,
+	          within a display generated by the Derivative Works, if and
+	          wherever such third-party notices normally appear. The contents
+	          of the NOTICE file are for informational purposes only and
+	          do not modify the License. You may add Your own attribution
+	          notices within Derivative Works that You distribute, alongside
+	          or as an addendum to the NOTICE text from the Work, provided
+	          that such additional attribution notices cannot be construed
+	          as modifying the License.
+
+
+	      You may add Your own copyright statement to Your modifications and
+	      may provide additional or different license terms and conditions
+	      for use, reproduction, or distribution of Your modifications, or
+	      for any such Derivative Works as a whole, provided Your use,
+	      reproduction, and distribution of the Work otherwise complies with
+	      the conditions stated in this License.
+
+
+	   5. Submission of Contributions. Unless You explicitly state otherwise,
+	      any Contribution intentionally submitted for inclusion in the Work
+	      by You to the Licensor shall be under the terms and conditions of
+	      this License, without any additional terms or conditions.
+	      Notwithstanding the above, nothing herein shall supersede or modify
+	      the terms of any separate license agreement you may have executed
+	      with Licensor regarding such Contributions.
+
+
+	   6. Trademarks. This License does not grant permission to use the trade
+	      names, trademarks, service marks, or product names of the Licensor,
+	      except as required for reasonable and customary use in describing the
+	      origin of the Work and reproducing the content of the NOTICE file.
+
+
+	   7. Disclaimer of Warranty. Unless required by applicable law or
+	      agreed to in writing, Licensor provides the Work (and each
+	      Contributor provides its Contributions) on an "AS IS" BASIS,
+	      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+	      implied, including, without limitation, any warranties or conditions
+	      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+	      PARTICULAR PURPOSE. You are solely responsible for determining the
+	      appropriateness of using or redistributing the Work and assume any
+	      risks associated with Your exercise of permissions under this License.
+
+
+	   8. Limitation of Liability. In no event and under no legal theory,
+	      whether in tort (including negligence), contract, or otherwise,
+	      unless required by applicable law (such as deliberate and grossly
+	      negligent acts) or agreed to in writing, shall any Contributor be
+	      liable to You for damages, including any direct, indirect, special,
+	      incidental, or consequential damages of any character arising as a
+	      result of this License or out of the use or inability to use the
+	      Work (including but not limited to damages for loss of goodwill,
+	      work stoppage, computer failure or malfunction, or any and all
+	      other commercial damages or losses), even if such Contributor
+	      has been advised of the possibility of such damages.
+
+
+	   9. Accepting Warranty or Additional Liability. While redistributing
+	      the Work or Derivative Works thereof, You may choose to offer,
+	      and charge a fee for, acceptance of support, warranty, indemnity,
+	      or other liability obligations and/or rights consistent with this
+	      License. However, in accepting such obligations, You may act only
+	      on Your own behalf and on Your sole responsibility, not on behalf
+	      of any other Contributor, and only if You agree to indemnify,
+	      defend, and hold each Contributor harmless for any liability
+	      incurred by, or claims asserted against, such Contributor by reason
+	      of your accepting any such warranty or additional liability.
+
+
+	   END OF TERMS AND CONDITIONS
+
+
+	   APPENDIX: How to apply the Apache License to your work.
+
+
+	      To apply the Apache License to your work, attach the following
+	      boilerplate notice, with the fields enclosed by brackets "[]"
+	      replaced with your own identifying information. (Don't include
+	      the brackets!)  The text should be enclosed in the appropriate
+	      comment syntax for the file format. We also recommend that a
+	      file or class name and description of purpose be included on the
+	      same "printed page" as the copyright notice for easier
+	      identification within third-party archives.
+
+
+	   Copyright [yyyy] [name of copyright owner]
+
+
+	   Licensed under the Apache License, Version 2.0 (the "License");
+	   you may not use this file except in compliance with the License.
+	   You may obtain a copy of the License at
+
+
+	       http://www.apache.org/licenses/LICENSE-2.0
+
+
+	   Unless required by applicable law or agreed to in writing, software
+	   distributed under the License is distributed on an "AS IS" BASIS,
+	   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	   See the License for the specific language governing permissions and
+	   limitations under the License.
+
+
+Khronos Group SPIRV-Headers; Khronos Group OpenCL
+
+Khronos License (modified MIT License)
+Copyright (c) 2015-2018 The Khronos Group Inc.
+
+	Permission is hereby granted, free of charge, to any person obtaining a
+	copy of this software and/or associated documentation files (the
+	"Materials"), to deal in the Materials without restriction, including
+	without limitation the rights to use, copy, modify, merge, publish,
+	distribute, sublicense, and/or sell copies of the Materials, and to
+	permit persons to whom the Materials are furnished to do so, subject to
+	the following conditions:
+
+
+	The above copyright notice and this permission notice shall be included
+	in all copies or substantial portions of the Materials.
+
+
+	MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
+	KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
+	SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
+	   https://www.khronos.org/registry/
+
+
+	THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+	MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+
+
+Khronos Group SPIRV-LLVM; Khronos Group SPIRV-LLVM-Translator; LLVM; CLANG
+
+==============================================================================
+LLVM Release License
+==============================================================================
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2003-2017 University of Illinois at Urbana-Champaign.
+All rights reserved.
+
+Developed by:
+
+    LLVM Team
+
+    University of Illinois at Urbana-Champaign
+
+    http://llvm.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+Copyrights and Licenses for Third Party Software Distributed with LLVM:
+==============================================================================
+The LLVM software contains code written by third parties.  Such software will
+have its own individual LICENSE.TXT file in the directory in which it appears.
+This file will describe the copyrights, license, and restrictions which apply
+to that code.
+
+The disclaimer of warranty in the University of Illinois Open Source License
+applies to all code in the LLVM Distribution, and nothing in any of the
+other licenses gives permission to use the names of the LLVM Team or the
+University of Illinois to endorse or promote products derived from this
+Software.
+
+The following pieces of software have additional or alternate copyrights,
+licenses, and/or restrictions:
+
+Program             Directory
+-------             ---------
+Autoconf            llvm/autoconf
+                    llvm/projects/ModuleMaker/autoconf
+Google Test         llvm/utils/unittest/googletest
+OpenBSD regex       llvm/lib/Support/{reg*, COPYRIGHT.regex}
+pyyaml tests        llvm/test/YAMLParser/{*.data, LICENSE.TXT}
+ARM contributions   llvm/lib/Target/ARM/LICENSE.TXT
+md5 contributions   llvm/lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h
+
+
+LLVM "compiler-rt" runtime libraries
+
+Dual licensed under the MIT license and the UIUC License (a BSD-like license).
+http://llvm.org/docs/DeveloperPolicy.html#license
+
+
+This text file is the file (e.g., redist.txt, etc) specified in the accompanying
+End User License Agreement for the Intel(R) Software Development Products
+("Agreement"). All capitalized terms used but not defined in this text file have
+the same meaning as specified in the Agreement.
+
+The Redistributables files are listed below, and are subject to all of the terms
+and conditions of the Agreement, including without limitation Section 2.1.A.(4).
+
+Also included as Redistributables are executables and shared and static
+libraries you create by linking your program with libraries provided by Intel as
+part of the Materials for this product but which are not listed in this
+redist.txt file ("Libraries"); provided that you do not redistribute those
+Intel provided libraries or any other portion of those Intel provided libraries
+in any other way.
+
+YOU MAY NOT REDISTRIBUTE THESE MATERIALS UNDER AN EVALUATION LICENSE
+
+################################################################################
+###   Intel® CPU Runtime for OpenCL™ Applications 18.1
+################################################################################
+
+<installdir>//opencl_compilers_and_libraries_18.1.0.015/licensing/DPD_EULA.txt
+<installdir>//opencl_compilers_and_libraries_18.1.0.015/licensing/Third_party_lic.txt
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/clbltfnshared.rtl
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/__ocl_svml_e9.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/__ocl_svml_h8.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/__ocl_svml_l9.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/__ocl_svml_z0.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/cl.cfg
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfne9.rtl
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfne9_img_cbk.o
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfne9_img_cbk.rtl
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfnh8.rtl
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfnh8_img_cbk.o
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfnh8_img_cbk.rtl
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfnl9.rtl
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfnl9_img_cbk.o
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfnl9_img_cbk.rtl
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfnz0.rtl
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfnz0_img_cbk.o
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/clbltfnz0_img_cbk.rtl
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libOclCpuBackEnd.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libOpenCL.so.1
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libOpenCL.so.2.0
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libcl_logger.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libclang_compiler.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libcommon_clang.18.1.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libcpu_device.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libintelocl.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libtask_executor.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libtbb.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libtbb.so.2
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libtbbmalloc.so
+<installdir>/opencl_compilers_and_libraries_18.1.0.015/linux/compiler/lib/intel64_lin/libtbbmalloc.so.2
+
+* Other names and brands may be claimed as the property of others.
diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild
index 3995f16eed..6b7df3f4a6 100644
--- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )
 
 LICENSE="GPL-3 LGPL-2.1+"
 SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
-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="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
 
 REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild
index cd08376dee..50c94270b5 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild
@@ -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"
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.12.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.12.ebuild
index 8cd773037a..9f67d07f86 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.12.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.12.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/}
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="sctp"
 
 DEPEND="
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/metadata.xml b/sdk_container/src/third_party/portage-stable/net-misc/rsync/metadata.xml
index 99f88ebaf2..4dd797f7c4 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/metadata.xml
@@ -11,6 +11,7 @@
 		<remote-id type="github">WayneD/rsync</remote-id>
 	</upstream>
 	<use>
+		<flag name="rrsync">Install rrsync script to setup restricted rsync users via ssh logins</flag>
 		<flag name="stunnel">Provide helper scripts for using rsync via &gt;=<pkg>net-misc/stunnel</pkg>-4</flag>
 		<flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag>
 		<flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag>
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r1.ebuild
similarity index 84%
rename from sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7.ebuild
rename to sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r1.ebuild
index 804909ae11..6c31cf7b85 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r1.ebuild
@@ -37,8 +37,9 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd"
+IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
 REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	>=dev-libs/popt-1.5
@@ -48,6 +49,12 @@ RDEPEND="
 		dev-lang/perl
 	)
 	lz4? ( app-arch/lz4:= )
+	rrsync? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/bracex[${PYTHON_USEDEP}]
+		')
+	)
 	ssl? ( dev-libs/openssl:= )
 	system-zlib? ( sys-libs/zlib )
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
@@ -55,7 +62,10 @@ RDEPEND="
 	zstd? ( >=app-arch/zstd-1.4:= )
 	iconv? ( virtual/libiconv )"
 DEPEND="${RDEPEND}"
-BDEPEND="examples? ( ${PYTHON_DEPS} )"
+BDEPEND="
+	examples? ( ${PYTHON_DEPS} )
+	rrsync? ( ${PYTHON_DEPS} )
+"
 
 if [[ ${PV} == *9999 ]] ; then
 	BDEPEND+=" ${PYTHON_DEPS}
@@ -69,7 +79,7 @@ fi
 pkg_setup() {
 	# - USE=examples needs Python itself at runtime, but nothing else
 	# - 9999 needs commonmark at build time
-	if [[ ${PV} == *9999 ]] || use examples ; then
+	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
 		python-single-r1_pkg_setup
 	fi
 }
@@ -82,6 +92,17 @@ src_prepare() {
 		eautoconf -o configure.sh
 		eautoheader && touch config.h.in
 	fi
+
+	if use examples || use rrsync; then
+		python_fix_shebang support/
+	fi
+
+	if [[ -f rrsync.1 ]]; then
+		# If the pre-build rrsync.1 man page exists, then link to it
+		# from support/rrsync.1 to avoid rsync's build system attempting
+		# re-creating the man page (bug #883049).
+		ln -s ../rrsync.1 support/rrsync.1 || die
+	fi
 }
 
 src_configure() {
@@ -92,6 +113,7 @@ src_configure() {
 		$(use_enable acl acl-support)
 		$(use_enable iconv)
 		$(use_enable lz4)
+		$(use_with rrsync)
 		$(use_enable ssl openssl)
 		$(use_with !system-zlib included-zlib)
 		$(use_enable xattr xattr-support)
@@ -126,7 +148,9 @@ src_install() {
 
 	# Install the useful contrib scripts
 	if use examples ; then
-		python_fix_shebang support/
+		# The 'rrsync' script is installed conditionally via the 'rrysnc'
+		# USE flag, and not via the 'examples' USE flag.
+		rm support/rrsync* || die
 
 		exeinto /usr/share/rsync
 		doexe support/*
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild
index 804909ae11..6c31cf7b85 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild
@@ -37,8 +37,9 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd"
+IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
 REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	>=dev-libs/popt-1.5
@@ -48,6 +49,12 @@ RDEPEND="
 		dev-lang/perl
 	)
 	lz4? ( app-arch/lz4:= )
+	rrsync? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/bracex[${PYTHON_USEDEP}]
+		')
+	)
 	ssl? ( dev-libs/openssl:= )
 	system-zlib? ( sys-libs/zlib )
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
@@ -55,7 +62,10 @@ RDEPEND="
 	zstd? ( >=app-arch/zstd-1.4:= )
 	iconv? ( virtual/libiconv )"
 DEPEND="${RDEPEND}"
-BDEPEND="examples? ( ${PYTHON_DEPS} )"
+BDEPEND="
+	examples? ( ${PYTHON_DEPS} )
+	rrsync? ( ${PYTHON_DEPS} )
+"
 
 if [[ ${PV} == *9999 ]] ; then
 	BDEPEND+=" ${PYTHON_DEPS}
@@ -69,7 +79,7 @@ fi
 pkg_setup() {
 	# - USE=examples needs Python itself at runtime, but nothing else
 	# - 9999 needs commonmark at build time
-	if [[ ${PV} == *9999 ]] || use examples ; then
+	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
 		python-single-r1_pkg_setup
 	fi
 }
@@ -82,6 +92,17 @@ src_prepare() {
 		eautoconf -o configure.sh
 		eautoheader && touch config.h.in
 	fi
+
+	if use examples || use rrsync; then
+		python_fix_shebang support/
+	fi
+
+	if [[ -f rrsync.1 ]]; then
+		# If the pre-build rrsync.1 man page exists, then link to it
+		# from support/rrsync.1 to avoid rsync's build system attempting
+		# re-creating the man page (bug #883049).
+		ln -s ../rrsync.1 support/rrsync.1 || die
+	fi
 }
 
 src_configure() {
@@ -92,6 +113,7 @@ src_configure() {
 		$(use_enable acl acl-support)
 		$(use_enable iconv)
 		$(use_enable lz4)
+		$(use_with rrsync)
 		$(use_enable ssl openssl)
 		$(use_with !system-zlib included-zlib)
 		$(use_enable xattr xattr-support)
@@ -126,7 +148,9 @@ src_install() {
 
 	# Install the useful contrib scripts
 	if use examples ; then
-		python_fix_shebang support/
+		# The 'rrsync' script is installed conditionally via the 'rrysnc'
+		# USE flag, and not via the 'examples' USE flag.
+		rm support/rrsync* || die
 
 		exeinto /usr/share/rsync
 		doexe support/*
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.4.4.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.4.4.ebuild
index 2c36251c76..8693b3348e 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.4.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-1.7.4.4.ebuild
@@ -43,12 +43,6 @@ src_configure() {
 
 	tc-export AR
 
-	# getprotobynumber_r doesn't exist on musl, so avoid probing for it
-	# and possibly getting it wrong. TODO: fix configure?
-	# (Grabbed from Alpine Linux: https://git.alpinelinux.org/aports/commit/main/socat/APKBUILD?id=5edc9195355ced3db991c1a7cda5648d52019b11)
-	# bug #831016
-	use elibc_musl && export sc_cv_getprotobynumber_r=2
-
 	econf \
 		$(use_enable ssl openssl) \
 		$(use_enable readline) \
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
index 471115a6de..27207c6da3 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
+# app-text/pandoc is keyworded on this architecture
+net-libs/gssdp -man
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-10-07)
 # sys-libs/libsmbios is available here.
 app-laptop/pbbuttonsd -macbook
diff --git 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
index c07caa76e3..59eeb185bf 100644
--- 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
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Florian Schmaus <flow@gentoo.org> (2022-11-23)
+# avoid larger deptree, bug #882593
+dev-python/bracex doc
+
 # Sam James <sam@gentoo.org> (2022-10-29)
 # pandoc not keyworded here, bug #878355
 app-admin/conky doc
diff --git 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
index a54c74e4c0..552f82af8e 100644
--- 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,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Florian Schmaus <flow@gentoo.org> (2022-11-23)
+# avoid larger deptree, bug #882593
+dev-python/bracex doc
+
 # Alexey Shvetsov <alexxy@gentoo.org> (2022-09-15)
 # Mask nvml use flag for slurm
 sys-cluster/slurm nvml
@@ -209,10 +213,6 @@ lxqt-base/lxqt-meta archiver
 # static-pie works on arm64, #719444
 sys-libs/glibc -static-pie
 
-# Patrick McLean <chutzpah@gentoo.org> (2019-03-26)
-# Some test deps aren't keyworded on arm64
-dev-python/kazoo test
-
 # Ettore Di Giacinto <mudler@gentoo.org> (2016-11-10)
 # Dependency has no stable keyword
 # and as for now we have only stable mate versions
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask
index 7d91109f91..b950d68839 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Florian Schmaus <flow@gentoo.org> (2022-11-23)
+# avoid larger deptree, bug #882593
+dev-python/bracex doc
+
 # Conrad Kostecki <conikost@gentoo.org> (2022-11-01)
 # Mask tests, as not all needed deps are available on this arch.
 # See #878933 for progress.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask
index bbb3c72764..8ed2298b91 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Florian Schmaus <flow@gentoo.org> (2022-11-23)
+# avoid larger deptree, bug #882593
+dev-python/bracex doc
+
 # matoro <matoro_gentoo@matoro.tk> (2022-09-30)
 # No ruby on ia64 for dev-ruby/asciidoctor
 net-misc/chrony html
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/make.defaults
index 3c0828d8bc..61a8e65a13 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/make.defaults
@@ -42,10 +42,6 @@ CHOST_lp64d="loongarch64-unknown-linux-gnu"
 # Since many people will want to test this in qemu...
 FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox"
 
-# We need to fetch https git repo (gcc) during bootstrap, before gcc-12.1.0
-# is officially released.
-BOOTSTRAP_USE="${BOOTSTRAP_USE} curl_ssl_openssl ssl"
-
 # The following stuff MUST be defined in subdirs:
 # ABI
 # DEFAULT_ABI
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask
index a11fe7068f..cf1df784e7 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask
@@ -1,6 +1,25 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# WANG Xuerui <xen0n@gentoo.org> (2022-11-27)
+# Mask configurations not accepting llvm:16 and/or clang:16, either due to
+# lack of testing or simply being unsupported upstream (the opaque pointers
+# in particular need downstream changes).
+app-office/libreoffice clang
+<media-libs/mesa-22.3.0 llvm
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-11-27)
+# LLVM toolchain now partially usable on loong, mask the remaining pieces
+# pending test/bugfixes/porting.
+#
+# - sys-libs/libcxxabi: fails many tests but is apparently working
+# - sys-libs/libcxx: fails many tests, more upstream work likely needed
+# - sys-libs/libomp: fails 4 tests
+#   - need at least https://reviews.llvm.org/D138177 but there could be more
+# - sys-devel/lld: port is still under review
+sys-devel/clang-common default-libcxx default-lld
+sys-devel/clang-runtime libcxx openmp
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-11-18)
 # net-libs/webkit-gtk is not available on loong yet.
 app-text/atril epub
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask
index 1440498b9f..e9dc3b0f16 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask
@@ -29,7 +29,6 @@ valgrind
 
 # Temporarily masked during initial keywording
 audit
-bluetooth
 doc
 efl
 elogind
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask
index bed1ecab87..c9cf860069 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask
@@ -32,10 +32,6 @@ app-editors/emacs gui mailutils
 # Needs a lot of Perl packages to be keyworded.
 dev-vcs/git doc
 
-# James Le Cuirot <chewi@gentoo.org> (2021-09-20)
-# Requires zstd, which is currently broken on m68k.
-dev-util/cmake test
-
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
 # Avoid having to keyword Poppler and X11 libraries for now.
 media-gfx/graphviz pdf
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask
index 4df4b49e67..5079fb4ece 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask
@@ -81,10 +81,6 @@ vulkan
 # Ruby just crashes on startup.
 ruby
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-08-22)
-# app-arch/zstd is broken
-zstd
-
 # James Le Cuirot <chewi@gentoo.org> (2021-08-20)
 # Qt is not keyworded or tested.
 qt5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask
index 6ffae73354..d79b13f82e 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Florian Schmaus <flow@gentoo.org> (2022-11-23)
+# avoid larger deptree, bug #882593
+dev-python/bracex doc
+
 # Sam James <sam@gentoo.org> (2022-10-29)
 # pandoc not keyworded here, bug #878355
 app-admin/conky doc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index acf4a8ba1a..cfeff90485 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -10,10 +10,6 @@ app-portage/nattka -depgraph-order
 # impl there anyway. Please keep this in sync with use.stable.mask.
 dev-lang/python-exec -python_targets_pypy3
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-27)
-# deps are keyworded
-gnome-base/gnome-extra-apps -tracker
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-27)
 # deps not keyworded
 media-gfx/gnome-photos flickr upnp-av
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask
index e3aefef4ec..a73e5c8b47 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Yixun Lan <dlan@gentoo.org> (2022-11-24)
+# depend on dev-libs/libpcre2[jit] which not supported yet, bug #879511
+www-servers/varnish jit
+
 # Sam James <sam@gentoo.org> (2022-10-29)
 # pandoc not keyworded here, bug #878355
 app-admin/conky doc
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask
index d8a106a728..1f332436d8 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Florian Schmaus <flow@gentoo.org> (2022-11-23)
+# avoid larger deptree, bug #882593
+dev-python/bracex doc
+
 # Sam James <sam@gentoo.org> (2022-04-26)
 # Unkeyworded dependencies
 app-text/htmltidy test
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/64ul/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/64ul/package.mask
index 62fc845c83..9258d74abe 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/64ul/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/64ul/package.mask
@@ -1,6 +1,16 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2022-11-07)
+# SILO is designed for the old 64-bit kernel/32-bit userland combo
+# before there was a 64-bit userland available.  It requires a 32-bit
+# userland to build, so mask it on 64ul.  sys-boot/grub:2 support for
+# sparc was added in ~2018 and is documented in the handbook per #854954
+# See: https://github.com/esnowberg/grub2-sparc/wiki
+# See: https://wiki.gentoo.org/wiki/Handbook:SPARC/Blocks/Disks
+# See: https://wiki.gentoo.org/wiki/Handbook:SPARC/Blocks/Bootloader
+sys-boot/silo
+
 # Sam James <sam@gentoo.org> (2022-02-28)
 # Binary (needed for bootstrap) is sparc32?
 dev-lisp/sbcl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.mask
index 6a4f874db2..afbf090e28 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.mask
@@ -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-24)
+# Pulls in gjs which is broken on sparc, bug #882071
+gnome-extra/sushi
+
 # Raúl Porcel <armin76@gentoo.org> (2014-11-17)
 # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels
 sys-devel/kgcc64
diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask
index ba32c61af3..3cbc47e6be 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,17 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-11-24)
+# Pulls in gjs which is broken on sparc, bug #882071
+app-crypt/libsecret test-rust
+dev-util/glade gjs
+gnome-base/gnome-menus test
+gnome-base/nautilus previewer
+
+# Florian Schmaus <flow@gentoo.org> (2022-11-23)
+# avoid larger deptree, bug #882593
+dev-python/bracex doc
+
 # Sam James <sam@gentoo.org> (2022-10-29)
 # pandoc not keyworded here, bug #878355
 app-admin/conky doc
diff --git 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
index 80f4f0d954..a68e233ecf 100644
--- 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
@@ -14,10 +14,6 @@ media-video/mpv -libplacebo -vulkan
 app-laptop/pbbuttonsd -macbook
 sys-apps/fwupd -dell
 
-# 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
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask
index 19ccff06c4..6d258d9217 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask
@@ -6,6 +6,34 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Joonas Niilola <juippis@gentoo.org> (2022-11-25)
+# x11-wm/stumpwm-22.05_p20220818[doc] is totally broken. Bug #882935
+x11-wm/stumpwm doc
+
+# Bernd Waibel <waebbl-gentoo@posteo.net> (2022-11-25)
+# USE=tbb is broken in 7.7.0
+# https://tracker.dev.opencascade.org/view.php?id=33152
+~sci-libs/opencascade-7.7.0 tbb
+
+# Sam James <sam@gentoo.org> (2022-11-24)
+# Depends on old dev-lang/spidermonkey:68, bug #807772
+# Particularly unwise given it parses data from network.
+net-libs/libproxy spidermonkey
+
+# Pascal Jäger <pascal.jaeger@leimstift.de> (2022-11-24)
+# Metamail last rited
+app-text/crm114 mimencode
+
+# Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
+# app-text/pandoc is not keyworded on most architectures
+net-libs/gssdp man
+
+# Matt Turner <mattst88@gentoo.org> (2022-09-26)
+# Requires nautilus-43.0 which is keyworded everywhere
+>=app-arch/file-roller-43.0 nautilus
+>=app-text/evince-43.0 nautilus
+>=x11-terms/gnome-terminal-3.46 nautilus
+
 # Sam James <sam@gentoo.org> (2022-11-19)
 # Needs long-EOL dev-lang/spidermonkey:60 (which also needs python:2.7).
 media-libs/coin javascript
@@ -30,6 +58,11 @@ www-servers/uwsgi python-gevent
 # Requires net-misc/pyhoca-cli that is masked for removal.
 net-misc/remmina x2go
 
+# Matt Turner <mattst88@gentoo.org> (2022-11-16)
+# gnome-music and gnome-photos have not been ported to libsoup:3.0, while
+# other non-slotted dependencies have been.
+gnome-base/gnome-extra-apps tracker
+
 # Matt Turner <mattst88@gentoo.org> (2022-11-16)
 # tracker-miners depends on libsoup:3.0 but USE=rss depends on net-libs/libgrss
 # which has not been ported to libsoup:3.0.
@@ -44,13 +77,6 @@ dev-python/pyotherside qt6
 # Older versions of libvirt need a vulnerable version of wireshark
 <app-emulation/libvirt-8.0.0 wireshark-plugins
 
-# Sam James <sam@gentoo.org> (2022-10-07)
-# media-sound/rplay is masked for removal.
-x11-wm/fvwm3 rplay
-x11-wm/ctwm rplay
-x11-wm/fvwm rplay
-x11-wm/vtwm rplay
-
 # Viorel Munteanu <ceamac.paragon@gmail.com> (2022-10-07)
 # Cannot test and fix pax-kernel related bugs on a current grsec kernel
 # Mask the flag for now
@@ -65,15 +91,6 @@ app-emulation/virtualbox-modules pax-kernel
 sys-libs/zlib-ng compat
 sys-libs/minizip-ng compat
 
-# Matt Turner <mattst88@gentoo.org> (2022-09-26)
-# Requires nautilus-43.0 which is not in tree yet.
->=x11-terms/gnome-terminal-3.46 nautilus
-
-# Pascal Jaeger <pascal.jaeger@leimstift.de> (2022-09-21)
-# Versions >=43.0 of evince only work with <gnome-base/nautilus-42.2.
-# Allowing that use flag for >=43.0 would stop users from updating nautilus
->=app-text/evince-43.0 nautilus
-
 # Yiyang Wu <xgreenlandforwyy@gmail.com> (2022-09-21)
 # Intolerable mathematical errors found on AMD Radeon VII GPU during src_test,
 # may lead to incorrect results in computation.
@@ -183,10 +200,6 @@ dev-python/jupyter_server doc
 # https://github.com/aria2/aria2/issues/1636
 net-misc/aria2 gnutls
 
-# Matt Turner <mattst88@gentoo.org> (2022-03-25)
-# Depends on libsoup:3.0
->=gnome-base/gvfs-1.50 http
-
 # Craig Andrews <candrews@gentoo.org> (2022-03-25)
 # Requires as of yet unreleased QUIC support in OpenSSL
 net-libs/ngtcp2 openssl
diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
index 07276f167a..decc363f24 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask
@@ -4,6 +4,14 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Guillermo Joandet <gjoandet@gmail.com> (2022-11-22)
+# app-text/pandoc is not stable
+net-libs/gssdp man
+
+# Matt Turner <mattst88@gentoo.org> (2022-11-16)
+# Depends on libsoup:3.0
+>=gnome-base/gvfs-1.50 http
+
 # 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
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/parent
new file mode 100644
index 0000000000..c8b1675247
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/x32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/parent
new file mode 100644
index 0000000000..c8b1675247
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/parent
new file mode 100644
index 0000000000..c8b1675247
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr/parent
new file mode 100644
index 0000000000..5e9458ce54
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/parent
new file mode 100644
index 0000000000..f7739b4058
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/multilib/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/parent
new file mode 100644
index 0000000000..1b7f7eef0a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/parent
new file mode 100644
index 0000000000..44f88d3e2d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/parent
new file mode 100644
index 0000000000..1b7f7eef0a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/parent
new file mode 100644
index 0000000000..44f88d3e2d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/mipsel/o32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/merged-usr/parent
new file mode 100644
index 0000000000..1b7f7eef0a
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/parent
new file mode 100644
index 0000000000..44f88d3e2d
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/multilib/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/parent
new file mode 100644
index 0000000000..c8b1675247
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/parent
new file mode 100644
index 0000000000..c8b1675247
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/n64/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/eapi
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/parent
new file mode 100644
index 0000000000..c8b1675247
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/parent
new file mode 100644
index 0000000000..7e061533c1
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/mips/17.0/o32/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/ada_target.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/ada_target.desc
index 56e98a3ba1..a02d28dcd8 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/desc/ada_target.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/desc/ada_target.desc
@@ -1,6 +1,5 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-gnat_2020 - Compile with dev-lang/gnat-gpl-2020
 gnat_2021 - Compile with dev-lang/gnat-gpl-2021
 gcc_12_2_0 - Compile with sys-devel/gcc-12.2.0
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/merged-usr/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/features/merged-usr/make.defaults
index f6b244c0bf..6df2f8cf94 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/merged-usr/make.defaults
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/merged-usr/make.defaults
@@ -1,3 +1,4 @@
 # Mike Gilbert <floppym@gentoo.org> (2022-08-31)
 # Avoid removing merged-usr symlinks.
 UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /bin /lib /lib32 /lib64 /libx32 /sbin /usr/sbin"
+UNINSTALL_IGNORE="${UNINSTALL_IGNORE} /usr/lib/modules/*"
diff --git 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
index 5ae09de950..7136caab88 100644
--- 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
@@ -64,6 +64,7 @@ dev-util/cbindgen
 dev-util/git-delta
 dev-util/maturin
 dev-util/tree-sitter-cli
+>=dev-vcs/stgit-2
 gnome-base/gdm
 >=gnome-base/gnome-core-apps-3.36.5
 >=gnome-base/gnome-core-libs-3.36.5
@@ -72,6 +73,7 @@ gnome-base/gdm
 >=gnome-base/librsvg-2.41
 gnome-extra/gnome-browser-connector
 gnome-extra/gnome-tweaks
+gnome-extra/sushi
 >=media-gfx/libimagequant-4
 media-libs/libavif
 >=media-libs/libopenraw-0.3.2
@@ -86,6 +88,7 @@ net-p2p/deluge
 ros-meta/ros_comm
 sci-geosciences/gnome-maps
 >=sys-apps/bat-0.18.1
+sys-fs/bcachefs-tools
 virtual/rust
 www-apps/radicale
 >=x11-themes/adwaita-icon-theme-3.36
diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask
index 7a8ede783d..75f48aabba 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask
@@ -32,7 +32,6 @@ app-admin/salt libcloud openssl test
 dev-python/aiohttp test
 dev-python/cheroot test
 dev-python/cherrypy ssl
-dev-python/eventlet test
 dev-python/google-auth test
 dev-python/pyftpdlib ssl test
 dev-python/python-novaclient test
diff --git a/sdk_container/src/third_party/portage-stable/profiles/package.mask b/sdk_container/src/third_party/portage-stable/profiles/package.mask
index 472326f9fd..189ca5ad74 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/package.mask
+++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask
@@ -33,6 +33,117 @@
 
 #--- END OF EXAMPLES ---
 
+# John Helmert III <ajak@gentoo.org> (2022-11-27)
+# Unmaintained upstream, several unresolved public vulnerabilities,
+# Removal in 30 days. Bug #882773.
+www-servers/boa
+
+# David Seifert <soap@gentoo.org> (2022-11-27)
+# Broke API for C++, causes massive carnage for consumers.
+# Bug #883223.
+~dev-libs/glib-2.74.2
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-27)
+# Unresolved LICENSE issue for 3 years now.
+# Removal on 2022-12-27.  Bug #694708.
+app-admin/helm
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-27)
+# Broken with OpenSSL-3.  Last upstream activity in 2021, no reply
+# to the bug.
+# Removal on 2022-12-27.  Bug #805233.
+net-dns/dog
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-27)
+# Broken with modern dev-python/setuptools versions.  Last upstream
+# commit in 2018.  No reverse dependencies.
+# Removal on 2022-12-27.  Bug #822840.
+dev-python/slimit
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-27)
+# Unmaintained.  HOMEPAGE is gone.  Uses GTK+2.
+# Removal on 2022-12-27.  Bug #821118.
+games-util/xgamer
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-27)
+# Unmaintained, ancient package.  x11-misc/unclutter-xfixes is
+# a superior replacement.
+# Removal on 2022-12-27.  Bug #880845.
+x11-misc/unclutter
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-27)
+# Unmaintained.  Last bumped in 2005.  Superseded by Python version
+# with last release in 2008, then by vnc2flv with last release in 2010.
+# Removal on 2022-12-27.  Bug #880927.
+x11-misc/vnc2swf
+
+# Michael Mair-Keimberger <mmk@levelnine.at> (2022-11-25)
+# Unmaintained, last release a decade ago, upstream declared it EOL
+# Removal in 30 days.
+net-analyzer/snortsam
+
+# John Helmert III <ajak@gentoo.org> (2022-11-24)
+# Binary package several releases behind the source-based package,
+# multiple vulnerabilities, unmaintained for several years. Removal in
+# 30 days. Bugs #849389, #882783.
+dev-db/percona-xtrabackup-bin
+
+# John Helmert III <ajak@gentoo.org> (2022-11-24)
+# Compatibility issues with openssl-1.1*, numerous build issues, version
+# in tree is EOL upstream. Removal in 30 days. Bug #882759.
+net-misc/cfengine
+
+# Pascal Jäger <pascal.jaeger@leimstift.de> (2022-11-24)
+# No maintainer, last release in 1994. Fails to build
+# with clang-16. Runtime crash in certain conditions.
+# Removal on 2022-12-23.
+# Bugs #549922 #713492 #731256 #875464 #882263
+# Removal Bug: #882631
+net-mail/metamail
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-23)
+# Unpredictable build failures reported.  No revdeps left.
+# dev-libs/opencl-icd-loader is a good replacement.
+# Removal on 2022-12-23.  Bug #733018.
+dev-libs/ocl-icd
+
+# Michał Górny <mgorny@gentoo.org> (2022-11-23)
+# Packages with no maintainer and major issues reported.
+#
+# app-cdr/xbiso: bug #882089, last release in 2005
+# app-emulation/dlx: bug #874933, last release in 2001
+# app-office/sc: bug #877051, last release in 2002
+# net-libs/ortp: bug #874003, last bumped in 2014
+# net-nntp/brag: revdep of app-text/uudeview
+# net-vpn/vtun: bug #875443, last bumped in 2012, last release in 2016
+# sys-apps/fakeroot-ng: bug #851543, last release in 2013
+# sys-apps/pmount-gui: bug #776397, last bumped in 2013, commit in 2019
+# www-apache/mod_common_redirect: bug #874660, bumped in 2010, repo gone
+#
+# Removal on 2022-12-23.
+app-cdr/xbiso
+app-emulation/dlx
+app-office/sc
+net-libs/ortp
+net-nntp/brag
+net-vpn/vtun
+sys-apps/fakeroot-ng
+sys-apps/pmount-gui
+www-apache/mod_common_redirect
+
+# David Seifert <soap@gentoo.org> (2022-11-23)
+# EAPI 6, no revdeps in tree, never made it into upstream boost, library
+# only, last release 6 years ago. Removal on 2022-12-23.
+dev-libs/boost-mpl-cartesian_product
+
+# Matt Turner <mattst88@gentoo.org> (2022-11-16)
+# Packages or their dependencies have not been ported to libsoup:3.0, while
+# other non-slotted dependencies have been.
+media-gfx/gnome-photos
+media-sound/gnome-music
+net-libs/libzapojit
+net-misc/gnome-online-miners
+
 # Ionen Wolkens <ionen@gentoo.org> (2022-11-21)
 # Was added only for dev-python/pytest-bdd which no longer needs it.
 # If using, migrate to stdlib glob which supports `**` since python-3.5.
@@ -59,7 +170,6 @@ dev-cpp/pstreams
 # app-misc/glimpse: bug #684096, last bumped in 2013
 # dev-db/cpp-driver: bug #685936, last bumped in 2019
 # dev-erlang/riakc: bug #722688, last bumped in 2016
-# dev-libs/xalan-c: bug #734190, last bumped in 2011
 # dev-util/stubgen: bug #839927, last bumped in 2011
 # media-gfx/xzgv: bug #831252, last bumped in 2009
 # net-dns/dnssec-check: bug #571350, last bumped in 2016
@@ -76,7 +186,6 @@ app-forensics/ovaldi
 app-misc/glimpse
 dev-db/cpp-driver
 dev-erlang/riakc
-dev-libs/xalan-c
 dev-util/stubgen
 media-gfx/xzgv
 net-dns/dnssec-check
@@ -102,6 +211,8 @@ media-sound/umix
 dev-php/agavi
 dev-php/phing
 dev-php/PEAR-PEAR_PackageFileManager
+dev-php/PEAR-PEAR_PackageFileManager2
+dev-php/PEAR-PEAR_PackageFileManager_Plugins
 dev-php/PEAR-VersionControl_SVN
 dev-php/phpmd
 dev-php/simpletest
@@ -132,7 +243,6 @@ dev-python/Rx
 dev-python/bert
 dev-python/flask-assets
 dev-python/libpy_simdjson
-dev-python/parallax
 dev-python/pytest-salt
 dev-python/requests_pkcs12
 dev-python/slackclient
@@ -151,7 +261,6 @@ net-analyzer/carl
 net-im/skype-dbus-mock
 sci-libs/bmrblib
 sci-mathematics/relational
-sys-cluster/crmsh
 
 # Michał Górny <mgorny@gentoo.org> (2022-11-17)
 # Rarely used package with very high maintenance cost.  Hacky, requires
@@ -351,51 +460,6 @@ dev-libs/cloog
 # Removal in 30 days
 dev-python/pweave
 
-# Jonas Stein <jstein@gentoo.org> (2022-10-26)
-# Dead upstream, open bugs.
-# Removal after 2022-12-24.  Bug #878337.
-app-misc/tpconfig
-
-# Sam James <sam@gentoo.org> (2022-10-24)
-# Non-free licence which prohibits any patching. Fails to build with Clang 16.
-# Removal on 2022-10-24.
-dev-util/sgb
-sci-misc/gt-itm
-
-# Sam James <sam@gentoo.org> (2022-10-24)
-# Fails to build with Clang 16 (code quality issues), no upstream activity
-# in 7 years. Removal on 2022-11-23. bug #874486, bug #791604.
-games-fps/qudos
-
-# David Seifert <soap@gentoo.org> (2022-10-23)
-# Dead package, upstream gone, GTK+2, fails to build with Clang 16 and
-# tests fail. Removal on 2022-11-22. Bug #741200, #875686.
-sci-calculators/grpn
-
-# Hans de Graaff <graaff@gentoo.org> (2022-10-22)
-# Last release upstream 10 years ago. No longer compiles with latest
-# clang (bug #875254) and doubtful that this actually works with recent
-# ruby versions.
-# Masked for removal in 30 days.
-dev-ruby/ruby-sdl
-
-# Michał Górny <mgorny@gentoo.org> (2022-10-21)
-# Barely maintained upstream.  Still lacking support for Python 3.10.
-# All revdeps in Gentoo were pure test deps, and only optional
-# (because they would otherwise block Python 3.10).
-# Removal on 2022-11-20.  Bug #845723.
-dev-python/eventlet
-
-# 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.
-dev-python/case
-
-# Michał Górny <mgorny@gentoo.org> (2022-10-17)
-# dev-python/nose plugin.  No revdeps left.
-# Removal on 2022-11-16.  Bug #877369.
-dev-python/nose_warnings_filters
-
 # John Helmert III <ajak@gentoo.org> (2022-10-16)
 # <OpenSSL-1.1.1 are EOL and contain known vulnerabilities. Users should
 # migrate to a newer branch.
@@ -409,45 +473,6 @@ dev-python/nose_warnings_filters
 =dev-libs/openssl-1.1.1r
 =dev-libs/openssl-3.0.6
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-10-10)
-# Unused Java library. Removal on 2022-11-10.
-dev-java/objenesis-test
-
-# Michał Górny <mgorny@gentoo.org> (2022-10-08)
-# Repository and SRC_URI gone.  Last release in 2012 (guessing
-# by filename).
-# Removal on 2022-11-07.  Bug #876151.
-xfce-extra/transd
-
-# Michał Górny <mgorny@gentoo.org> (2022-10-08)
-# This package is not really required for anything, as it being missing
-# only disables enforcing install_requires.  At the same time, it being
-# installed causes unexpected verbose output that randomly breaks more
-# susceptible test suites (e.g. dev-python/pythran).
-# Removal on 2022-11-07.  Bug #876082.
-dev-python/setuptools-declarative-requirements
-
-# Michał Górny <mgorny@gentoo.org> (2022-10-08)
-# The test suite is broken since at least March.  No revdeps.
-# Removal on 2022-11-07.  Bug #834656.
-dev-python/kazoo
-
-# 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
-# in the async code which is non-trivial to port to modern compilers.
-# bug #731070, bug #802108, bug #875164.
-# Use media-sound/mpd if looking for a modern alternative. Removal on 2022-11-07.
-media-sound/rplay
-
-# 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.
-# No revdeps left in ::gentoo.
-# Removal on 2022-11-04.  Bug #875350.
-dev-cpp/jarowinkler-cpp
-dev-python/jarowinkler
-
 # Sam James <sam@gentoo.org> (2022-10-04)
 # Regression for some Intel LCDs which may cause physical damage
 # Please upgrade to 5.19.13 if affected!
@@ -483,11 +508,6 @@ virtual/httpd-php:8.2
 # and accept a more unstable release.
 >=www-client/chromium-108
 
-# Sam James <sam@gentoo.org> (2022-09-26)
-# Masked for testing. Please report bugs!
-=app-shells/bash-5.2*
-=sys-libs/readline-8.2*
-
 # John Helmert III <ajak@gentoo.org> (2022-09-18)
 # Unfixed root privilege escalation, bug #631552
 sys-cluster/slurm
@@ -671,64 +691,6 @@ media-libs/webrtc-audio-processing:1
 # old de-ANSI-fication/ansi2knr/AM_C_PROTOTYPES code. Please uninstall.
 sys-devel/automake:1.11
 
-# Mart Raudsepp <leio@gentoo.org> (2021-09-15)
-# New major parallel-installable release which needs special care to not
-# end up loaded into the same process together with the earlier libsoup ABI.
-# Migration to it is expected for GNOME 42, NOT to be unmasked with GNOME 41.
->=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
->=app-text/libgepub-0.7.0
->=dev-libs/gjs-1.74
->=dev-libs/libgweather-4.2.0
->=dev-python/nautilus-python-4.0
->=dev-util/devhelp-43
->=dev-util/gnome-builder-43
->=gnome-base/gnome-applets-3.46
->=gnome-base/gnome-desktop-43
->=gnome-base/gnome-flashback-3.46
->=gnome-base/gnome-panel-3.46
->=gnome-base/gnome-settings-daemon-43
->=gnome-base/gnome-shell-43
->=gnome-base/nautilus-43
->=gnome-extra/evolution-data-server-3.46
->=gnome-extra/evolution-ews-3.46
->=gnome-extra/gnome-boxes-43
->=gnome-extra/gnome-calculator-43
->=gnome-extra/gnome-calendar-43
->=gnome-extra/gnome-clocks-43
->=gnome-extra/gnome-shell-extensions-43
->=gnome-extra/gnome-shell-frippery-43
->=gnome-extra/gnome-software-43
->=gnome-extra/sushi-43
->=mail-client/balsa-2.6.4
->=mail-client/evolution-3.46
->=mail-client/geary-43
->=media-gfx/gnome-photos-43
->=net-irc/polari-43
-net-libs/dleyna
->=net-libs/gnome-online-accounts-3.46
->=net-libs/gssdp-1.6
->=net-libs/gupnp-1.6
-net-libs/phodav:3.0
-net-libs/uhttpmock:1.0
-net-libs/webkit-gtk:4.1
-net-libs/webkit-gtk:5
->=net-misc/gupnp-tools-0.12
->=net-misc/rygel-0.42
->=net-misc/spice-gtk-0.41-r1
-sci-geosciences/geocode-glib:2
->=sci-geosciences/geocode-glib-3.26.4-r1:0
->=sci-geosciences/gnome-maps-43
->=sys-apps/osinfo-db-tools-1.10.0-r1
->=sys-libs/libosinfo-1.10.0-r1
->=www-client/epiphany-43
->=x11-wm/mutter-43
-
 # Thomas Deutschmann <whissi@gentoo.org> (2021-09-07)
 # Masked while being tested and reverse deps aren't fully compatible
 # bug #797325.
diff --git a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
index 725a7432dd..654ae9ec86 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
+++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc
@@ -48,24 +48,13 @@ amd64		default/linux/amd64/17.1/systemd/merged-usr			stable
 amd64		default/linux/amd64/17.1/systemd/selinux			exp
 amd64		default/linux/amd64/17.1/clang					exp
 amd64		default/linux/amd64/17.1/systemd/clang				exp
+amd64		default/linux/amd64/17.1/systemd/clang/merged-usr		exp
 
 # AMD64 Profiles
 # @MAINTAINER: amd64@gentoo.org
-amd64		default/linux/amd64/17.0				dev
-amd64		default/linux/amd64/17.0/selinux			exp
-amd64		default/linux/amd64/17.0/hardened			exp
-amd64		default/linux/amd64/17.0/hardened/selinux		exp
-amd64		default/linux/amd64/17.0/desktop			exp
-amd64		default/linux/amd64/17.0/desktop/gnome			dev
-amd64		default/linux/amd64/17.0/desktop/gnome/systemd		exp
-amd64		default/linux/amd64/17.0/desktop/plasma			dev
-amd64		default/linux/amd64/17.0/desktop/plasma/systemd		exp
-amd64		default/linux/amd64/17.0/developer			exp
-amd64		default/linux/amd64/17.0/no-multilib			exp
-amd64		default/linux/amd64/17.0/no-multilib/hardened		exp
-amd64		default/linux/amd64/17.0/no-multilib/hardened/selinux	exp
-amd64		default/linux/amd64/17.0/systemd			dev
 amd64		default/linux/amd64/17.0/x32				dev
+amd64		default/linux/amd64/17.0/x32/systemd			exp
+amd64		default/linux/amd64/17.0/x32/systemd/merged-usr		exp
 
 # ARM Profiles
 # @MAINTAINER: arm@gentoo.org
@@ -142,6 +131,7 @@ arm64		default/linux/arm64/17.0/systemd/merged-usr			stable
 arm64		default/linux/arm64/17.0/systemd/selinux			exp
 arm64		default/linux/arm64/17.0/llvm					exp
 arm64		default/linux/arm64/17.0/systemd/llvm				exp
+arm64		default/linux/arm64/17.0/systemd/llvm/merged-usr		exp
 
 
 # ARM64 Profiles (big-endian)
@@ -188,18 +178,32 @@ m68k		default/linux/m68k/17.0/systemd/merged-usr		exp
 # MIPS Profiles
 # @MAINTAINER: mips@gentoo.org
 mips		default/linux/mips/17.0/o32					exp
+mips		default/linux/mips/17.0/o32/systemd				exp
+mips		default/linux/mips/17.0/o32/systemd/merged-usr			exp
 mips		default/linux/mips/17.0/n32					exp
+mips		default/linux/mips/17.0/n32/systemd				exp
+mips		default/linux/mips/17.0/n32/systemd/merged-usr			exp
 mips		default/linux/mips/17.0/n64					exp
+mips		default/linux/mips/17.0/n64/systemd				exp
+mips		default/linux/mips/17.0/n64/systemd/merged-usr			exp
 mips		default/linux/mips/17.0/multilib/o32				exp
 mips		default/linux/mips/17.0/multilib/n32				exp
+mips		default/linux/mips/17.0/multilib/n32/systemd			exp
+mips		default/linux/mips/17.0/multilib/n32/systemd/merged-usr		exp
 mips		default/linux/mips/17.0/multilib/n64				exp
 mips		default/linux/mips/17.0/mipsel/o32				exp
+mips		default/linux/mips/17.0/mipsel/o32/systemd			exp
+mips		default/linux/mips/17.0/mipsel/o32/systemd/merged-usr		exp
 mips		default/linux/mips/17.0/mipsel/n32				exp
+mips		default/linux/mips/17.0/mipsel/n32/systemd			exp
+mips		default/linux/mips/17.0/mipsel/n32/systemd/merged-usr		exp
 mips		default/linux/mips/17.0/mipsel/n64				exp
 mips		default/linux/mips/17.0/mipsel/n64/systemd			exp
 mips		default/linux/mips/17.0/mipsel/n64/systemd/merged-usr		exp
 mips		default/linux/mips/17.0/mipsel/multilib/o32			exp
 mips		default/linux/mips/17.0/mipsel/multilib/n32			exp
+mips		default/linux/mips/17.0/mipsel/multilib/n32/systemd		exp
+mips		default/linux/mips/17.0/mipsel/multilib/n32/systemd/merged-usr	exp
 mips		default/linux/mips/17.0/mipsel/multilib/n64			exp
 mips		default/linux/mips/17.0/mipsel/multilib/n64/systemd		exp
 mips		default/linux/mips/17.0/mipsel/multilib/n64/systemd/merged-usr	exp
diff --git 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
index b6e766a348..7cd1e30dc0 100644
--- 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
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This just makes sense nowadays, if only for distfiles...
-USE="xz zstd"
+USE="lzma zstd"
 
 # bug 831045
 USE="${USE} -cli"
diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022
index d48c1039d5..5bb9711a24 100644
--- a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022
+++ b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022
@@ -8,3 +8,5 @@ move dev-python/zeroconf dev-python/python-zeroconf
 move dev-python/zstandard dev-python/python-zstandard
 move dev-python/retworkx dev-python/rustworkx
 move dev-python/libsass dev-python/libsass-python
+move dev-lang/open-cobol dev-lang/gnucobol
+move dev-python/miniupnpc dev-python/python-miniupnpc
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild
index b3df473d9d..936757448f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild
@@ -1,20 +1,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 MY_P="autotools-wrappers-at-${PV}"
 
-DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
+DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions"
 HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
-SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
-#SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI=" https://anongit.gentoo.org/git/proj/autotools-wrappers.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
+	#SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-S="${WORKDIR}/${MY_P}"
 
 src_install() {
 	exeinto /usr/$(get_libdir)/misc
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
new file mode 100644
index 0000000000..00ae376153
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="autotools-wrappers-at-${PV}"
+
+DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions"
+HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/autotools-wrappers.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
+	#SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_install() {
+	exeinto /usr/$(get_libdir)/misc
+	doexe ac-wrapper.sh
+
+	dodir /usr/bin
+
+	local x=
+	for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
+		dosym -r /usr/$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x}
+	done
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml
index 73dda144f9..1f8aa323a0 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gentoo">proj/autotools-wrappers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild
index 3593b3e302..055d828676 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild
index 091517d7d6..3730430ac8 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild
@@ -10,7 +10,7 @@ else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
 		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild
index 3ecf3ddc59..7749d47f43 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild
@@ -16,7 +16,7 @@ else
 	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
 
 	if ! [[ ${PV} == *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 	S="${WORKDIR}"/${MY_P}
 fi
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild
new file mode 100644
index 0000000000..ecb9a1b053
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrapper for automake to manage multiple automake versions"
+HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/autotools-wrappers.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz"
+
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S="${WORKDIR}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
+	if use prefix ; then
+		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' am-wrapper-${PV}.sh || die
+	fi
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/misc
+	doexe am-wrapper.sh
+
+	local x=
+	for x in automake aclocal ; do
+		dosym -r /usr/$(get_libdir)/misc/am-wrapper.sh /usr/bin/${x}
+	done
+
+	keepdir /usr/share/aclocal
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml
index 73dda144f9..1f8aa323a0 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gentoo">proj/autotools-wrappers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest
index fc2bee6336..f6ac329d9a 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest
@@ -1,6 +1,7 @@
 DIST gcc-10-20221006.tar.xz 71755692 BLAKE2B 0099821e5fcd5e1a069369a72f105607cb7f20fbef3d627a598d8c7a6439491e050533d6577b4f7953aabb52daf926ffc8eb9cecd8853833a14c90bd878e1ad9 SHA512 3fc1dceff31ec8a84babe31d88a312d9d3d30450ff0c42730b9a9fe45c0fc9509216fb95cd84df7477faebe2b9b7d8f7e269c9e76cecc05417dc6192e3b96c67
 DIST gcc-10-20221110.tar.xz 71760032 BLAKE2B 75f0f18c83021fb9ce5ed2501cefcda53463ee2256b6e594412020e8a27880f562880c5ae1e65a68b3da19e04de723fbaf8beee2fbbd5871eae5f4e05404b8de SHA512 3b836c26e4cf6896db3bd41d2140ac7b790fb9cd83a379dee832e4b38f92b56b88476bb86dbbece1bc3e2b348a912cbcaed0379f35994554a57689fb9b71f5d0
 DIST gcc-10-20221117.tar.xz 71762756 BLAKE2B d6b1d87d3b09dfe479f2fe21225d94f9f2aa310dba22b4f7f41a212e6d88378765dc2c244cf953394e5eabbd7e17f3d205b9933f7546023a875822120a2fbd83 SHA512 85ceff6524eb4f21e192a8213a75b127b911e01bfd4c9f1f7d1d6c8a6409608bccc009278152060213341b1c114f2330d54ad7b1d9bb7ed9213c1369ae434cef
+DIST gcc-10-20221124.tar.xz 71781080 BLAKE2B ec7f4f140102d25a7469f7931df7b87b4b91c1c94fc263ecd9cc9aca36d120e9f5e09776efefba1099abe5282eb1cc4ec8201bcdca3a13c7b1bbdd6b34ad994d SHA512 b7af71bb2dd594643393b3e4dea4e641dcfad6e5249b6ee05617f0648ef2609b707b18f12f3985b3d13cbee6af0f799d7377c28092420b251b34e93f910e686e
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
@@ -10,6 +11,7 @@ DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5
 DIST gcc-11-20221007.tar.xz 75790520 BLAKE2B de52f7fc5c7f5f82d9cbaeaa13b216e149a4aac8162188c628007c17ddb40aa838d19f2ca18216e8bfe5df2d21438f10c8e87298b53cbde4359f72c9cff87589 SHA512 b785236a00647041c9ea4552e5ea82a09e23a801b029773ba77bfc03675c530369ad0b5fc279330f3d8dd4b9b40aeaa9de84a39b6397f73984b7e2fdf8f0bad2
 DIST gcc-11-20221111.tar.xz 75802080 BLAKE2B 7e49eefb17f3905b587d6de489820dd6aa6a8315b665872a5acad9a35b5431ab459bad426acafad5e0f9634b1bcd39db05726662f7577d0f4fcd49e2944df455 SHA512 bd9fad5e8ca94b5e1c3855141418c5067d27cb9bfde624c0a0c32131f837507e5c896238636d9ac4b0447eb368d80522d1dc1a2ea6f7b2f8259c729b61a4e879
 DIST gcc-11-20221118.tar.xz 75811664 BLAKE2B 97cdbbe114a46f149c89da8190ccb7c98bf8888540459ac50432dd461178d36a5f203bb89a1205fb89a5a8d80c3518b6b05b882f0c29cd1a88e3ca3a6d1a59d2 SHA512 6634ae0929c41541696684dd2809f7fd6cb3428aecb32e149b9ed26aff487c8f3ec089865ccb015281dd814f064875282cb360963bdd90b2eff0db27897602a7
+DIST gcc-11-20221125.tar.xz 76248264 BLAKE2B c2fe15a14c77ce36f117d8d3bb78d38684e237db16db249134dd1e24d1455dfe7ca544fe22155b2c368dc6658b96d626af87d47478aaf94c216eb84b469e43e9 SHA512 3efbd7dc4cbf748d41369bff5bedb586a1c9397fa7fa56be7869e62bd567273b056aeec01a4191783bad737640e163489f1b368fcaac3155ae3ac8f7b33f478d
 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
@@ -25,7 +27,6 @@ DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfb
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST gcc-13-20221030.tar.xz 80108908 BLAKE2B 53ea6d13e5cf747d6dae515db5c07ba53580218dc0e5c4ce9dad48ce8ab968bc0fc51309169d991ad701beab3cf1bc2c15438d38f69dd642edf6d1f186e381cf SHA512 036034a1fa7883f9f9c224a3b4cf0a8e369d06882bff17c40a38a275f14928f546686b093b50e6c01664b90ee81addf24b4a513bf072a72e0f59f7f890ff1cca
 DIST gcc-13-20221106.tar.xz 80001320 BLAKE2B 4a86b5aedf67725b577a69112ab241b22b3b0eed6c86e2d9ed06e5045a1de1c4bc6f2e7a281f1a034b9b227e5ef72954d17900369bed6015e064f303c89e6cf2 SHA512 bd3160d23bdebd0e423800736212e340eab0a71891d579145d85931fe8fa3c9e196a3422d70a98e17d1990759bf57b3e4eb08b25544db5e4fec8448d1a33ee20
-DIST gcc-13-20221113.tar.xz 79983288 BLAKE2B 85f4c47067b3e9a02804b75e8d5031c8a1fd3ebd815d864ed226f3aebc9499928cf7683e2d0aac273f4f9f17fda6084bac4bb8e1fc193441c87c1382450a0a8b SHA512 cf13f619ee586a7964a6e3e40d64fadd7c5f2b468b403dcf01a05687e60307175bc116277b64363bf799d3dfe53f37de6b129bd871238a6d600d035bd0d18a2d
 DIST gcc-13-20221120.tar.xz 80199576 BLAKE2B 7f7f19feabfcc57684141c540d4a95f6cff96d2f68824cdf9b1e8351058740d999a3865f5b5ad893bb34f59399980416a772e94fddbca813f12ec4339e0b9871 SHA512 5e4fce946a2c815e41e28120eb0fb8f1f6003f6c1ec9000baae2143f343bacb3aeb3b9034ccb67b18bd519ef98953305de7d643e1b25c4908de635491fae48d9
 DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B 82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e SHA512 e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921
 DIST gcc-13.1.0-patches-2.tar.xz 9924 BLAKE2B 568f8b9e31974f4991bd922436373320118a6fe07b7e9fe0127952894bdebc5e8684f66e645a3a5684717c687e9bb6074508972b61a3eb692c6e5f23e46359cf SHA512 9fed795ce3aa423e223864b750e50419343bbb36f53e938a691f189e954acb3a4efec4aafe466bafb3556a04c78bf68d19e3e60ffd0a2be490ea821d98e92dc9
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221124.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221124.ebuild
new file mode 100644
index 0000000000..1fa3a36015
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221124.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="1"
+MUSL_VER="1"
+MUSL_GCC_VER="10.5.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221113.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221125.ebuild
similarity index 72%
rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221113.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221125.ebuild
index f432668836..d6ead8b3a5 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221113.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221125.ebuild
@@ -3,32 +3,32 @@
 
 EAPI=8
 
+TOOLCHAIN_PATCH_SUFFIX="xz"
 TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_SPHINX_BUILD=1
-PATCH_GCC_VER="13.1.0"
-MUSL_GCC_VER="13.1.0"
+PATCH_VER="3"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="0"
+MUSL_GCC_VER="11.4.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
-	MY_PV_3=$(($(ver_cut 3) - 9998))
 	if [[ ${MY_PV_2} == 0 ]] ; then
 		MY_PV_2=0
-		MY_PV_3=0
 	else
 		MY_PV_2=$(($(ver_cut 2) - 1))
 	fi
 
 	# e.g. 12.2.9999 -> 12.1.1
-	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
 fi
 
 inherit toolchain
 # Needs to be after inherit (for now?), bug #830908
-EGIT_BRANCH=master
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
 #if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 #fi
 
 # Technically only if USE=hardened *too* right now, but no point in complicating it further.
@@ -36,7 +36,7 @@ EGIT_BRANCH=master
 # bug #830454
 RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
 DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 
 src_prepare() {
 	local p upstreamed_patches=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild
index f432668836..9823b3d1be 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_SPHINX_BUILD=1
 PATCH_GCC_VER="13.1.0"
 MUSL_GCC_VER="13.1.0"
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild
index e56429d0b6..d4ff1e51aa 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *_rc* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
 # so put that license behind USE=cxx.
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20221007.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20221007.ebuild
index 712d8c0126..135754812a 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20221007.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20221007.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 99999999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
index 9edc596d11..6fa03671b7 100644
--- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest
index 6f127872cd..53fdd7466a 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest
@@ -1,6 +1,4 @@
 DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
-DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B 76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67 SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
-DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c SHA512 5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153
 DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8 SHA512 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
 DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B 29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274 SHA512 ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621
 DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-CRC-buggy-input.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-CRC-buggy-input.patch
deleted file mode 100644
index 083634929b..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-CRC-buggy-input.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2
-https://github.com/madler/zlib/issues/613
-https://bugs.gentoo.org/836370
-
-From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Wed, 30 Mar 2022 11:14:53 -0700
-Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
-
-The previous releases of zlib were not sensitive to incorrect CRC
-inputs with bits set above the low 32. This commit restores that
-behavior, so that applications with such bugs will continue to
-operate as before.
---- a/crc32.c
-+++ b/crc32.c
-@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
- #endif /* DYNAMIC_CRC_TABLE */
- 
-     /* Pre-condition the CRC */
--    crc ^= 0xffffffff;
-+    crc = (~crc) & 0xffffffff;
- 
-     /* Compute the CRC up to a word boundary. */
-     while (len && ((z_size_t)buf & 7) != 0) {
-@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
- #endif /* DYNAMIC_CRC_TABLE */
- 
-     /* Pre-condition the CRC */
--    crc ^= 0xffffffff;
-+    crc = (~crc) & 0xffffffff;
- 
- #ifdef W
- 
-@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
- #ifdef DYNAMIC_CRC_TABLE
-     once(&made, make_crc_table);
- #endif /* DYNAMIC_CRC_TABLE */
--    return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
-+    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
- }
- 
- /* ========================================================================= */
-@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
-     uLong crc2;
-     uLong op;
- {
--    return multmodp(op, crc1) ^ crc2;
-+    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
- }
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-CVE-2022-37434.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-CVE-2022-37434.patch
deleted file mode 100644
index 1ef3b909e4..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-CVE-2022-37434.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://bugs.gentoo.org/863851
-https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1
-https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d (see https://github.com/curl/curl/issues/9271)
-
-From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001
-From: Mark Adler <fork@madler.net>
-Date: Sat, 30 Jul 2022 15:51:11 -0700
-Subject: [PATCH] Fix a bug when getting a gzip header extra field with
- inflate().
-
-If the extra field was larger than the space the user provided with
-inflateGetHeader(), and if multiple calls of inflate() delivered
-the extra header data, then there could be a buffer overflow of the
-provided space. This commit assures that provided space is not
-exceeded.
---- a/inflate.c
-+++ b/inflate.c
-@@ -763,9 +763,10 @@ int flush;
-                 copy = state->length;
-                 if (copy > have) copy = have;
-                 if (copy) {
-+                    len = state->head->extra_len - state->length;
-                     if (state->head != Z_NULL &&
--                        state->head->extra != Z_NULL) {
--                        len = state->head->extra_len - state->length;
-+                        state->head->extra != Z_NULL &&
-+                        len < state->head->extra_max) {
-                         zmemcpy(state->head->extra + len, next,
-                                 len + copy > state->head->extra_max ?
-                                 state->head->extra_max - len : copy);
-
-From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
-From: Mark Adler <fork@madler.net>
-Date: Mon, 8 Aug 2022 10:50:09 -0700
-Subject: [PATCH] Fix extra field processing bug that dereferences NULL
- state->head.
-
-The recent commit to fix a gzip header extra field processing bug
-introduced the new bug fixed here.
---- a/inflate.c
-+++ b/inflate.c
-@@ -763,10 +763,10 @@ int flush;
-                 copy = state->length;
-                 if (copy > have) copy = have;
-                 if (copy) {
--                    len = state->head->extra_len - state->length;
-                     if (state->head != Z_NULL &&
-                         state->head->extra != Z_NULL &&
--                        len < state->head->extra_max) {
-+                        (len = state->head->extra_len - state->length) <
-+                            state->head->extra_max) {
-                         zmemcpy(state->head->extra + len, next,
-                                 len + copy > state->head->extra_max ?
-                                 state->head->extra_max - len : copy);
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch
deleted file mode 100644
index 7fb13325b1..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-fix-CC-logic-in-configure.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/madler/zlib/pull/607
-
-From 80d086357a55b94a13e43756cf3e131f25eef0e4 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 28 Mar 2022 08:40:45 +0100
-Subject: [PATCH] Fix CC logic in configure
-
-In https://github.com/madler/zlib/commit/e9a52aa129efe3834383e415580716a7c4027f8d,
-the logic was changed to try check harder for GCC, but it dropped
-the default setting of cc=${CC}. It was throwing away any pre-set CC value as
-a result.
-
-The rest of the script then cascades down a bad path because it's convinced
-it's not GCC or a GCC-like compiler.
-
-This led to e.g. misdetection of inability to build shared libs
-for say, multilib cases (w/ CC being one thing from the environment being used
-for one test (e.g. x86_64-unknown-linux-gnu-gcc -m32 and then 'cc' used for
-shared libs (but missing "-m32"!)). Obviously just one example of how
-the old logic could break.
-
-This restores the old default of 'CC' if nothing overrides it later
-in configure.
-
-Bug: https://bugs.gentoo.org/836308
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure b/configure
-index 52ff4a04e..3fa3e8618 100755
---- a/configure
-+++ b/configure
-@@ -174,7 +174,10 @@ if test -z "$CC"; then
-   else
-     cc=${CROSS_PREFIX}cc
-   fi
-+else
-+  cc=${CC}
- fi
-+
- cflags=${CFLAGS-"-O3"}
- # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
- case "$cc" in
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-use-LDFLAGS-in-configure.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-use-LDFLAGS-in-configure.patch
deleted file mode 100644
index 752a473eac..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.12-use-LDFLAGS-in-configure.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/madler/zlib/pull/599
-
-From 37c9730ba474d274f4cc6a974943eef95087b9f6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 8 Mar 2022 22:38:47 -0800
-Subject: [PATCH] configure: Pass LDFLAGS to link tests
-
-LDFLAGS can contain critical flags without which linking wont succeed
-therefore ensure that all configure tests involving link time checks are
-using LDFLAGS on compiler commandline along with CFLAGS to ensure the
-tests perform correctly. Without this some tests may fail resulting in
-wrong confgure result, ending in miscompiling the package
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/configure
-+++ b/configure
-@@ -410,7 +410,7 @@ if test $shared -eq 1; then
-   echo Checking for shared library support... | tee -a configure.log
-   # we must test in two steps (cc then ld), required at least on SunOS 4.x
-   if try $CC -w -c $SFLAGS $test.c &&
--     try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
-+     try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then
-     echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
-   elif test -z "$old_cc" -a -z "$old_cflags"; then
-     echo No shared library support. | tee -a configure.log
-@@ -492,7 +492,7 @@ int main(void) {
- }
- EOF
-   fi
--  if try $CC $CFLAGS -o $test $test.c; then
-+  if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
-     sizet=`./$test`
-     echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log
-   else
-@@ -530,7 +530,7 @@ int main(void) {
-   return 0;
- }
- EOF
--  if try $CC $CFLAGS -o $test $test.c; then
-+  if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
-     echo "Checking for fseeko... Yes." | tee -a configure.log
-   else
-     CFLAGS="${CFLAGS} -DNO_FSEEKO"
-@@ -547,7 +547,7 @@ cat > $test.c <<EOF
- #include <errno.h>
- int main() { return strlen(strerror(errno)); }
- EOF
--if try $CC $CFLAGS -o $test $test.c; then
-+if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
-   echo "Checking for strerror... Yes." | tee -a configure.log
- else
-   CFLAGS="${CFLAGS} -DNO_STRERROR"
-@@ -654,7 +654,7 @@ int main()
-   return (mytest("Hello%d\n", 1));
- }
- EOF
--  if try $CC $CFLAGS -o $test $test.c; then
-+  if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
-     echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log
- 
-     echo >> configure.log
-@@ -744,7 +744,7 @@ int main()
- }
- EOF
- 
--  if try $CC $CFLAGS -o $test $test.c; then
-+  if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then
-     echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log
- 
-     echo >> configure.log
-
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
new file mode 100644
index 0000000000..48d58acaaf
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
@@ -0,0 +1,56 @@
+From 2ad2713e6cb9166dcede9a020f6913b8189ff0c6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 23 Nov 2022 04:17:16 +0000
+Subject: [PATCH] Revert "Turn off RWX segment warnings on sparc systems."
+
+This breaks building on sparc with older binutils.
+
+This reverts commit 29fd715fd0bdaffee21e2d2d37be8c5a6ac67ee4.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -22,7 +22,7 @@ CFLAGS=-O
+ 
+ SFLAGS=-O
+ LDFLAGS=
+-TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
++TEST_LDFLAGS=-L. libz.a
+ LDSHARED=$(CC)
+ CPP=$(CC) -E
+ 
+@@ -288,10 +288,10 @@ minigzip$(EXE): minigzip.o $(STATICLIB)
+ 	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
+ 
+ examplesh$(EXE): example.o $(SHAREDLIBV)
+-	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
++	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
+ 
+ minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
+-	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
++	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
+ 
+ example64$(EXE): example64.o $(STATICLIB)
+ 	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
+--- a/configure
++++ b/configure
+@@ -33,10 +33,7 @@ fi
+ # set command prefix for cross-compilation
+ if [ -n "${CHOST}" ]; then
+     uname=${CHOST}
+-    mname=${CHOST}
+     CROSS_PREFIX="${CHOST}-"
+-else
+-    mname=`(uname -a || echo unknown) 2>/dev/null`
+ fi
+ 
+ # destination name for static library
+@@ -223,10 +220,6 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
+   fi
+   case "$uname" in
+   Linux* | linux* | *-linux* | GNU | GNU/* | solaris*)
+-        case "$mname" in
+-        *sparc*)
+-            LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;;
+-        esac
+         LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
+   *BSD | *bsd* | DragonFly)
+         LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.12-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.12-r3.ebuild
deleted file mode 100644
index a520842c5f..0000000000
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.12-r3.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Worth keeping an eye on 'develop' branch upstream for possible backports.
-AUTOTOOLS_AUTO_DEPEND="no"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
-inherit autotools multilib-minimal usr-ldscript verify-sig
-
-CYGWINPATCHES=(
-	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
-	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch"
-)
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/"
-SRC_URI="https://zlib.net/${P}.tar.gz
-	https://zlib.net/fossils/${P}.tar.gz
-	https://www.gzip.org/zlib/${P}.tar.gz
-	https://www.zlib.net/current/beta/${P}.tar.gz
-	verify-sig? ( https://zlib.net/${P}.tar.gz.asc )
-	elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-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"
-IUSE="minizip static-libs"
-
-RDEPEND="!sys-libs/zlib-ng[compat]"
-DEPEND="${RDEPEND}"
-BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )
-	verify-sig? ( sec-keys/openpgp-keys-madler )"
-
-PATCHES=(
-	# Don't install unexpected & unused crypt.h header (which would clash with other pkgs)
-	# Pending upstream. bug #658536
-	"${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
-
-	# Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
-	"${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
-
-	# Respect LDFLAGS during configure tests. Pending upstream
-	"${FILESDIR}"/${PN}-1.2.12-use-LDFLAGS-in-configure.patch
-
-	# Fix broken CC logic
-	"${FILESDIR}"/${P}-fix-CC-logic-in-configure.patch
-
-	# Backport for Java (and others), bug #836370
-	"${FILESDIR}"/${P}-CRC-buggy-input.patch
-
-	# bug #863851
-	"${FILESDIR}"/${P}-CVE-2022-37434.patch
-)
-
-src_prepare() {
-	default
-
-	if use elibc_Cygwin ; then
-		local p
-		for p in "${CYGWINPATCHES[@]}" ; do
-			# Strip out the "... -> " from the array
-			eapply -p2 "${DISTDIR}/${p#*> }"
-		done
-	fi
-
-	if use minizip ; then
-		cd contrib/minizip || die
-		eautoreconf
-	fi
-
-	case ${CHOST} in
-		*-cygwin*)
-			# Do not use _wopen, it's a mingw-only symbol
-			sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
-
-			# zlib1.dll is the mingw name, need cygz.dll
-			# cygz.dll is loaded by toolchain, put into subdir
-			sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
-
-			;;
-	esac
-
-	case ${CHOST} in
-		*-mingw*|mingw*|*-cygwin*)
-			# Uses preconfigured Makefile rather than configure script
-			multilib_copy_sources
-
-			;;
-	esac
-}
-
-echoit() { echo "$@"; "$@"; }
-
-multilib_src_configure() {
-	case ${CHOST} in
-		*-mingw*|mingw*|*-cygwin*)
-			;;
-
-		*)
-			# bug #347167
-			local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3)
-
-			local myconf=(
-				--shared
-				--prefix="${EPREFIX}/usr"
-				--libdir="${EPREFIX}/usr/$(get_libdir)"
-				${uname:+--uname=${uname}}
-			)
-
-			# Not an autoconf script, so can't use econf
-			echoit "${S}"/configure "${myconf[@]}" || die
-
-			;;
-	esac
-
-	if use minizip ; then
-		local minizipdir="contrib/minizip"
-		mkdir -p "${BUILD_DIR}/${minizipdir}" || die
-
-		cd ${minizipdir} || die
-		ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static)
-	fi
-}
-
-multilib_src_compile() {
-	case ${CHOST} in
-		*-mingw*|mingw*|*-cygwin*)
-			emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
-			sed \
-				-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
-				-e 's|@exec_prefix@|${prefix}|g' \
-				-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
-				-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
-				-e 's|@includedir@|${prefix}/include|g' \
-				-e 's|@VERSION@|'${PV}'|g' \
-				zlib.pc.in > zlib.pc || die
-			;;
-
-		*)
-			emake
-
-			;;
-	esac
-
-	use minizip && emake -C contrib/minizip
-}
-
-sed_macros() {
-	# Clean up namespace a little, bug #383179
-	# We do it here so we only have to tweak 2 files
-	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
-}
-
-multilib_src_install() {
-	case ${CHOST} in
-		*-mingw*|mingw*|*-cygwin*)
-			emake -f win32/Makefile.gcc install \
-				BINARY_PATH="${ED}/usr/bin" \
-				LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
-				INCLUDE_PATH="${ED}/usr/include" \
-				SHARED_MODE=1
-
-			# Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins zlib.pc
-
-			;;
-
-		*)
-			emake install DESTDIR="${D}" LDCONFIG=:
-			gen_usr_ldscript -a z
-
-			;;
-	esac
-
-	sed_macros "${ED}"/usr/include/*.h
-
-	if use minizip ; then
-		emake -C contrib/minizip install DESTDIR="${D}"
-		sed_macros "${ED}"/usr/include/minizip/*.h
-	fi
-
-	if use minizip; then
-		# This might not exist if slibtool is used.
-		# bug #816756
-		rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
-	fi
-
-	if ! use static-libs ; then
-		# bug #419645
-		rm "${ED}"/usr/$(get_libdir)/libz.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc FAQ README ChangeLog doc/*.txt
-	use minizip && dodoc contrib/minizip/*.txt
-}
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild
index 60ae606dde..50b767a0ef 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Worth keeping an eye on 'develop' branch upstream for possible backports.
 AUTOTOOLS_AUTO_DEPEND="no"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
-inherit autotools multilib-minimal usr-ldscript verify-sig
+inherit autotools multilib-minimal flag-o-matic usr-ldscript verify-sig
 
 CYGWINPATCHES=(
 	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
@@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-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"
 IUSE="minizip static-libs"
 
 RDEPEND="!sys-libs/zlib-ng[compat]"
@@ -43,6 +43,9 @@ PATCHES=(
 
 	# Respect LDFLAGS during configure tests. Pending upstream
 	"${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch
+
+	# Fix building on sparc with older binutils, we pass it in ebuild instead
+	"${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch
 )
 
 src_prepare() {
@@ -85,6 +88,10 @@ src_prepare() {
 echoit() { echo "$@"; "$@"; }
 
 multilib_src_configure() {
+	# We pass manually instead of relying on the configure script/makefile
+	# because it would pass it even for older binutils.
+	use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments)
+
 	case ${CHOST} in
 		*-mingw*|mingw*|*-cygwin*)
 			;;