diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/Manifest
index e4247371eb..83bac227ea 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/Manifest
@@ -1,7 +1,3 @@
-DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
-DIST pyparsing_3.0.0.tar.gz 935578 BLAKE2B 2932fb8da83f4f7b0ba98057002c870ab54f50bb93cea3f1da1cb9bba87fd8a6066c7bbee700667663285226ad6bf637f340160ccf7b7b06616e1140a7b93ce3 SHA512 1400370a6e7518940b7965645578028588af5a4ec1c379d57c924f036c86e342a9a60f1dd5c700ce8a4dbcd16afb55a2a4c371548c8bac6c53338b5cc349f4d8
-DIST pyparsing_3.0.1.tar.gz 936219 BLAKE2B cc7dc4670f37a09e98c8bda785bac4121150f1a48438cc42c6fbf0546531e7fc674f2bfe1c85aba66ac1075b9c086d9ee30672a3eebc60efec21fd51772f577f SHA512 70f2f957c713a88979ae95de8834a79c777196a2a6d47a25bf930cdefdc3120919147a33119ada0d33c53bb215fcddfa969b0d1630d2979c9e685d85e5c57414
-DIST pyparsing_3.0.3.tar.gz 938435 BLAKE2B 5237244693759ffc19637b4d8ee52f98b7160160c1f422a1720b9a8848025f37cb8b314aae505acb7696cc1546c495d049a6a93b3824d784b89aee3565001a4a SHA512 19735a3125620716a0a843156e6e9285c7811aa4db876fdc9fed7413dff77c0670fea5a0a16bc074704c6fec45f0129d1a3680b2123abf3c414fa75d73e03d36
-DIST pyparsing_3.0.4.tar.gz 939837 BLAKE2B 27130518d1f3a4e497ecd4fa1fc624516bcb62488baf881ae3c8888bca48c957a4c6f0bf8d29aeeca8b1aa907c04ca41f3a61e876b78f1ea50684e24b12a2422 SHA512 01acf9b7663feae57e82ac3139c35687ea2754874425acfcf29b82595977660dab86ec35665e96400eb92acfbb51fb2326e010b960be7570de7575296078bd31
-DIST pyparsing_3.0.5.tar.gz 940615 BLAKE2B 7ca78eb4ddd769a49f9538757fc3aae1a1fa11ed1a8fd4483ac80bf50b483e0a8ca5ee13739fbb8c40a6009e3dd48aabab6fbb29fdd01f6f82c11b22348408e1 SHA512 b3efebc911f3c3850ebbb573299a843aab1ca2fb612e41d93947f59ebba9a716ca099b5ec2f9ad8091cb82f6018910205d8409c403f26fb64e72cbb474d05223
-DIST pyparsing_3.0.6.tar.gz 942509 BLAKE2B 1ece2e83dd4193c8364bf690afc54090b46658fced62fc852b0098208d2ae4b18e96f050e63d8751c4b5cf95aa178a11dd1c37fc9d63ae1551639b5c91fe81d8 SHA512 5e94f1dcb4560a0f8e5b9a979b691b6362939648d03e9ea03f74e3aeeddafc09029c8e82c42a517aebe4a0483fd06cac03ae45030e074a40576f9570ed1eb5cc
+DIST pyparsing_3.0.7.tar.gz 944917 BLAKE2B bcbcd18817c69a69ac6863affb1309a5ca63fe46a45dc056d8407d79a77d1f19e4d1abce08f5d6f1aff7cbdaefb5b699787abcddfcbf64e5514e79e2b0b86ce6 SHA512 d5d5547188ebda6fb7f45928174314d3d4d10302acc8fb476cd6590fb4a75167dee5f6397ab0b63efd4cb55c0765708ffd432bcfecf28d8f808815e62615f447
+DIST pyparsing_3.0.8.tar.gz 948516 BLAKE2B 8df61ce3c5f0b9ef725bf750fa25c26e482a5786b6c3a03befbf7945c76f67981d0f60bfc98badeb353274e5e3c8442e105ae635d0b93681e23090e70716ce0a SHA512 5567824ac6d4c17755c0d47f2994cc2449383d9d3e9dfa374886d92af38651334483034713df420701d1c4560b331f61d763f7f8d1d7a14a7d221c022b9fc8a7
+DIST pyparsing_3.0.9.tar.gz 967771 BLAKE2B c13c74661b9e0d53b4886c9949b01951d220991f916362a13ce0c32c0ab05a6b1cab4d5e5a626acb7563c0ec1716348ede205cb67bf22c0710904f07404ad82a SHA512 1158f27e31f8eced540217b7234b09005eac416fad74faf59678fdae93fe2f76e0e3b5f4adfd3ceb42c8aef19150950293e989c9a5189741175073eb7a03cd6d
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
deleted file mode 100644
index 225b1b9d79..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.3.ebuild
deleted file mode 100644
index 5e4cb765d6..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# railroad-diagrams not packaged (and not suitable for packaging yet)
-	tests/test_diagram.py
-)
-
-EPYTEST_DESELECT=(
-	# also railroad-diagrams
-	tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
-)
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.5.ebuild
deleted file mode 100644
index 5e4cb765d6..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# railroad-diagrams not packaged (and not suitable for packaging yet)
-	tests/test_diagram.py
-)
-
-EPYTEST_DESELECT=(
-	# also railroad-diagrams
-	tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
-)
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.6.ebuild
deleted file mode 100644
index 5e4cb765d6..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2004-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# railroad-diagrams not packaged (and not suitable for packaging yet)
-	tests/test_diagram.py
-)
-
-EPYTEST_DESELECT=(
-	# also railroad-diagrams
-	tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
-)
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.7-r1.ebuild
similarity index 66%
rename from sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.7-r1.ebuild
index 5e4cb765d6..0ddc113a09 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.7-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
+DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
@@ -11,11 +12,11 @@ MY_P=${P/-/_}
 DESCRIPTION="Easy-to-use Python module for text parsing"
 HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_P}
+S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 distutils_enable_tests pytest
@@ -35,6 +36,21 @@ EPYTEST_DESELECT=(
 	tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
 )
 
+src_configure() {
+	[[ -e pyproject.toml ]] &&
+		die "Upstream added pyproject.toml, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "pyparsing"
+		dynamic = ["version", "description"]
+	EOF
+}
+
 python_install_all() {
 	if use examples; then
 		docompress -x /usr/share/doc/${PF}/examples
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.8.ebuild
similarity index 78%
rename from sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.4.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.8.ebuild
index 5e4cb765d6..5dd04e79a4 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.8.ebuild
@@ -1,21 +1,23 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 MY_P=${P/-/_}
 DESCRIPTION="Easy-to-use Python module for text parsing"
 HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_P}
+S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 
 distutils_enable_tests pytest
diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.9.ebuild
similarity index 78%
rename from sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.0.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.9.ebuild
index 5e4cb765d6..5dd04e79a4 100644
--- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.9.ebuild
@@ -1,21 +1,23 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 MY_P=${P/-/_}
 DESCRIPTION="Easy-to-use Python module for text parsing"
 HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_P}
+S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 
 distutils_enable_tests pytest