gentoo auto-resync : 24:12:2022 - 14:02:21

33 files changed, 561 insertions, 459 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 81cbb7d2fdd3..d8caa3a6d534 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 8b3df4637a2d..54c1fd60698b 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,7 +1,9 @@
 DIST Nuitka-1.2.6.tar.gz 3959091 BLAKE2B b326409f49d722bcac7df3e2c5caae7fb9ccf2b2991d2cf003a4db7bd268af95b7423da3b69b93b45c2aa1e3461faac90872b01f2d2277c5e9f7c71bedb0df56 SHA512 b12f694f8ac26213fd1242c66c2a37be1940bafef8a4949f0e401f056a1f72a010d1df237a828317ed0c88530206c31e617f03e4bccf6c934b967f8ddaef330f
 DIST Nuitka-1.2.7.tar.gz 3960368 BLAKE2B 582ad7f7a96577fd87a4f9fe083d90f532f2ddd7824b4105d258551b559d9390fba428b80223c6ca4d00eda451cc21a63449c7370a3e43d4b7f9a28fc6bba4c9 SHA512 37a3c29614102dc80f916ac483a6e87322b7a3b9cf25355bdf2f29d84e33300640607fcb7fdc6a338431bc890b4337512c43368e47a2d69c7254b7b7794bb35b
 DIST Nuitka-1.3.1.tar.gz 4028497 BLAKE2B 877413970a1e169abe8b9770d927d2e9a33bcd775466adc7287fdcc8f69d412fae249ea96a16aca4166d655f1a016852e06018f55c0b62afe4b53c5b1c540870 SHA512 09f8ff13f14af20ee2fa8b80714ff52a3bc2a36658113e122ba383f34e9ca8c27af42b14cb06477e3a2ed2e5dfa60e10295c4f96a209db699719c456518c464d
+DIST Nuitka-1.3.2.tar.gz 4019850 BLAKE2B fce2015b1af9e0b93b777982c772aaa903145bc55a5effb68ba581a31f63e34280aace47df8292d2125725dee02c55c1d54580a08d2d8d3a775459edb9807837 SHA512 5a1713757a6b1347320accc717a01b2abfb3b815683880845fb35ec92e7c94bd7e011a83bd16ed1ba28d14f4128945bdd89d39b89fe8dc7a59c69e9f127bc4b6
 EBUILD Nuitka-1.2.6.ebuild 1215 BLAKE2B efeaa1c3d00d7271353da9adc21c65bacb0a8e30dfefd73871c3ba7f37133baeb6dd4cc413d0303fde7396bba94802a729db21afa6a285ac240e7f45fe92c6da SHA512 5588605c444f1c9f6ca82289c60b7a5d843074180465f8f57e0282b384b2be913451c89dc519623dfe9ffa9b5a128188a18b60bcd80d9a49d27d007a2f0c5a0d
 EBUILD Nuitka-1.2.7.ebuild 1195 BLAKE2B 4fd1a26dec76bee05b6dc9bb526572441095e01107cb45f7b791aebc653d286cce0cf19f1b3dba2e5d626897bf2f7e0284f85f4b05602676234cbc427081ab39 SHA512 9cafcdbdbb6876b29b8ae2b1822392780fadd74b1a01df6762f397a2e16a01829629ca4961abea174b2085c05cce8ba498e6836b77c4f9ecb1fb0e2c2fe0674e
 EBUILD Nuitka-1.3.1.ebuild 1191 BLAKE2B d09596501d4167392016199b9c9246ab0f57ceca5667340672d9cdca0d7ebe5288eef83e9485bffe607a8f8af1cea705809ab94ca730e1abe39929109b44f504 SHA512 edfd1f3c1abb7d0be5a943e92a4b0ac79f205d5df93a453c8922aad73d3df4489a0b1a4bb4ed11a1e77b493633231f156b6be6faa17629a6d5b1ba44295f05c5
+EBUILD Nuitka-1.3.2.ebuild 1191 BLAKE2B d09596501d4167392016199b9c9246ab0f57ceca5667340672d9cdca0d7ebe5288eef83e9485bffe607a8f8af1cea705809ab94ca730e1abe39929109b44f504 SHA512 edfd1f3c1abb7d0be5a943e92a4b0ac79f205d5df93a453c8922aad73d3df4489a0b1a4bb4ed11a1e77b493633231f156b6be6faa17629a6d5b1ba44295f05c5
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/Nuitka/Nuitka-1.3.2.ebuild b/dev-python/Nuitka/Nuitka-1.3.2.ebuild
new file mode 100644
index 000000000000..6ba48aa72091
--- /dev/null
+++ b/dev-python/Nuitka/Nuitka-1.3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_10 )
+
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index f24905ded7a6..bf4dec83d79e 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,5 +1,7 @@
 DIST alembic-1.8.1.tar.gz 1255927 BLAKE2B dbf40f9ca12171d99ad46bec6bf1841799226887a55a815db5c7a69cbcb7d861ede774aa35e1018e1a57bec26a8ddf7ee311e0b4396ebddd5477c67a4ad11876 SHA512 51f210447172d08eb94c41a962ddecc593a665790aa6f5badb771dccc882e0d653dcf153ebb04b9824dabcaeb1ac08e3747c2e3c74d8584a24b35662778de8dd
 DIST alembic-1.9.0.tar.gz 1278832 BLAKE2B 59131c5a53d051905c13e466c58ad5c1759e0e0f557bcb78bbe80e2ca8f3f7d791a1d8be017cd9227d6baf8b7416d0c6d89ec9e9e56f7440f6d1455577ed8676 SHA512 3c040ee07ce2f40af28a63f129dee886f7d8458b762a28cf2165ac10dd2f2f732b73da2ae2c9687b66e8872b75d85d95933847eb6a1190ad55e550e6bb120a04
+DIST alembic-1.9.1.tar.gz 1280020 BLAKE2B 2355b265a7cb42091f51e2d291dd2e620134f9f7ef96c101db7161e1a8667b44ddb61b6d01f46a0db4227b44dcc1821c9bd6923f8510c4235e26f3d482e4298a SHA512 143a62bab08c654c5846ff7ba1021dfb96d3a4b0e699d9c4bd692fda250f47b0ee10cb3238b769e8117b09ac495bdd97a6dbd290b29659b5121754be9a161331
 EBUILD alembic-1.8.1.ebuild 962 BLAKE2B 34b2e7ebb9a604b022c8daeac613da12f6c00f2e126ec2d47416548084b7f9607d49ee667435afe8fd6bca2a69a83897be17be5800d10ff4b8e3fa74c8ab11a8 SHA512 8b3064c27a0263061dc648334c3d3a4a665c4eff31aab5bf63570d6de137eadd37da4c6e26ebbb5b3370fc38d0a7a3dfb79c326677938020418205e8ac27fba1
 EBUILD alembic-1.9.0.ebuild 964 BLAKE2B 8df7637bbf593fe7e7e7beeb86a44fdfa8f0050651a1926cf8eb400819bf44e331249158bac58edade634f14cfc8c5450c6516b999f90276f8e0477c984ab609 SHA512 96f96d1c751258584f6073f21204162314dfc37bed0d617ce55ddd39c71d3a57d06c80e99efc87337a5783939edda9c6f5ba4843dd007adcd97ff38b4ab8cc4a
+EBUILD alembic-1.9.1.ebuild 964 BLAKE2B 8df7637bbf593fe7e7e7beeb86a44fdfa8f0050651a1926cf8eb400819bf44e331249158bac58edade634f14cfc8c5450c6516b999f90276f8e0477c984ab609 SHA512 96f96d1c751258584f6073f21204162314dfc37bed0d617ce55ddd39c71d3a57d06c80e99efc87337a5783939edda9c6f5ba4843dd007adcd97ff38b4ab8cc4a
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.9.1.ebuild b/dev-python/alembic/alembic-1.9.1.ebuild
new file mode 100644
index 000000000000..be24ef80d028
--- /dev/null
+++ b/dev-python/alembic/alembic-1.9.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index da69f60c5651..bdc91f9336ab 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,6 +5,7 @@ DIST boto3-1.26.32.gh.tar.gz 581235 BLAKE2B f8decc1e924ff5f5f98566084a55c36ea10c
 DIST boto3-1.26.33.gh.tar.gz 581883 BLAKE2B a2ac93a516932b8cfcb039e215608ebdd3f5427c7abb016359ad2f1a9e5e4ed855a405bb0470b5ba4823ba59c21d21f2b3319dcc8ef0715a1293cb0219261ac1 SHA512 4bb267abfaa01643edd6670dc66c87225845dce31d1d4aa500f60a278326a8fe6f877d8af4bff460cea3b77ef316392a2acf10181d7ae2a7c59ca2f6ca5ec9aa
 DIST boto3-1.26.34.gh.tar.gz 582767 BLAKE2B 279138d5b6093a16d54bd14bab6e9e4c4901d03a38e968c693dff6c585c30098d6520b3d7f5d98c8db94948bf431ff93531c5f706b9e8bf25501255b46c40203 SHA512 b9cc60eda79e8addba92013e34893cb7c59557d350d065f7406c1fb2b0c4256612a09d049ebc62f2ee447922f9ae99557a84f60379267f576a6665dbdc193d1e
 DIST boto3-1.26.36.gh.tar.gz 584205 BLAKE2B d5aad2ab0b8ee3392c636309454859e30cbe937d0dc2efb4b5a817fc83c555e5592ec8a8ae94a273ab2ab55be5d627b44475d0b5ca77caebc246229e3f78b155 SHA512 818843d82b27ee2e376382f1a74a950cbacf04a588bdc012e8c88d569ad5571d231a2dd399a3e26efc3de96c89f722ceabc3e70eb3cdba930c08277fa6c2c189
+DIST boto3-1.26.37.gh.tar.gz 584822 BLAKE2B 08c08502f3defee6365aa19a55cb5bb6c006ce9685421119d1469f90f35e0aeb49fc11a6c5dd133cdfe1138248c0952338adb7b864010825f6f32f40398c2f4f SHA512 4c73b45cae0ed42f219b77d5b58f26560f3ac660d66eaea0c8452053ed38b4c8cc7ab168062483a52e091f7241623466a473368e0545a9fa07c0ac12d0185e31
 EBUILD boto3-1.26.20.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.26.29.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.31.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -12,5 +13,6 @@ EBUILD boto3-1.26.32.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd536
 EBUILD boto3-1.26.33.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.34.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
 EBUILD boto3-1.26.36.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
+EBUILD boto3-1.26.37.ebuild 1587 BLAKE2B 2fff9e50b68aab4197c1dda600ba71e8ee090ea02195375d9a54afe0eaaccec42d917a8057878e5a0bb1a19adc79ff40ec8f3074888145409bd240cd5a28ee48 SHA512 819fea2080e15d23d5bc642aa56cabcf38852c77f06a495e08dea653deafa588284d5569070acdc2a5c534f9e217e8ea4d045cf39ab735437d81589fd97d639b
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.37.ebuild b/dev-python/boto3/boto3-1.26.37.ebuild
new file mode 100644
index 000000000000..aa8071e64d5e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.37.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index e8051be88e1b..5d536c0626d9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,6 +5,7 @@ DIST botocore-1.29.32.gh.tar.gz 11048130 BLAKE2B 42c1fd07f0501c5815c05ff8ad2d63d
 DIST botocore-1.29.33.gh.tar.gz 11053602 BLAKE2B 746a59340b7a01c46b15d36d735c67db107ccc99ffa20983a15196561f48a3974d5f9d7b82a2eba07ca04b0a9d068bc742fcafe19259b3e76643cd0ca0bb1baf SHA512 efbeeca34ecd759735f91b6dae5bd4f2b32831cdbdc1eb621242b158bc1a707c50de68ab07e894cb207b65601a5b96f592350bd2f2b395a959344d06699ab7e0
 DIST botocore-1.29.34.gh.tar.gz 11061036 BLAKE2B 03b4b48d1308113be6711e27d15dfca4e361ba6c1464c009cdbb0524ddf2075a749e8433d52fe760a4a3871ce3f646c08db125f81828c1b29d8ee3d2a2176331 SHA512 683a0f0d62559db351036426bf59e3179c259cddb4010e6064cac2f23d43e07d98b6aed8a1cf5b3a8089ae24a95f1b3f2543bbd23bc0a21d7aad90114041619b
 DIST botocore-1.29.36.gh.tar.gz 11075582 BLAKE2B 4db73c753acc1eba93bc5fc3a2486b3ded6ee41e35220f56cefc71e808128cb88582474782b1e77b992186b8bcab3ec34ec5566517b1464ee226480f615ef1f0 SHA512 dfaf655fabe85c54cc58a4266fa11b78c7b0dab771a639d9bf8d2583db1b245ae8d5344b7fc6aff759fce80a3ab7ba7f61a7d912adc1dab3c147077cd4fd79c9
+DIST botocore-1.29.37.gh.tar.gz 11077206 BLAKE2B 59c877edba074d4d5858dbf0a4026c0884cc4fce5bc2c9a7d933cfbff8317825663955205ebc754f8a4713b817b7d775fe208d6946f788a1943989949da58a04 SHA512 e79447fe66a506326c5f6396a32b5f4f6560038c57ab03457c36c838f52c1e48a94cba7624350a738eb937d0f3954984b77fd97ffb4becfa72cc4c61005efd40
 EBUILD botocore-1.29.20.ebuild 1898 BLAKE2B 96ba15f9361114f85df2e6d1d2d17a1e1e1e88f9ede3d0dbb528ac195589670eddb17a452353eb3c91014fee6e5737a7e581e0aebd62bc25ff752ffbb22b0572 SHA512 a44a1049cfc316267502dd278d62eb7850a63b94191ac8ea017af4d0836fb6007a41082d14182fd0c679fdc4b5431e0bb2588084b95453fd587de2fffe801882
 EBUILD botocore-1.29.29.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.31.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
@@ -12,5 +13,6 @@ EBUILD botocore-1.29.32.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa7
 EBUILD botocore-1.29.33.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.34.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
 EBUILD botocore-1.29.36.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
+EBUILD botocore-1.29.37.ebuild 1906 BLAKE2B 6bb6097b84adeb172e43d2cccb963d8912fa0b3f6d9a59a0a41ef645ceb5cb22e35aaf763a39e0e6905721e68f129f0bd14f01edf8d3706f5b666f3075023fa9 SHA512 1cc91fc5b2e9478efe06571396a67a94c582d2032f7d2c973ec4748a8ce490d2d0218fd8fbf49a94f74617f472040bf58c957f44a69498a0c2d3c47647ca99f6
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.37.ebuild b/dev-python/botocore/botocore-1.29.37.ebuild
new file mode 100644
index 000000000000..36f6e1eb862b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.37.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 0a6684757939..6588701fde1d 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,5 +1,7 @@
 DIST coverage-6.5.0.tar.gz 775224 BLAKE2B 1ff7db1c72856553717d07d5a13443c210a3d85b3ce1f1eee802b986f71e3c13ac9df6bbca498fbeaa961ee33baab29c5e38f0c0e7b21c378830dfe85d797798 SHA512 4f2ec0bf69a83471a2b5a73b6a2212372ee6e32ccc4c72e0d33eef915939152f3213ab60e1a22ce2b72791e706c2223b0c81c87b95bbfadd1e828fa1a9fff120
 DIST coverage-7.0.0.tar.gz 780514 BLAKE2B 2d7e0190bacd5ef6db35e3c6ab5114571ce394a9d6dd5e7d3497e4eff9dc3abee1aa11babc057e6b276133e5e19dd7b2e1d4149f5fb73cdaf8d2a6a7df005d7b SHA512 258c1c2dd8af1e7b64fcce2042594230a245046c73e3e67b0b0b1e82180e200a37983b766bd72fdc23a6e5ff12416541e69a26beec845598c25b293c4ee1cece
+DIST coverage-7.0.1.tar.gz 781226 BLAKE2B 52da1dd6f3eae7d235a597d3dd24d4042ee1ee4c082d5700d04065b8328af01ef006121a3588f04e79235c559e6dc6d2f5168b5079037e19a41e1b8e869825a0 SHA512 63ec6a21d4af73720a2b79309cb1d0e61bbe67e04835bd907f19e482c1479cbb69d353cd42be0d4d9e75cb4082debb464ec5e9acf270c86042e7db58de1d024d
 EBUILD coverage-6.5.0-r1.ebuild 1879 BLAKE2B b6988614ec609ed02c0adb8faca1c2c77ec581a9fa514ea848cc615d2a771e90031d83168fdccf2b02cd156f9031bf990ea867127bc54817a442977c0a916930 SHA512 9ea2255d4ab0b45832c694adfc456342adec446d13056e095434eed08efadeaa6708e6cc5af53eb231dbf126b7a98f13143ea086b90501aedafb3f675479ea30
 EBUILD coverage-7.0.0.ebuild 1887 BLAKE2B c42061e654f62985d632de8e02fb39b1e67b8610fc005e0772bfd2e650f104695fc8dd59a4f66e37df3e5a63167cd90c6ae2cf7cfd657cf791be063b399a0636 SHA512 363d29518513828e3b07c72dafe1c89341e9b772b1505875b9e2534c1af12d1a41818b870c5e1f43dc39259942c2a9a519a51769c08493f2e451202a63be5d02
+EBUILD coverage-7.0.1.ebuild 1887 BLAKE2B c42061e654f62985d632de8e02fb39b1e67b8610fc005e0772bfd2e650f104695fc8dd59a4f66e37df3e5a63167cd90c6ae2cf7cfd657cf791be063b399a0636 SHA512 363d29518513828e3b07c72dafe1c89341e9b772b1505875b9e2534c1af12d1a41818b870c5e1f43dc39259942c2a9a519a51769c08493f2e451202a63be5d02
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.0.1.ebuild b/dev-python/coverage/coverage-7.0.1.ebuild
new file mode 100644
index 000000000000..ffeda11b21d4
--- /dev/null
+++ b/dev-python/coverage/coverage-7.0.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index 1d0a5a6278bb..f422337165e9 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,3 +1,5 @@
 DIST exceptiongroup-1.0.4.gh.tar.gz 22529 BLAKE2B bdf58d36ea59cc7bed17947e4671c92058e7036b20c91df434625d8627db41d646dd0b90ea397c25674753e3ba09654f5978c22220e13007d0af8b1fe659540d SHA512 18f207cb028f1b9ab1073c2859b4aeff357706c3d4c9f05fbe8739f3e19852dd91da5be9c9e18b14b16bd494fc8bf1bd26d058e925084da8c00eac5ad057e2be
+DIST exceptiongroup-1.1.0.gh.tar.gz 22724 BLAKE2B 2de748494fe1356353b7f70d3afc7be7ecb8df4166f57461459c7f463bc5c22340c9073b0b0e032a52680560e37e4004c754fb4ddcc1a5a70f8dd0e973b1d8a9 SHA512 588b4ec3cae01a64140aac191cbdf8d0631eb614d430bbdbd02d17d8ff43aad9d233c3545694c6fffb622a2b3c38a289e20f1b8db6bf0e9b8819d668e38a87e3
 EBUILD exceptiongroup-1.0.4.ebuild 769 BLAKE2B f9202cbda4d4940df009c34d221356462a843549ca24dae49a29791d298f89236e432c9ebcb706e2266059865d90c04fac4088261f4e4cc5aaa702aa284771ff SHA512 5fc7874d4087bfb7714652a57658c5388ea9036b24b29db72fda0a3194ea2e9331793b2461d628b91207bfe30521aef477f9a82a8e923205614a1b4d31347921
+EBUILD exceptiongroup-1.1.0.ebuild 777 BLAKE2B 5a5c936ea8fac970d139dad57389af04ce27b405a7544195cc4635d7402cecbe7e6c4ee02ef6a475a802e1d2030cd62ee9b74b6f0fc6e03427d79eed96093b87 SHA512 d2ac8edd4f40f6c1862c6bd978c0d39d8a1adc62f32fcef4c4ef68cc664b691dde94414fee9f3da08d66966cb0ca9b558223fbaea439fa72371fb5ad3268876f
 MISC metadata.xml 384 BLAKE2B 248abcb5fc08c91396cdbff52e5c3e4f6cce2aa273cfd52b48ee13de9ccdaecd09e9a436ed79f258d15d8d4583fe5995e054010c909a522f47e6866e55b3458f SHA512 c631c69438059cb2a6c80e595e45fac904d32dfb53f8be183142f1195d3a3b9bc14bc240f0808e14f47d31beb1887ad82ee79c5f1847c8e6b59dbfeea7913c8b
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild
new file mode 100644
index 000000000000..999c9c16bc4c
--- /dev/null
+++ b/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit_scm
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="Backport of PEP 654 (exception groups)"
+HOMEPAGE="
+	https://github.com/agronholm/exceptiongroup/
+	https://pypi.org/project/exceptiongroup/
+"
+SRC_URI="
+	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT PSF-2.4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/lmfit/Manifest b/dev-python/lmfit/Manifest
index 0a452c0349f7..eaee7831090a 100644
--- a/dev-python/lmfit/Manifest
+++ b/dev-python/lmfit/Manifest
@@ -1,5 +1,3 @@
-DIST lmfit-1.0.3.tar.gz 292475 BLAKE2B 6d97fe671b0d5bb7751d0ead97ab83d8100e2bb16b81bed61ff07ee6355bffd99258ab554032c9b8a35bb4376a1efef0ab988b3eb6d5a9e26f52314719e45dae SHA512 33febdd68104bb41ca379a8acd03a8bb985ba8785d607ab110b63bc7b3b39b9d95161a683fe015613bee6d99100ede82d1f3574515a6bfb9160300a5791fcc55
 DIST lmfit-py-1.1.0.gh.tar.gz 300406 BLAKE2B b874efd70bc1c5fa2c94239027d636a8dd5bf5ca2a3481cfc467032efe9d57ff55c74ccf175f32c6f87cd285e9216db49ef4fb0566e86cafe85537a40db64366 SHA512 9d5c871446a5bb650d8709b0db100e23be8ed7459ceb7ea4614fb07b1058044bb07394b2af615ecf7d9a22aaf49c1da723cb555749956d1f3ad507a4465fa0da
-EBUILD lmfit-1.0.3.ebuild 768 BLAKE2B 5d0242f5f1301ed2247a3515454a52517e32f1fb3b22a3c3a2ff710e4d57f00fb76769518ce613b421d57e87af2a42cee803c7885fd5e248b24a6cccd53bc148 SHA512 a758fc59146d47928ae208709d5bad02c95e02ec803c0037f3350e9598d237226e9dde899104c552c7f743d0e5f1e801044fc64c59ede3546cadb7e582542979
 EBUILD lmfit-1.1.0.ebuild 1057 BLAKE2B 60cc0693b1cd42f5d95c29b690864cf8f70ca7eaaebaa63743477a301998766d770517e8132e17557b0e240b6ce67c0f88824a8d8b3b115d9eb4ca7c00056f26 SHA512 5927e54303fedf0644e7d598c95ee08aaaf93eda0f41023bcfc3789c651bb9c4b9d754ad8f85bd850a747ef24a7e2ce2545085906298dc08fc4961da5e0b6499
-MISC metadata.xml 386 BLAKE2B 19872fce1464db158a66df58e6458655215ba8f8eac4469046be955a27a761dcabb9b324e3324a81e1bb407fa5bb7d8611371da8844cd75d0b43b44feb8e5bbc SHA512 8de0cbfe89611f458d854f50c59756dbcb386466bd582b5c84ed724546d74ae430ab9ccaaacbb4f7c6f892d3fe211624597dfb39038f01d621c548c11fea4c55
+MISC metadata.xml 440 BLAKE2B 8ccc51be7b30a71352ab62c8b6ffecb643b23f6c8dcd0626b94528f069d2be19ebdafcf77267f16b96d5e03fae056ed7be847c6da7ef87a46237e9746e2a3458 SHA512 1a870a9bbeecca5d7c0078cf36873f02e7dfce5ab0fd67d42a37d57ce6c5326b5184101a0d6342107e991b86f7cbff5f1563a41c271d88f92819c01ff9940fcc
diff --git a/dev-python/lmfit/lmfit-1.0.3.ebuild b/dev-python/lmfit/lmfit-1.0.3.ebuild
deleted file mode 100644
index 266f2a8ebaa6..000000000000
--- a/dev-python/lmfit/lmfit-1.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Non-Linear Least-Squares Minimization and Curve-Fitting for Python"
-HOMEPAGE="https://lmfit.github.io/lmfit-py/ https://github.com/lmfit/lmfit-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/asteval-0.9.22[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
-	>=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/scipy-1.4[${PYTHON_USEDEP}]
-"
-# past from future needed for tests, bug #737978
-BDEPEND="
-	test? ( dev-python/future[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/lmfit/metadata.xml b/dev-python/lmfit/metadata.xml
index f20098ac7922..03e21f01eca5 100644
--- a/dev-python/lmfit/metadata.xml
+++ b/dev-python/lmfit/metadata.xml
@@ -9,6 +9,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">lmfit/lmfit-py</remote-id>
 		<remote-id type="pypi">lmfit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index d09db6b412c5..22a64caefece 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,5 +1,7 @@
 DIST multidict-6.0.2.tar.gz 56840 BLAKE2B 1fa9b0d92a94ed022849a851f925e132b629216ddd0d5d4772304fd3361a129692f8b49fca2765118ab1cbc306879924d0aa7c6b57b648158a093a9f311a8d30 SHA512 508f18c5f731e7438bc7cb84b29aff22422769a8ea4c0ba7c875361d1bb1da78bed2db8b4ca34b833effd03ca3e7f00dabaad64bfce54b3e8d208cdc808083c9
 DIST multidict-6.0.3.gh.tar.gz 58568 BLAKE2B b89373a74c6fb4965bc794e7351d6e9563f810ecdb738000ae5573c8b4717f39c4866fd945c9de2afed4f48060ba675d449d7df512c58d5f34b55bc0d8d44ae9 SHA512 95aef45378c0af6ef6b05549d7419ff4ba272430edae37b2fc041a4742d58890ba9475648b8b5ac57d2bff3718519a0201819b274a65ac0b101cf41c8abad812
+DIST multidict-6.0.4.gh.tar.gz 58931 BLAKE2B 2cf25ac2af57289432dfc6617f35a9f1310469b8d7b6a762e63f4f08b3cb8235c7115c4072fc2ffeec417b49af8a97654c7d69e8e20507fd553fab074e42b1cf SHA512 6f9e6ff16a104d40b0cb59860af9cb1a98e8d3a256626f77600c4895e6ef692b31880273f204e7ecdeb574407dd7c2e4326ad7cd9c08b1095011d6ba3793b86e
 EBUILD multidict-6.0.2.ebuild 834 BLAKE2B 7265e5a702ef5890168426f2d72d9aefb12488598a3561486153a165fd0c343c3c9c9ca15ff65b7895837a10c89f59cbe33f8577bb982dcc4df77a97aebef036 SHA512 fec2f4059ec97119bb61e0cab341cca612abfd571051bdada84d49d43c179d648a4101036bf90432186dc7475ea7682022f6a2fcb9434288da51ba4e409754f6
 EBUILD multidict-6.0.3.ebuild 845 BLAKE2B fad379cfc9ce8628b91bbb411e607924e8b9aa82d3c494919c17f0e2442ff16d289643a4e1444fa8786f0d752770fe185592a57f29b45b286c1a55fe0db4d1bb SHA512 65c40efd04b7ea8c218acc804a65a07215c74135015b57b27422afbff5b785797614cdd109dee98451ec3eb873daa3b24aded219e81a8ec7e0c698a511a2b241
+EBUILD multidict-6.0.4.ebuild 845 BLAKE2B fad379cfc9ce8628b91bbb411e607924e8b9aa82d3c494919c17f0e2442ff16d289643a4e1444fa8786f0d752770fe185592a57f29b45b286c1a55fe0db4d1bb SHA512 65c40efd04b7ea8c218acc804a65a07215c74135015b57b27422afbff5b785797614cdd109dee98451ec3eb873daa3b24aded219e81a8ec7e0c698a511a2b241
 MISC metadata.xml 476 BLAKE2B 4cc6b7b2d709459ddec7c0eace1cf5dc418a0953746816135ac5ad3d8a8aba4c5086ce13b4282326de9ec9db9ffb88eec7612748bdfaf29059252f97fd56692a SHA512 88215f090cf407903b6de7139c9dca5892f58111c8d1da9b52e91b4dac18fe212140868a05ec5ffa2231519f062b4499a25b05e99eef1a81bb9655ea61387338
diff --git a/dev-python/multidict/multidict-6.0.4.ebuild b/dev-python/multidict/multidict-6.0.4.ebuild
new file mode 100644
index 000000000000..696e10cbe380
--- /dev/null
+++ b/dev-python/multidict/multidict-6.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="multidict implementation"
+HOMEPAGE="
+	https://github.com/aio-libs/multidict/
+	https://pypi.org/project/multidict/
+"
+SRC_URI="
+	https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't enable coverage or other pytest settings
+	sed -i -e 's:--cov.*::' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index fe33c26d4168..4e34bf84e3b2 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,5 +1,4 @@
 AUX pytest-salt-factories-0.121.1-tests.patch 12284 BLAKE2B 4374c59c530d5e0171763b376ecf883354ada4255943017ac60361309dc5799ef563233474a5fa1756e7193285e46d7186973c8413b558dfcb3408cd42aecb6f SHA512 08ef49871ca4882dcd57a51c99e40fb87267ff07c666c54ba475061fb113f5e985c0c23f586366c33cb00b07bc190b98e6d7bb080004ee8b7c171bdb016f9ef8
-AUX pytest-salt-factories-1.0.0_rc13-tests.patch 16967 BLAKE2B 804b5e2ce678e732f8e01b3f652bb9f6a82caed3886e552dd359e27da40e5bb7fbff336828f944b2e0455399d78b7bc2defce37b641b1737e155beff5a4e72bd SHA512 bc6abcd079afc560815c00c900e350b468b572d67417f18d3a4f559bc5fb02b7e703a17afda7011c9682f55c09eb19b09250ac06c5135478235e03233c588fe1
 AUX pytest-salt-factories-1.0.0_rc20-tests.patch 17428 BLAKE2B e52c44dc43f08f7933fbcea60e4ba39351cdaae79dc4037a490ae222cd41286feb308c66abe90116417f72ac0aa3c968dc30afd914545f3c08ce5f4c75d43a85 SHA512 6ac3af11d518834125fd41e9e3b49a383079cdd48888044b3009eea4f0a066fe2b8b8d20a8fc7cf6331cd8269c98140d5203dcf0f5a64504c952d8a5bd652ef2
 DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
 DIST pytest-salt-factories-1.0.0_rc20.gh.tar.gz 160140 BLAKE2B 7ecd9af695626c465e5776ed218bd92f30a556394cf4af0c2b6fb87c182f8aaf2d8f998358a7eef95fae53c85a6be2d4ed5a6ff191496fcac62a97e25cf19063 SHA512 5677c6638b5dc7f90c01f2c2204e1910c2bf6ea2c10b714173d3443d4c682b5f515ad7881e2ceee66f6eaf619e399d6fa10052604fdc9c5157c58348b63c8f2b
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc13-tests.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc13-tests.patch
deleted file mode 100644
index b021dcccf280..000000000000
--- a/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc13-tests.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-diff --git a/src/saltfactories/plugins/__init__.py b/src/saltfactories/plugins/__init__.py
-index 361414a..55469e4 100644
---- a/src/saltfactories/plugins/__init__.py
-+++ b/src/saltfactories/plugins/__init__.py
-@@ -27,7 +27,7 @@ def pytest_tempdir_temproot():
-         tempdir = "/tmp"
-     else:
-         tempdir = os.environ.get("TMPDIR") or tempfile.gettempdir()
--    return os.path.abspath(os.path.realpath(tempdir))
-+    return tempdir
- 
- 
- def pytest_tempdir_basename():
-diff --git a/tests/functional/factories/base/test_salt_daemon_factory.py b/tests/functional/factories/base/test_salt_daemon_factory.py
-index eae5670..fd312df 100644
---- a/tests/functional/factories/base/test_salt_daemon_factory.py
-+++ b/tests/functional/factories/base/test_salt_daemon_factory.py
-@@ -35,7 +35,7 @@ def test_extra_cli_arguments_after_first_failure(
-     This test asserts that after the first start failure, the extra_cli_arguments_after_first_start_failure
-     arguments are added
-     """
--    output_file = tmp_path.joinpath("output.txt").resolve()
-+    output_file = tmp_path.joinpath("output.txt")
-     config = {"conf_file": config_file, "id": master_id}
-     script = tempfiles.makepyfile(
-         r"""
-diff --git a/tests/functional/factories/daemons/test_container_factory.py b/tests/functional/factories/daemons/test_container_factory.py
-index 1642d57..8b085eb 100644
---- a/tests/functional/factories/daemons/test_container_factory.py
-+++ b/tests/functional/factories/daemons/test_container_factory.py
-@@ -3,6 +3,7 @@ from unittest import mock
- import pytest
- 
- 
-+@pytest.mark.skip("Needs network access")
- @pytest.mark.parametrize("skip_on_pull_failure", [True, False])
- def test_skip_on_pull_failure(pytester, skip_on_pull_failure):
-     pytester.makepyfile(
-diff --git a/tests/functional/markers/test_requires_salt_modules.py b/tests/functional/markers/test_requires_salt_modules.py
-index 97ed1ec..53ff0dd 100644
---- a/tests/functional/markers/test_requires_salt_modules.py
-+++ b/tests/functional/markers/test_requires_salt_modules.py
-@@ -1,9 +1,11 @@
- """
- Test the ``@pytest.mark.requires_salt_modules`` marker.
- """
-+import sys
- import pytest
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
- @pytest.mark.parametrize(
-     "modules",
-     [
-@@ -29,6 +31,7 @@ def test_has_required_salt_module(pytester, modules):
-     res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
- @pytest.mark.parametrize(
-     "modules",
-     [
-@@ -54,6 +57,7 @@ def test_missing_required_salt_module(pytester, modules):
-     res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
- def test_has_required_custom_salt_module(pytester):
-     pytester.makepyfile(
-         r"""
-diff --git a/tests/functional/markers/test_requires_salt_states.py b/tests/functional/markers/test_requires_salt_states.py
-index f6d63a9..ec4b431 100644
---- a/tests/functional/markers/test_requires_salt_states.py
-+++ b/tests/functional/markers/test_requires_salt_states.py
-@@ -1,9 +1,11 @@
- """
- Test the ``@pytest.mark.requires_salt_states`` marker.
- """
-+import sys
- import pytest
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
- @pytest.mark.parametrize(
-     "modules",
-     [
-@@ -29,6 +31,7 @@ def test_has_required_salt_state(pytester, modules):
-     res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
- @pytest.mark.parametrize(
-     "modules",
-     [
-@@ -54,6 +57,7 @@ def test_missing_required_salt_state(pytester, modules):
-     res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
- def test_has_required_custom_salt_state(pytester):
-     pytester.makepyfile(
-         r"""
-diff --git a/tests/functional/test_sys_info.py b/tests/functional/test_sys_info.py
-index c8fbf6e..f18c85d 100644
---- a/tests/functional/test_sys_info.py
-+++ b/tests/functional/test_sys_info.py
-@@ -1,9 +1,11 @@
- """
- Tests related to system information reports enabled by the `--sys-info` flag..
- """
-+import sys
- import pytest
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
- @pytest.mark.parametrize("flag", ["--sysinfo", "--sys-info"])
- def test_sysinfo(pytester, flag):
-     pytester.makepyfile(
-@@ -27,6 +29,7 @@ def test_sysinfo(pytester, flag):
-     )
- 
- 
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
- def test_no_sysinfo(pytester):
-     pytester.makepyfile(
-         """
-diff --git a/tests/integration/factories/cli/test_salt.py b/tests/integration/factories/cli/test_salt.py
-index 9c4fdb0..0766fe7 100644
---- a/tests/integration/factories/cli/test_salt.py
-+++ b/tests/integration/factories/cli/test_salt.py
-@@ -14,6 +14,7 @@ def salt_minion_2(salt_master, salt_minion):
-         yield factory
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
-     ret = salt_cli.run("test.ping", minion_tgt="*")
-     assert ret.returncode == 0, ret
-@@ -24,6 +25,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
-     assert ret.data[salt_minion_2.id] is True
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_merged_json_out_disabled(salt_cli, salt_minion, salt_minion_2):
-     ret = salt_cli.run("test.ping", minion_tgt="*", merge_json_output=False)
-     assert ret.returncode == 0, ret
-diff --git a/tests/integration/factories/daemons/api/test_api.py b/tests/integration/factories/daemons/api/test_api.py
-index d6fd060..aade16e 100644
---- a/tests/integration/factories/daemons/api/test_api.py
-+++ b/tests/integration/factories/daemons/api/test_api.py
-@@ -19,5 +19,6 @@ def salt_api(master):
-         yield factory
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_api(salt_api):
-     assert salt_api.is_running()
-diff --git a/tests/integration/factories/daemons/api/test_restarts.py b/tests/integration/factories/daemons/api/test_restarts.py
-index bfab01f..0494ebb 100644
---- a/tests/integration/factories/daemons/api/test_restarts.py
-+++ b/tests/integration/factories/daemons/api/test_restarts.py
-@@ -12,6 +12,7 @@ def master(salt_factories):
-         yield factory
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_multiple_start_stops(master):
-     factory = master.salt_api_daemon()
-     assert factory.is_running() is False
-diff --git a/tests/integration/factories/daemons/master/test_master.py b/tests/integration/factories/daemons/master/test_master.py
-index 6ae19f0..b93f773 100644
---- a/tests/integration/factories/daemons/master/test_master.py
-+++ b/tests/integration/factories/daemons/master/test_master.py
-@@ -1,3 +1,4 @@
-+import sys
- import pytest
- import salt.defaults.exitcodes
- from pytestshellutils.exceptions import FactoryNotStarted
-@@ -48,10 +49,12 @@ def salt_call(minion):
-     return minion.salt_call_cli()
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_master(master):
-     assert master.is_running()
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_salt_run(master, salt_run):
-     max_open_files_config_value = master.config["max_open_files"]
-     ret = salt_run.run("config.get", "max_open_files")
-@@ -117,6 +120,7 @@ def test_state_tree(master, salt_call, minion):
-         assert ret.returncode == 0
- 
- 
-+@pytest.mark.skip("not compatible with sandbox")
- @pytest.mark.skip_on_salt_system_install
- def test_salt_key(minion, minion_3, salt_key):
-     ret = salt_key.run("--list-all")
-@@ -131,6 +135,7 @@ def test_salt_key(minion, minion_3, salt_key):
- 
- @pytest.mark.skip_on_windows
- @pytest.mark.skip_on_salt_system_install
-+@pytest.mark.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
- def test_exit_status_unknown_user(salt_factories):
-     master = salt_factories.salt_master_daemon("set-exitcodes", overrides={"user": "unknown-user"})
-     with pytest.raises(FactoryNotStarted) as exc:
-diff --git a/tests/integration/factories/daemons/master/test_restarts.py b/tests/integration/factories/daemons/master/test_restarts.py
-index 683970a..443dcfb 100644
---- a/tests/integration/factories/daemons/master/test_restarts.py
-+++ b/tests/integration/factories/daemons/master/test_restarts.py
-@@ -11,6 +11,7 @@ def master(salt_factories):
-     return factory
- 
- 
-+@pytest.mark.skip("not compatible with network")
- def test_multiple_start_stops(master):
-     assert master.is_running() is False
-     pid = None
-diff --git a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
-index a6c6420..10626cd 100644
---- a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
-+++ b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
-@@ -28,6 +28,7 @@ def salt_call_cli(minion):
-     return minion.salt_call_cli()
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_event_listener_engine(minion, salt_call_cli, event_listener):
-     """
-     There are some events which the minion fires internally that never reach the master.
-diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py
-index 387e789..1e4ecfd 100644
---- a/tests/integration/factories/daemons/minion/test_minion.py
-+++ b/tests/integration/factories/daemons/minion/test_minion.py
-@@ -27,6 +27,7 @@ def salt_call_cli(minion):
-     return minion.salt_call_cli()
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_minion(minion, salt_cli):
-     assert minion.is_running()
-     ret = salt_cli.run("test.ping", minion_tgt=minion.id)
-@@ -34,6 +35,7 @@ def test_minion(minion, salt_cli):
-     assert ret.data is True
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_no_match(minion, salt_cli):
-     assert minion.is_running()
-     ret = salt_cli.run("test.ping", minion_tgt="minion-2")
-@@ -41,6 +43,7 @@ def test_no_match(minion, salt_cli):
-     assert not ret.data
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_show_jid(minion, salt_cli):
-     assert minion.is_running()
-     ret = salt_cli.run("--show-jid", "test.ping", minion_tgt=minion.id)
-@@ -48,6 +51,7 @@ def test_show_jid(minion, salt_cli):
-     assert ret.data is True
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_minion_salt_call(minion, salt_call_cli):
-     assert minion.is_running()
-     ret = salt_call_cli.run("test.ping")
-@@ -59,6 +63,7 @@ def test_minion_salt_call(minion, salt_call_cli):
-     assert ret.data is True
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
-     ret = salt_call_cli.run(
-         "test.raise_exception", "OSError", "2", "No such file or directory", "/tmp/foo.txt"
-@@ -66,6 +71,7 @@ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
-     assert ret.returncode == 1, ret
- 
- 
-+@pytest.mark.skip("not compatible with sandbox")
- def test_state_tree(minion, salt_call_cli):
-     sls_contents = """
-     test:
-diff --git a/tests/integration/factories/daemons/minion/test_restarts.py b/tests/integration/factories/daemons/minion/test_restarts.py
-index ab1f044..4ac417d 100644
---- a/tests/integration/factories/daemons/minion/test_restarts.py
-+++ b/tests/integration/factories/daemons/minion/test_restarts.py
-@@ -10,6 +10,7 @@ def master(salt_factories):
-         yield factory
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_multiple_start_stops(master):
-     factory = master.salt_minion_daemon(random_string("minion-"))
-     assert factory.is_running() is False
-diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
-index 1c58628..807cbe7 100644
---- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py
-+++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
-@@ -36,6 +36,7 @@ def salt_call_cli(proxy_minion):
-     return proxy_minion.salt_call_cli()
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_proxy_minion(proxy_minion, salt_cli):
-     assert proxy_minion.is_running()
-     ret = salt_cli.run("test.ping", minion_tgt=proxy_minion.id)
-@@ -43,6 +44,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
-     assert ret.data is True
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_no_match(proxy_minion, salt_cli):
-     assert proxy_minion.is_running()
-     ret = salt_cli.run("test.ping", minion_tgt="proxy-minion-2")
-@@ -50,6 +52,7 @@ def test_no_match(proxy_minion, salt_cli):
-     assert not ret.data
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_show_jid(proxy_minion, salt_cli):
-     if platform.is_darwin() and sys.version_info[:2] == (3, 7):
-         pytest.skip(
-@@ -62,6 +65,7 @@ def test_show_jid(proxy_minion, salt_cli):
-     assert ret.data is True
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
-     assert proxy_minion.is_running()
-     ret = salt_call_cli.run("test.ping")
-@@ -73,6 +77,7 @@ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
-     assert ret.data is True
- 
- 
-+@pytest.mark.skip("not compatible with sandbox")
- def test_state_tree(proxy_minion, salt_call_cli):
-     sls_contents = """
-     test:
-diff --git a/tests/integration/factories/daemons/proxy/test_restarts.py b/tests/integration/factories/daemons/proxy/test_restarts.py
-index a243c6d..7758c96 100644
---- a/tests/integration/factories/daemons/proxy/test_restarts.py
-+++ b/tests/integration/factories/daemons/proxy/test_restarts.py
-@@ -16,6 +16,7 @@ def master(salt_factories):
-         yield factory
- 
- 
-+@pytest.mark.skip("not compatible with sandbox")
- def test_multiple_start_stops(master):
-     factory = master.salt_proxy_minion_daemon(random_string("proxy-minion-"))
-     assert factory.is_running() is False
-diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
-index 37e2449..73ac893 100644
---- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py
-+++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
-@@ -51,6 +51,7 @@ def salt_ssh_cli(sshd, salt_factories, master):
- 
- 
- @pytest.mark.skip_on_windows
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_salt_ssh(salt_ssh_cli):
-     ret = salt_ssh_cli.run("--ignore-host-keys", "test.echo", "It Works!", minion_tgt="localhost")
-     assert ret.returncode == 0
-diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py
-index 3b425fc..3e03636 100644
---- a/tests/integration/factories/daemons/sshd/test_sshd.py
-+++ b/tests/integration/factories/daemons/sshd/test_sshd.py
-@@ -5,6 +5,7 @@ import pytest
- 
- @pytest.fixture(scope="module")
- @pytest.mark.skip_if_binaries_missing("sshd", "ssh-keygen")
-+@pytest.mark.skip("not compatible with network-sandbox")
- def sshd(salt_factories):
-     # Set StrictModes to no because our config directory lives in /tmp and those permissions
-     # are not acceptable by sshd strict paranoia.
-@@ -15,12 +16,14 @@ def sshd(salt_factories):
- 
- 
- @pytest.mark.skip_on_windows
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_sshd(sshd):
-     assert sshd.is_running()
- 
- 
- @pytest.mark.skip_on_windows
- @pytest.mark.skip_if_binaries_missing("ssh")
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_connect(sshd):
-     cmd = subprocess.run(
-         [
-diff --git a/tests/integration/utils/saltext/test_log_handlers.py b/tests/integration/utils/saltext/test_log_handlers.py
-index 6d5b9c0..edc5b5a 100644
---- a/tests/integration/utils/saltext/test_log_handlers.py
-+++ b/tests/integration/utils/saltext/test_log_handlers.py
-@@ -24,6 +24,7 @@ def salt_cli(master):
-     return master.salt_cli()
- 
- 
-+@pytest.mark.skip("Not compatible with sandbox")
- def test_logs_forwarded_from_sub_processes(salt_cli, minion, caplog):
-     assert minion.is_running()
- 
-diff --git a/tests/scenarios/examples/test_echoext.py b/tests/scenarios/examples/test_echoext.py
-index 238a442..d827467 100644
---- a/tests/scenarios/examples/test_echoext.py
-+++ b/tests/scenarios/examples/test_echoext.py
-@@ -1,6 +1,8 @@
- from saltfactories import CODE_ROOT_DIR
- 
-+import pytest
- 
-+@pytest.mark.skip("Incompatible with sandbox")
- def test_echoext(extension_venv):
-     extension_path = CODE_ROOT_DIR.parent.parent / "examples" / "echo-extension"
-     with extension_venv(extension_path) as venv:
diff --git a/dev-python/python-varlink/Manifest b/dev-python/python-varlink/Manifest
index 848174b02c67..4d8869b0c932 100644
--- a/dev-python/python-varlink/Manifest
+++ b/dev-python/python-varlink/Manifest
@@ -1,4 +1,6 @@
 AUX python-varlink-30.3.1-fix.py3.10.patch 875 BLAKE2B e5b20de19382359afa9d51931b30f06f13bcf4c917d90b7ebc941d4c126df0f9a20282e78b5377163633dddc44f248ccd08b3c224a27dce00cc90ef92461acac SHA512 c8dd7f4d4e79e7a5cbdf377d29b997b92dbd8c5ed455bf790c9c1dd6cd31389dada7890aed99b5083ca0e7c30cdfbdc6f63eba917c04653ef9421ee8b6359b9c
 DIST python-varlink-30.3.1.gh.tar.gz 39921 BLAKE2B d717eb662cd14fffd7620fb8f3eee5ae8431b77a437a783ba090802a26d0225439eb9305050863c85a6c33dbdd28709262858bf407a08333b177057304695c93 SHA512 13a0176694ee31121998a2dd88bf57d840ec20b0ccac63b574c4f12ef5c9bfbfbd67bdc7a8d362cd1c256e393d8c3691d1efc58aabaf8f5ec26067a55157a6cd
-EBUILD python-varlink-30.3.1.ebuild 746 BLAKE2B d3c8f41ae98a3974af77ac91f81df086e993f3461d286437010ddcdffcd2e98cf7e43590d74955e91bb4d07dc8541a4fc420eb66ae99c8dae3d14aa746404092 SHA512 2de61e56810c33e6d350f9d46665a1cb6abeb4dcdb6f270e845bbb37fed46ede9cd3ee1d8125a3cbb7b825a4c6c893ff6bfd9f0cd9ddca001a18b552626a0dbe
-MISC metadata.xml 393 BLAKE2B 06d0de45e66536eceec5e2cd48b3e48fc11178b8d3a79ef407899c1b24f27954ba3ddfce8ba075c9ed8ab1538294d3ada50c15c7730fcf41d0aed4414ceb08f8 SHA512 2ce90a13fa455845a13d08369181b9201629f9d104e6f6243896bef912c5165758e9cd70061505a9ab068e0ef1fafe4e1e2ec9403715a024423779df6f2dbc27
+DIST python-varlink-31.0.0.gh.tar.gz 41003 BLAKE2B 3ffe5808ed130d09beabe545ff3437b6f91d74a35a7bf2a72eca854c77c7f8992f6d59c9f73428356cbb98f95b0af2950afd3bf3c6f9955b4f2b12524903d2c6 SHA512 3b8a9479c78a73793d56854b008fca7d041044314b6cf424326f9429c480b0b8561075ce6fa282c92b79ce75c2ec941249a65e9fb6a995510ede9dc064d6dcab
+EBUILD python-varlink-30.3.1-r1.ebuild 699 BLAKE2B 1637237e2d4e8bb16768918cb9e6e8f16cffd8ec76e7f65ef2c7c3c36c67331ebb99033c6d7b4f0c47dcbde73add76108b9968a98608ede9dbbe8632e7907405 SHA512 e9efcaaa947515eee58d6eeee001c9ccbec66fe8ed7be36f234b183b3949d63fd837d9824cb48d82c230099bb7c7de1bc812202dc4e0c4a0902adabc754b6ee2
+EBUILD python-varlink-31.0.0.ebuild 647 BLAKE2B 25e0c9c5b5d6287dd2976cb650bb3aa97993dc6bfcda646cd257b51f0b607f794498ea1cf644f692977baf5cfb57e9a880c190d9df0d2d2622dfea43bdad1b61 SHA512 996b87e71497efe007a44c818783f5f4b2561c521f812b2abe498926e14a7c28cdd70187842a90838c6ca829b964285d2d984c190ee70623792479cd40526227
+MISC metadata.xml 494 BLAKE2B 7045c18caa4400bf533bbd675bf1f464556ddc2bf6fbdd828d103a8dc81bc5b191a4c5743ad8f76f709cb4bc164309e6a6088f37101ab6ab01c38e3735d3ee74 SHA512 3b1fbace1f56b6a3dd68ff8d224de0ad1ba13d8f77706de44864f940e5cceee86167eb2bbbf7e663281867a71179eb17a2aab329223dccddadacbb685a3fb120
diff --git a/dev-python/python-varlink/metadata.xml b/dev-python/python-varlink/metadata.xml
index fbcf60a1185c..83e6fff6c697 100644
--- a/dev-python/python-varlink/metadata.xml
+++ b/dev-python/python-varlink/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">varlink</remote-id>
diff --git a/dev-python/python-varlink/python-varlink-30.3.1.ebuild b/dev-python/python-varlink/python-varlink-30.3.1-r1.ebuild
index 9a04cf6dc26a..9d30c702c39a 100644
--- a/dev-python/python-varlink/python-varlink-30.3.1.ebuild
+++ b/dev-python/python-varlink/python-varlink-30.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,8 +18,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-
 PATCHES=(
 	"${FILESDIR}/${P}-fix.py3.10.patch"
 )
diff --git a/dev-python/python-varlink/python-varlink-31.0.0.ebuild b/dev-python/python-varlink/python-varlink-31.0.0.ebuild
new file mode 100644
index 000000000000..9d6572de9555
--- /dev/null
+++ b/dev-python/python-varlink/python-varlink-31.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Varlink protocol"
+HOMEPAGE="
+	https://github.com/varlink/python/
+	https://pypi.org/project/varlink/
+"
+SRC_URI="
+	https://github.com/varlink/python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/python-zeroconf/Manifest b/dev-python/python-zeroconf/Manifest
index 96c71813f842..b4f44785bb6d 100644
--- a/dev-python/python-zeroconf/Manifest
+++ b/dev-python/python-zeroconf/Manifest
@@ -2,8 +2,10 @@ DIST python-zeroconf-0.39.4.gh.tar.gz 137174 BLAKE2B 9e7d66bec5ebb52754c5a45fd58
 DIST python-zeroconf-0.44.0.gh.tar.gz 149523 BLAKE2B 544187ad7baff6ea7a13b3ee3a51e6c19d872f006df3727900cad588febab0b86218c31c689203d3b674eed8ca67f0c9b39f83efec255696fa8405a00551edc8 SHA512 4190ca1d892dcbe5e5020c15a18cf1db80e7623798b64ba45b18dbfb5dd624e7851026f99aec14547b037927c06b7d9186e44cb4790e47613cb16c0cde3c067d
 DIST python-zeroconf-0.45.0.gh.tar.gz 150493 BLAKE2B 63cbeba55c67ac9d7c7b24257da7814b13e6d23f4fc195b755e7bbdf0d624ccaa1da6214abb0715ceb3949794bcac60d43b5c5dfe7da020d62baf870d6af0a07 SHA512 06a0cdc8b3038b0cff9f2d43592ded6df46c79c6fe2669eede052ed1f280b3a3c85db2e97109e619c5d1d4641792d4e3e4b7e0f1d28886e743f2c776c23c0a64
 DIST python-zeroconf-0.47.0.gh.tar.gz 151011 BLAKE2B ec80dd708671fb90df119cfaf6c7a73bd1ae826ec305659df810c2960b961a1f8350f0c529017bebbb43c19bb2a81bee8fcecfc01e7323a9508d95ae36979347 SHA512 b1f56fb7474ea8b394f91e1bbef5dc2606ef8e59d4a1d15b4ff5c5152909b12a29b52352729a26641accc6fe033ecade2a0881ac7b0944852439659ed50adead
+DIST python-zeroconf-0.47.1.gh.tar.gz 151191 BLAKE2B 30cbda51b533519b9affe52d73c96fb60d6eb4d882791729a021b41e48974ac14bac46c1ea9030d792587eb09104670b38f1000192aa202ec7e793a5f79b08cc SHA512 abb74fa3e05b962b6b93ff9df58f2bb3e029d74ca03aaebd38ee716b204ec8b8af665c97f7b9fbbf998767c9308ab7d900f39a92fae4224d5689ecbe229c01d5
 EBUILD python-zeroconf-0.39.4.ebuild 1364 BLAKE2B a14f806f42e6b62debc6cd32df0202bd904438e8a1d082e2aea43f761e36feace947b272ad22abba640f926c980db093ce20287fbffa62a26b210f107f3191d6 SHA512 5d39afd5d0aa32e424d4c6f63e2ef45585482f80b834410121eee48d23a493af43df2ff46142786d8912804cd2dd88cfd216a71c06ca42cf203eb8ec0c072524
 EBUILD python-zeroconf-0.44.0.ebuild 1665 BLAKE2B 435d08aa7b5ee7b059055f5e9c1a96338717f1231ab9a21f449628f5dcaef5b06e779c37c183ddff0741cba1ce0e9490cf4acac3a82113bc8f626ff85a033772 SHA512 e57fe0013b4855ef2a6293dc2332a02f9d85e5762445653903a5cd7d2a17401bfd59ad884687250361b113e746a78fbc3ba1437384a2a0a90a022bd966668273
 EBUILD python-zeroconf-0.45.0.ebuild 1665 BLAKE2B 435d08aa7b5ee7b059055f5e9c1a96338717f1231ab9a21f449628f5dcaef5b06e779c37c183ddff0741cba1ce0e9490cf4acac3a82113bc8f626ff85a033772 SHA512 e57fe0013b4855ef2a6293dc2332a02f9d85e5762445653903a5cd7d2a17401bfd59ad884687250361b113e746a78fbc3ba1437384a2a0a90a022bd966668273
 EBUILD python-zeroconf-0.47.0.ebuild 1665 BLAKE2B 435d08aa7b5ee7b059055f5e9c1a96338717f1231ab9a21f449628f5dcaef5b06e779c37c183ddff0741cba1ce0e9490cf4acac3a82113bc8f626ff85a033772 SHA512 e57fe0013b4855ef2a6293dc2332a02f9d85e5762445653903a5cd7d2a17401bfd59ad884687250361b113e746a78fbc3ba1437384a2a0a90a022bd966668273
+EBUILD python-zeroconf-0.47.1.ebuild 1665 BLAKE2B 435d08aa7b5ee7b059055f5e9c1a96338717f1231ab9a21f449628f5dcaef5b06e779c37c183ddff0741cba1ce0e9490cf4acac3a82113bc8f626ff85a033772 SHA512 e57fe0013b4855ef2a6293dc2332a02f9d85e5762445653903a5cd7d2a17401bfd59ad884687250361b113e746a78fbc3ba1437384a2a0a90a022bd966668273
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/python-zeroconf/python-zeroconf-0.47.1.ebuild b/dev-python/python-zeroconf/python-zeroconf-0.47.1.ebuild
new file mode 100644
index 000000000000..071363ef01ef
--- /dev/null
+++ b/dev-python/python-zeroconf/python-zeroconf-0.47.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+SRC_URI="
+	https://github.com/python-zeroconf/python-zeroconf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-python/python3-xapp/Manifest b/dev-python/python3-xapp/Manifest
index 159cb75428e7..83cad38d9f66 100644
--- a/dev-python/python3-xapp/Manifest
+++ b/dev-python/python3-xapp/Manifest
@@ -1,5 +1,5 @@
 DIST python3-xapp-2.2.2.tar.gz 20872 BLAKE2B 72bfd020477382480a5cf007107a197a86bd96c886b54440bee5eb0cf124294feac01c04dee24525d892cc5e701abf4e64753f2bff09d417e9e18ee314eb57a4 SHA512 d4aac6949bfe4adfe5fdb08edb80e622ccf04c2d571760aec280b43ff26b246c0d8f09eda6d7281381bf3a367002a7cce780664eb1f9933db6e9f63084d99def
 DIST python3-xapp-2.4.0.tar.gz 20787 BLAKE2B e225ad100119f90813b0f7657832bb186675542b3476beec639ff4e0771f4c00629c5d297a2ca0392fbd630066ba0a95a6f8553bd01a9f2df18752536a513127 SHA512 7c9afabbc810ffe878e831f7e1ff585ce49abc6d1db3d4ea70deb6630e2bb18f61ded31ae0e075cccae2283cac50b3440204a586f844ba9ee9cfbcb572bf7573
 EBUILD python3-xapp-2.2.2.ebuild 548 BLAKE2B fd00ec394ee82f35d8207f577e104f83e611c25f6afa39f1154c89598f77ea4c206b03a5fb3f88ac58af1f7a3124346a356b8ce50c737317ddcb9a8add87008b SHA512 febdf18e22483005198c001ab7159e7c38adf75dfc67a18e0a7a9a1c7eadefcd3c2058b013b4a7158950d70cc57a2a3576b14408de0f2bd750f3ffb8a5d93d3a
-EBUILD python3-xapp-2.4.0.ebuild 1108 BLAKE2B 06e4436db99dbe15d04df1c2209eb36744c7d351bd3f7bf1fa67d6144ba0c0c93a24cd255e90395950e475cdf9841dff9777b34dfb13490ab970f4e749d02ae7 SHA512 2c0319b195f9837ef1a9afb3a009a1a10ce6f9e0b6c228f3cbab0a7919f6f9f543ee1a04a52301b9f3fca39352c1e92574027e607f0a0d8da461cfff8e5b7c00
+EBUILD python3-xapp-2.4.0-r1.ebuild 1163 BLAKE2B c80247969e989c3aab85548353d9b1baf6649be0a1a2460490c446b2015ec1e637925ddf3738ad87033c2ff23c2b3bfcd216ce0586ff8251c4c7ef941be0daab SHA512 c5f08f056806f497487e84cd58f7ac460659ffbf28488abb0ca972f3c643598775c347fadf11638a556a657df559100c5350ff82afc5f607f0f36a5be4a338a4
 MISC metadata.xml 516 BLAKE2B e9429fe1f541d1763f644fb18fbef2bef3e105e943a7099792951a63a38c0083ae35e64160233ab48a8556d5bba96ad9031dc09fcdcf24033494d222e25a9cfa SHA512 b23a2d82ecbdb03abce2b3c40579c6aec5caad09b556c513600ded65d21ab56949ffe1eae0b04238f79c9e3c5c95a66a263e23281fcc2d16978c6a787e53c813
diff --git a/dev-python/python3-xapp/python3-xapp-2.4.0.ebuild b/dev-python/python3-xapp/python3-xapp-2.4.0-r1.ebuild
index b3eb90892128..762ca8e68990 100644
--- a/dev-python/python3-xapp/python3-xapp-2.4.0.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9,10,11} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson python-r1
 
@@ -27,7 +27,7 @@ RDEPEND="
 "
 
 src_prepare() {
-	echo "option('python', type: 'string', value: 'python3')" >> meson_options.txt
+	echo "option('python', type: 'string', value: 'python3')" >> meson_options.txt || die
 	sed -i "s/find_installation('python3')/find_installation(get_option('python'))/" meson.build || die
 	default
 }
@@ -44,6 +44,10 @@ src_compile() {
 	python_foreach_impl meson_src_compile
 }
 
+src_test() {
+	python_foreach_impl meson_src_test
+}
+
 src_install() {
 	installing() {
 		meson_src_install
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index 4ff95848b0cd..f3feb98d7c89 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,3 +1,3 @@
 DIST pyxdg-rel-0.28.gh.tar.gz 75755 BLAKE2B ba6d0dd956b13b7722d48f3d8a4ffa73b17efd6b4db3e73f521de72338dfacf11301449445bc911657f45de1c849c6425a24e5523f67116d96c7f38aa7bf320b SHA512 e1a7c8675afa109495e3530d9acc59a17368723b03ff66ee502133fd383bbe11c9908d93b18fdad3b589d47225ff8bf6bb8cacc800b1c1f39059e1178dafc1b5
-EBUILD pyxdg-0.28.ebuild 693 BLAKE2B 7df93f2f8736ea99eee119054a0b769c5b03c2d08b0f8ccb9ebee421b8816eb7cf163fca34a64085a98e28a331fb53fbf10fc4710317a5a9f6ca5c901aa3a99f SHA512 498ea9de6dfead7f87f960e37c381e3523a1fbf71df16cc5048c0f695b42d534fcbbeccb3b6c609a55067f23022d09f8b02b7423bb44c5e2a21d8a1055115ba4
-MISC metadata.xml 512 BLAKE2B e38fd5500a695c43f16e4e4a2486565fa2fa6cd22bce3ccce7a4d1870e1f831fef84dbacf53b7a7535328230d5861f263fe720ff8578a86b21ae0cf80efc78ad SHA512 6503d2ab184a0a8510f11ad262edc435500e29ec6cd3bc62c67501b6c44a2e5a1207cb34c686e3d3d92e7838a9e03cca5cf69c699b4c97c5470b8cc9b2fc65c9
+EBUILD pyxdg-0.28.ebuild 652 BLAKE2B c8a4b91ecf57a0f3539bd000b6ec074b5ec0b567c9590bbc411d90c9d08d9465bce710ad9663cc2ae492e960410a6a3e92e813d2012324f90de307fafb039d8e SHA512 7e0fff554cf096491be40600baebc388b7c0c66bdeef103eef7b456dd8a62c116d94f88c040c1670da7671050609a8524c647c9d550c7ba053257b5a2df7854b
+MISC metadata.xml 632 BLAKE2B ccea5b9635800df81a1e0d99f3dad3f717b83d125c72299d4987d67df4835acf93b2cf4b1c42180bb6c068a7f122f643dde11c3f9fe8bd30dfa265dc7f1ac920 SHA512 625f45990e79a60e795e6d9d2cd1aacff2b550284beecd804d2adf91679aac261cc542a9160c491891e9f5573afaf6f23f3679144ec6b945a4572e9c7d9153ca
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
index 7bcc4753878b..080249569b44 100644
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/metadata.xml
@@ -11,5 +11,7 @@
     <bugs-to>https://bugs.freedesktop.org/</bugs-to>
     <remote-id type="pypi">pyxdg</remote-id>
     <remote-id type="launchpad">pyxdg</remote-id>
+    <remote-id type="github">takluyver/pyxdg</remote-id>
+    <remote-id type="freedesktop-gitlab">xdg/pyxdg</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyxdg/pyxdg-0.28.ebuild b/dev-python/pyxdg/pyxdg-0.28.ebuild
index 341a02c6ec8d..8ba0b2d37643 100644
--- a/dev-python/pyxdg/pyxdg-0.28.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.28.ebuild
@@ -12,7 +12,6 @@ MY_P="${PN}-rel-${PV}"
 DESCRIPTION="A Python module to deal with freedesktop.org specifications"
 HOMEPAGE="
 	https://freedesktop.org/wiki/Software/pyxdg/
-	https://cgit.freedesktop.org/xdg/pyxdg/
 	https://pypi.org/project/pyxdg/
 "
 SRC_URI="
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 5b06205fe169..b2a9d4eb2eb5 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,3 +1,5 @@
 DIST weasyprint-57.1.tar.gz 429652 BLAKE2B c94cc05f6c3b831d3214d7476e3fa799ff62d8fb575044a6f11172e650a87b1277e21fef40577bb01a1a778982a98e1a57801de708b3a3a26520b50aae8b43ac SHA512 0a130fba07d1d73eb4e9dcda27ab51ede45c440717f6fedb8d6aac09283244c366d36d85c2dac85995fbaebac21cf880a0cb684baaff3788af3eb6b4931c014b
+DIST weasyprint-57.2.tar.gz 429120 BLAKE2B c97ba3fb3eec431a7de9a1a8a440290005de11b11d4abac4dd993a7d2fc4c14e64bdf13b8f8c12d4ba4f94b2049e0b05c3fb950c8b204f446323038c9c471451 SHA512 11b9469d37820439b1d0dad0117dd1c9649011c71aabb0e27008b303e5c851215ce9f0b271da9a74d614e54cb23f9c6036b6e094016b5688f6b700fb7444338f
 EBUILD weasyprint-57.1.ebuild 1073 BLAKE2B 1b48999c7bd88003dc886fa463a025a27efda679fdfd0fd15bfa12fb4318ae0248d4218dffe4e5c44af5e9c9853db529ab61608a1862684b028627a0721c3af6 SHA512 8a0061e70bc1b64510774acf44ef79be5f0fdb560248ce574eeebdc0f7f907602453828b7ebd57dc8ed258adc2bcfee44d80c96b5a91d7138e5266c8a2da1d4e
+EBUILD weasyprint-57.2.ebuild 1074 BLAKE2B 1c6823ec2a16d76cb5f3cb02a1feb95a83268a1c4e4e8590747a372858ddbe943e027037ac2881c411481f33e683aaa385cc2fcb70ecb4a11e49dd7dee18f90a SHA512 95ba5efd514f2ae752d376891253bcd70ad5b53b5ffce183494c22a2623a41471ac73eb204ad4f7cdd4cfde048e238a6157d0f56efeaac71916f84609ae88899
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-57.2.ebuild b/dev-python/weasyprint/weasyprint-57.2.ebuild
new file mode 100644
index 000000000000..d6b0c790c834
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-57.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="
+	https://weasyprint.org/
+	https://github.com/Kozea/WeasyPrint/
+	https://pypi.org/project/weasyprint/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
+	>=dev-python/pydyf-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	x11-libs/pango
+"
+
+BDEPEND="
+	test? (
+		|| (
+			>=app-text/ghostscript-gpl-9.56.1-r3
+			<app-text/ghostscript-gpl-9.56.0
+		)
+		media-fonts/ahem
+		media-fonts/dejavu
+	)
+"
+
+distutils_enable_tests pytest