Adding metadata

54 files changed, 1005 insertions, 273 deletions

diff --git a/dev-python/Faker/Faker-15.3.1.ebuild b/dev-python/Faker/Faker-15.3.1.ebuild
deleted file mode 100644
index 0644addeefe7..000000000000
--- a/dev-python/Faker/Faker-15.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-15.3.2.ebuild b/dev-python/Faker/Faker-15.3.2.ebuild
deleted file mode 100644
index 0644addeefe7..000000000000
--- a/dev-python/Faker/Faker-15.3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-15.3.3.ebuild b/dev-python/Faker/Faker-15.3.3.ebuild
deleted file mode 100644
index 0644addeefe7..000000000000
--- a/dev-python/Faker/Faker-15.3.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 8d01b80088e1..4a8834b53d83 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,4 +1 @@
-DIST Faker-15.3.1.tar.gz 1598695 BLAKE2B 8c9d8ec18cf8505eb3ca00feb0e7cea78db2f6f5b8dd4b0a65cc600b0cf57a96c174a6f0f2f99f67dab873ad6afc63f858b5f0efe672583d055eb69d59a86104 SHA512 8dce318ee0e8959b7f7da4b5fda792476a7b4f8bc22a2acead29131e0f6c97fb0b84522cc2865264276f65606e8559ae3213f4671e4c701301845986920ecf9d
-DIST Faker-15.3.2.tar.gz 1598951 BLAKE2B 6f1c53933639a478aa6db933b26e326561b654cbb3d7182c7d8b1add50aaa4089ebf001553e95657baa2f434516148e40417c0265043d2a50f8e86c73556f82f SHA512 96489fd02cc16ff0a31a0f165805aa4508e2f3e04552f2008b92f211c8645e37ee23a8181838f851114906e2df0da19a95c38889e6afab5d1c7cf090a9235e17
-DIST Faker-15.3.3.tar.gz 1598995 BLAKE2B c6416f06b835b153a2e72967a4b65b962068d027dc35a95ebdd92175f8e6330ef07f3721ca5d6ba4bb85efdc54ecedf0663f458ec8fcedd489e2871c623af3de SHA512 371516d95941921f5180107beba633a40df719a38f6b752f38857be15ae7befcb602c1b3f16ccbbaa7e8aa2c6b158c70aea38a112d65234d334ce1f370c91b87
 DIST Faker-15.3.4.tar.gz 1599191 BLAKE2B 8fc26d35cbcde467123c8a5e15813351e65cf81a3640552115bdc55dff48b123e28b180e46595b80029dfdc0d3545b9e75b3f8c2deff380a6168aa2ab603ef2f SHA512 f9c50008c492a2aa8a7d7e62d0f404036cc9161baa3036f5948f607d4e971b34945401f565b3640eca71e7716fa5f2f3d82dd029f84f35dd4925e647638c0c56
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 7fe1778c8f3d..031010392171 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -2,3 +2,4 @@ DIST ansible-compat-2.2.1.tar.gz 39126 BLAKE2B c4d0512606c99ba8f07e0287620c94af6
 DIST ansible-compat-2.2.3.tar.gz 39603 BLAKE2B 16b88a1c669a74d858e4d47539811b33db77561f7e72088d5eece67ee1594e65a9328277bc65b96dce726180c29118b2b240b45541b6548b34584d643f836894 SHA512 4944ff97524734c445438c052aeedd0d526b58e91a56e0bcc32123fb3a9464c82f7718ea1897a09ef0dd33dfa36abdc6e0a0157e9a4eb8d341cbd712b2f538d1
 DIST ansible-compat-2.2.4.tar.gz 39772 BLAKE2B a4874675086956e11de4df4068e3b17b65b4f9f7610bb88bfba308d880fe478e39a4450a362bb06a555a36a41731f336c51756893ebe65715fc022421c51a293 SHA512 ec30329b2aa07ea7685a8cd91438f0d0e9003644fb3d15a842277abc7f5f1eeed61bb606ca594d6496e1980be0109dd5e4021bc4aeb66d909a312bf02649a1b9
 DIST ansible-compat-2.2.5.tar.gz 39794 BLAKE2B 25a5c858eb3e120b7f51b8800b01eff2482a03d0e5f5c049d4ff2bc96ab2c01e856284f3328d5c9e3621b2d769df4450c9427997b48a7ddd337b01aa777e0c28 SHA512 8029d6dbd093414fb5eccba1789c881601a3a1f45bf7779f9e2af886d457e9c57a4e6432eed73a1d387b4d82617e1677a857cf0d2dfdcebcefa0dc790b2ec2d4
+DIST ansible-compat-2.2.6.tar.gz 38890 BLAKE2B 5022676dca1c2cb24e8f3e3387de8ef214979124b6d4a819f6328b2ffa0b19bddc5ef60131eb0133d809a214ecdf39fb5c01b197a44111e05a23740d4955c00c SHA512 b02faeb0202839c01a777277cd077264b44fbadbef679e93cb4ac0be3b81df921bc8f000e27372446326976acd1b42f1f1f42896ff0af9ba0677e7a93d06b195
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild
new file mode 100644
index 000000000000..fe3835bdf820
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-2.2.6.ebuild
@@ -0,0 +1,56 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="
+	https://pypi.org/project/ansible-compat/
+	https://github.com/ansible/ansible-compat/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-plus[${PYTHON_USEDEP}]
+	)
+"
+
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+)
+
+distutils_enable_sphinx docs \
+	dev-python/ansible-pygments \
+	dev-python/myst_parser \
+	dev-python/sphinx_ansible_theme
+distutils_enable_tests pytest
diff --git a/dev-python/anyascii/Manifest b/dev-python/anyascii/Manifest
index 2181622c8cbd..47730721fca4 100644
--- a/dev-python/anyascii/Manifest
+++ b/dev-python/anyascii/Manifest
@@ -1 +1 @@
-DIST anyascii-0.3.1.tar.gz 8943636 BLAKE2B 0659ee933bb43e72f39106b799f03524f0a6e4d89b312aae497c62a43107984f6862a02603b82c08fbe2697a1f3835cad005979974df8d719215bd08d2ed0b6e SHA512 4f836dcb09bfec55b40068c962ebda535c7c7ab37ad0ce71021bedc0248f3a70ae46398df033704a3944cf9d645ac9aa03f4e8764791d5f576eacd449f426815
+DIST anyascii-0.3.1.tar.gz 212676 BLAKE2B fcb2c637a94308a8b144442012a29728a62738eff31e0c3f5db4adfea859868061215a5c045da0828e3783b44148b697ef73ab250780426b4428b2782d5f1168 SHA512 f6e6ef9bb48622bf5c6854551413ba97e90943e72c896e2dd4c43eed7e9aef731bd6fe76f2816f8a86bfa04de7a89c7188ead349499f055d8d243522e79ddde6
diff --git a/dev-python/anyascii/anyascii-0.3.1.ebuild b/dev-python/anyascii/anyascii-0.3.1.ebuild
index 6fe4b94329f7..f9d889781a0b 100644
--- a/dev-python/anyascii/anyascii-0.3.1.ebuild
+++ b/dev-python/anyascii/anyascii-0.3.1.ebuild
@@ -1,25 +1,46 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-# DISTUTILS_USE_PEP517=setuptools
-# inherit distutils-r1
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 inherit distutils-r1
 
 DESCRIPTION="Unicode to ASCII transliteration"
-HOMEPAGE="https://github.com/anyascii/anyascii/"
-SRC_URI="https://github.com/anyascii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/anyascii/
+"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/anyascii/anyascii.git"
+else
+	SRC_URI="https://files.pythonhosted.org/packages/source/a/anyascii/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
 
 LICENSE="ISC"
-KEYWORDS="~amd64"
 SLOT="0"
 
-DEPEND="
-	${PYTHON_DEPS}
-"
+distutils_enable_tests pytest
 
-S=${WORKDIR}/${P}/impl/python
+src_compile() {
+	if [[ ${PV} == *9999 ]]; then
+		pushd "${S}/impl/python" || die
+		distutils-r1_src_compile
+		popd || die
+	else
+		distutils-r1_src_compile
+	fi
+}
 
-distutils_enable_tests pytest
+src_install() {
+	if [[ ${PV} == *9999 ]]; then
+		pushd "${S}/impl/python" || die
+		distutils-r1_src_install
+		popd || die
+	else
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-python/anyascii/anyascii-9999.ebuild b/dev-python/anyascii/anyascii-9999.ebuild
new file mode 100644
index 000000000000..f9d889781a0b
--- /dev/null
+++ b/dev-python/anyascii/anyascii-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+inherit distutils-r1
+
+DESCRIPTION="Unicode to ASCII transliteration"
+HOMEPAGE="
+	https://pypi.org/project/anyascii/
+"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/anyascii/anyascii.git"
+else
+	SRC_URI="https://files.pythonhosted.org/packages/source/a/anyascii/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+distutils_enable_tests pytest
+
+src_compile() {
+	if [[ ${PV} == *9999 ]]; then
+		pushd "${S}/impl/python" || die
+		distutils-r1_src_compile
+		popd || die
+	else
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	if [[ ${PV} == *9999 ]]; then
+		pushd "${S}/impl/python" || die
+		distutils-r1_src_install
+		popd || die
+	else
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-python/anyascii/metadata.xml b/dev-python/anyascii/metadata.xml
index a6c454a946c6..720b45788024 100644
--- a/dev-python/anyascii/metadata.xml
+++ b/dev-python/anyascii/metadata.xml
@@ -2,9 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
+  <email>ran.dall@icloud.com</email>
+  <name>Randall T. Vasquez</name>
+ </maintainer>
+ <maintainer type="person">
   <email>pascal.jaeger@leimstift.de</email>
   <name>Pascal Jaeger</name>
  </maintainer>
- 
+ <upstream>
+  <bugs-to> https://github.com/anyascii/anyascii/issues&#34;</bugs-to>
+ </upstream>
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 8aadf56f9b64..256c6f26c9a5 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,4 +1,5 @@
 DIST boto3-1.26.11.gh.tar.gz 561018 BLAKE2B 3bd4ddd23d0752dcaad9795041658909f8df88eb75a89fd727866a25bd0e8a3106a497776c1be8e53274d85302d9185f9bb95b777efd89fed3f5a33edfe04fa1 SHA512 f31e15bf46fa4338418507840ac3961c06f3573502a71892a262bf24bfc38b4058888cccef1abc6e59859a9985f917c4463e698a1a92543519a8da3ff6221a67
 DIST boto3-1.26.16.gh.tar.gz 565753 BLAKE2B 7b30f4a3e15ca893cacca7ea58e18d654f3895e37b36e08e632b4da5a3e4b7225ad864daf60604b074973f90b38ca71afb3d28ed8f90172e78193ef9a1f626c0 SHA512 54d3a3bd551cd2018070144b956d5f5af8c84fb6c689647a39b42f03ea1f1fce3c1032d9c694851977aa498950011f28b7014d5e8c4091c2f771b2d2cb1c2714
 DIST boto3-1.26.18.gh.tar.gz 570818 BLAKE2B 2f77acbb6fa77c867cda0b1d7828c5aafdfc8b6e5d7cced4beda08f151c9ed889356ec32b4b0ad2724bffbaa20690f149caf69f89dfbf70761ca354893685cb7 SHA512 b67d62057c7c421eedbf8778c2bd10d9cad9a81678dfc68415cb5ca546182c418d1c8a6619d20be066d78891af7720ec29209fecd27628e1d456b04965edfb83
+DIST boto3-1.26.20.gh.tar.gz 572957 BLAKE2B 27286beaeabc0227376640fd3ee583656470ee324805ac716411a6c87fc2f301f6430c4f82e58c4a5371fe38a4cb3a6cebe32de39c0bae35f051fd340257c315 SHA512 4623e29b4396cd131e76ad44d24e32014e9f79642db471f64b5b06553ffbd0a0492883188e3658fe629e6af0a91b8274dbda3103a3ecf6d2dd6fe5b1a91b9503
 DIST boto3-1.26.8.gh.tar.gz 557012 BLAKE2B 211bb7441acc8b1f901ebf5251288dc7c9073fa6e34f5a34426424ef064efb0fb3031deaf48ef336ec43bb015f95f618598da43d12ec83cbf814e1b4097b28a0 SHA512 738190cedfb0b85d3a1e9558b03e7f2fb14e43b152bc9627fd95c8ecc4a0ddc17f4c87ccb6129c1fbf5f47db9eea4dbc5c2cfbb69b903bc6f3ff417ef86b6f6b
diff --git a/dev-python/boto3/boto3-1.26.20.ebuild b/dev-python/boto3/boto3-1.26.20.ebuild
new file mode 100644
index 000000000000..3d7d652a3b69
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.20.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_{7,8,9,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 d8c3f3ba26b2..e887120c903a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,4 +1,5 @@
 DIST botocore-1.29.11.gh.tar.gz 10660645 BLAKE2B 0d5f8a7e34f99947e1488b468699e682acf0077fcc9f3bfb87e00f4966571970e335964edeabb20b41e4f900aee8c5075a004e8e3b09ce7d04a38f4c729d3361 SHA512 f1e2d948b7123316084228b574c8d0a0cc7dac1e615edfc525f9f42e081bf87d107ec948b5f209a6013b37c0f9617d1e585ef602a1f76c106dbd2369ae6e4514
 DIST botocore-1.29.16.gh.tar.gz 10709321 BLAKE2B d9a8590b1685351f1167962fa45f97906554dead7ec72487f390a78cf5e0cbca933e4e2d6d147af9beb43f05299a771cfb5f6d76e58d44397eeb6240e8856167 SHA512 247c9800a24141cf970f02ae3c6436027c86677f1a287f24be4d85292add874465851b8a963dc49dffe103b1088e5120db18dc58d93f04285715f0b4fe08258e
 DIST botocore-1.29.18.gh.tar.gz 10837962 BLAKE2B c1d32b31ba687427f6c88e53dd4908d966b83d3d5d087b64e5370b7294d568a09dfe08e72e89acf8402dbf887369c509d1c7fcf77c5156ef9029319878e7311c SHA512 2e8e7108e343028cf6ff30fd9f6b66b8b49a2b3013656ee3fc912c67052a42eca49d93a57e322248dfce7cfa765c6bf4b78f364a71b843536853bc4f413e1930
+DIST botocore-1.29.20.gh.tar.gz 10956292 BLAKE2B 3453a1051056f8f6bc870c66b66d81b4f68dca97068ebb0beed286f3534798483254a0a3390e9b2ce07d25a01b35e81ceccc9c5f8cfd5bf18147931a9048e242 SHA512 c99e1cb4f0f55715d88ec8fe6602fef60254cacd9e2c1b309bfa1b8dfdc5c979c60f558b08f953afcc0985859091f4fad5c21e1906c177eaa8bc2dcd8216a3aa
 DIST botocore-1.29.8.gh.tar.gz 10636661 BLAKE2B 3ebd9e5cb6cc1a9d4ddb877e806e0a845e6a19a4604b4489dbdb9a0f35251201de5d7062f3b0193db3e28f5170d8c3315fdc0b2bec7668a61880ff3e9305d3bc SHA512 c4a1a3993576bd0340de4eeb25e10650219e9d74c21f7e51e5298120bc92a8359143c38d5a991b940316fc5eac483e4e838298881a5c068fa91dc3ebf92a7f5a
diff --git a/dev-python/botocore/botocore-1.29.20.ebuild b/dev-python/botocore/botocore-1.29.20.ebuild
new file mode 100644
index 000000000000..40131f66e350
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.20.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_{7,8,9,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/convertdate/convertdate-2.4.0.ebuild b/dev-python/convertdate/convertdate-2.4.0.ebuild
index 31362c97b175..a47875cb7b8a 100644
--- a/dev-python/convertdate/convertdate-2.4.0.ebuild
+++ b/dev-python/convertdate/convertdate-2.4.0.ebuild
@@ -20,5 +20,5 @@ RDEPEND="dev-python/pymeeus[${PYTHON_USEDEP}]"
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/myst-parser \
+	dev-python/myst_parser \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/django-bleach/Manifest b/dev-python/django-bleach/Manifest
index db9061a7e401..32cb9f0d5ce4 100644
--- a/dev-python/django-bleach/Manifest
+++ b/dev-python/django-bleach/Manifest
@@ -1 +1 @@
-DIST django-bleach-3.0.1.tar.gz 22219 BLAKE2B 34da4564ddf5318d1aac3b3debb5ce4c2e73fba5ddca168e5dea551dd0b569cb491c4cea1ae3be6b8b95874c71ef414350f4561bc3b9c4a41dff82608a63d94e SHA512 2801a9b39fd17aa5374264c693b2847bf0fee16ccbcb6d7e4b007c7707a728b1053094e474442dbd48afaa054de3b682210d5b24a7f237253144c8eced23ebd3
+DIST django-bleach-3.0.1.gh.tar.gz 28362 BLAKE2B 4f3dc2a591d939ba4a7cbf877a7e660a3c86572e002d0389cada406af625bb0a4f42aaa636289966880343e85a0281597570ce18f8a5d5afbe430b06a3bd882f SHA512 d9db28ce5bb13f0610267e6df22902bcc7e006367bca52536dcaa02dba7c1faaf9f128e75cbe5b9504132f1bc4addfcefd8fea64959514a95013ddcaab465ee1
diff --git a/dev-python/django-bleach/django-bleach-3.0.1.ebuild b/dev-python/django-bleach/django-bleach-3.0.1.ebuild
index 31e7d3ef7051..21e72f317000 100644
--- a/dev-python/django-bleach/django-bleach-3.0.1.ebuild
+++ b/dev-python/django-bleach/django-bleach-3.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://pypi.org/project/django-bleach/
 	https://github.com/marksweb/django-bleach
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/marksweb/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 9b31069cb06d..034a6f901a78 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,2 +1,3 @@
 DIST fakeredis-py-1.10.1.gh.tar.gz 91420 BLAKE2B a88711b5d167aafcf6a74dc538b809a0410c60bff95c82fe81c1236b743d9fc0cacbc9057bcd5df20ed87b22c12b2e9346342e0991556caa51f4e88038fabcb5 SHA512 2a139dde02c00e516959173fbfe5ecae26d20ee56158de9ae7bc57360dabc58e4e919f11ba7979079019d981af8a2cbd17a1d8ac795003e26a7cbcbedd5588a8
 DIST fakeredis-py-2.0.0.gh.tar.gz 112218 BLAKE2B 9bbbf76e6fe00a42d25c1688654906a71b93e65a20f3eca2b7d9fd13eedd48251e832e550b37dc82dcf5e65c686c408b291ba60d04c707df7d7d7f396f00190a SHA512 e291782f27cdfa11520eef3b0bbd0d68ec7479a4630ad1e5a38d8d1d28109049fee0288e104e74f72caf9b04db553cc24f22843bd170d8bdb5efc47b8e9f5d6e
+DIST fakeredis-py-2.1.0.gh.tar.gz 128595 BLAKE2B f0b2e8ed9ec4156702f4e65e683f40cf79e1fde12ac70b16388ba65e9e49c8f4c92ade6f02195cc3755768fb2858d7e4f8970f54fa728c9fb32ac8cc2f68fa4f SHA512 584a2a36185674d0fadedcc6018286c3edc8c36de730ac1cf09abcbe3b0cacf8dd0e4c964a7a0a053509dce0063f48ce13f122d230fbec9965af54c77b277ea5
diff --git a/dev-python/fakeredis/fakeredis-2.1.0.ebuild b/dev-python/fakeredis/fakeredis-2.1.0.ebuild
new file mode 100644
index 000000000000..4269c46b25ac
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.1.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index dea9ac331f4a..1b5f8f3d33a6 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,2 +1,3 @@
 DIST google-api-python-client-2.65.0.gh.tar.gz 36079173 BLAKE2B 32e60989dbc6e02ed2bd128772a71c24670d16da09ca4e5be6d4f56ebf16c94ccac120e233b4efb5fb9c9b8c464d052129eb6305a57fb61f732ca9d593f1297c SHA512 3b215e290c9a63aca914c08478342ab41ef760c135d3d5a13387be52a2993b814568c86cad752de6afe16fb3097989f4d7df06f4c9ce9c453fb7d0cb55f17053
 DIST google-api-python-client-2.66.0.gh.tar.gz 36477219 BLAKE2B 1da02e7747fd1421bdc62180103784af7b50ab0a672ac932f2fe28c22141a922d6f59d9c11ee74b78ff13583bdeee98d35f7b6d616af84fe99aa3d1a0de17342 SHA512 6b3cdf7279067080ff216d184f23c76c74c586e34b70afd936f1d10671fc0c7e7a8ba446a1ca5a9003bab2e3855e939376610ff4e45811fd6ead5e4942f62247
+DIST google-api-python-client-2.68.0.gh.tar.gz 37053945 BLAKE2B 7a73b80737b73198531207d203c2010969a9dbdd5012071944ec86bd6c2c63eb0a86bf2941a4c37544629aeae32b367cc8d9209300c63e8d1be39f32bef1d91f SHA512 9b70ad6f05d28198ee82984e263e770c995143770123a8aaeb605aad880464e951b8849bbed8c7cb511bd7beebed1df965fdd53b2e6a161905a0a2e481d5b68a
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.68.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.68.0.ebuild
new file mode 100644
index 000000000000..63e5333c4693
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.68.0.ebuild
@@ -0,0 +1,53 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/hunter/hunter-3.5.1.ebuild b/dev-python/hunter/hunter-3.5.1.ebuild
index dea30cc42ff5..e469c3ffc01d 100644
--- a/dev-python/hunter/hunter-3.5.1.ebuild
+++ b/dev-python/hunter/hunter-3.5.1.ebuild
@@ -57,6 +57,12 @@ src_unpack() {
 	mv -f "${TEST_S}"/tests/setup.py "${TEST_S}"/setup.py || die
 }
 
+src_prepare() {
+	default
+
+	find . -name '*.c' -delete || die "removing csources failed"
+}
+
 python_compile() {
 	distutils-r1_python_compile
 
diff --git a/dev-python/inscriptis/inscriptis-2.3.1.ebuild b/dev-python/inscriptis/inscriptis-2.3.1.ebuild
index d1fd36d52a2f..9095333784a3 100644
--- a/dev-python/inscriptis/inscriptis-2.3.1.ebuild
+++ b/dev-python/inscriptis/inscriptis-2.3.1.ebuild
@@ -28,5 +28,5 @@ DOCS=( AUTHORS {CONTRIBUTING,RENDERING}.md README.rst TODO.txt )
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
-	dev-python/myst-parser \
+	dev-python/myst_parser \
 	dev-python/alabaster
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index d77e37c59fe5..895916ee55f8 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,3 +1,4 @@
 DIST jsonschema-4.16.0.tar.gz 292399 BLAKE2B b1a78bc7dbc7cd10324638b57ebe4593afbdcbeb8d4b247aa127f41d5f6cce5e7970f5db1576e6a761357d8efe453ef514ae49f58b6624a05c4b7771daff3721 SHA512 c84abc992f410e9d558e2ce06c7172e9e2d298cff469baf8a23b1ea5b4777e6addfa757c5cc62b2e28e257721ee55e04bec0852e5f525adfa87392cbf712828f
 DIST jsonschema-4.17.0.tar.gz 293414 BLAKE2B 51910903a788c5fc0fea695f40ac26c886a88a6b97e653452d11ca9b4cbe18a24fe4c28a13705f77c16c1b2342f66ac86232f9ac7c578c94f23b725580e82b17 SHA512 a0160caea26527e5afbba48fea7f0700e8cd0bb5cbd9661501d34f5dd9857971ca3fd9982bc17f570d0b5a08eb5ecfd0e5182f78a0e0a6343621ed8360643166
 DIST jsonschema-4.17.1.tar.gz 296586 BLAKE2B 2d29abd1d27c216cb53363ea801f1a83aedfae66fc1cf90dd7b9cb4e9ce809e09819585a7e83c060dadc2a200c45036ec22cd35d4005757b4b8797f05daa207b SHA512 5d184ea60cf313c9fa6a3e1c2891432531aa7a25a5aced8e51aac46eb67fe7fd17bc9d141faa3e52a834f9067556225cfd3a592d80867b543f0dea42983e5d04
+DIST jsonschema-4.17.3.tar.gz 297785 BLAKE2B a0383bf5612ae50e94c95dbc1774d796b62c74a7aae3056a40edb7e042ad07fd7885e61d86220120a906a4017afe30d8ee8edbbf0cf01a6dec1f212984ff1c1e SHA512 626fc913c37d2e49e4b47c9e058aab4a96c1dc50c35d8def0b2ea0ca464dc25e3318d4fde4927c11ca38068743cd81779d5189464b821407ac1de1788bad30e2
diff --git a/dev-python/jsonschema/jsonschema-4.17.3.ebuild b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
new file mode 100644
index 000000000000..56118bd06760
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema/
+	https://github.com/python-jsonschema/jsonschema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+		dev-python/pkgutil_resolve_name[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+"
+
+# formatter deps
+RDEPEND+="
+	dev-python/fqdn[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/isoduration[${PYTHON_USEDEP}]
+	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3987[${PYTHON_USEDEP}]
+	dev-python/uri_template[${PYTHON_USEDEP}]
+	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires pip, does not make much sense for the users
+	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
+	# fragile warning tests
+	jsonschema/tests/test_deprecations.py
+	# wtf?
+	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
+)
diff --git a/dev-python/material-color-utilities/Manifest b/dev-python/material-color-utilities/Manifest
index 5a202bca65be..81cf2c70bf42 100644
--- a/dev-python/material-color-utilities/Manifest
+++ b/dev-python/material-color-utilities/Manifest
@@ -1 +1 @@
-DIST material-color-utilities-python-0.1.5.tar.gz 25702 BLAKE2B cf444831fec962caae3a1871b8331dcdd055f186754631185140842e49e1dc5526c5aedc021d28cd5e192e6f593774abce34e4a2853049e9ded2cf3ca9b79e3f SHA512 f3987da2723f9bc0a383d544868bd48b79c815c1ef3b601cf7daf711ae66ba2e20c38d272fff34b8fef724d202cdb71431d885d0fc86cf6b459a8735cd0751a4
+DIST material-color-utilities-0.1.5.tar.gz 25702 BLAKE2B cf444831fec962caae3a1871b8331dcdd055f186754631185140842e49e1dc5526c5aedc021d28cd5e192e6f593774abce34e4a2853049e9ded2cf3ca9b79e3f SHA512 f3987da2723f9bc0a383d544868bd48b79c815c1ef3b601cf7daf711ae66ba2e20c38d272fff34b8fef724d202cdb71431d885d0fc86cf6b459a8735cd0751a4
diff --git a/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild b/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild
index 32540a40b3c3..dc23268a8a1b 100644
--- a/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild
+++ b/dev-python/material-color-utilities/material-color-utilities-0.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,17 +7,29 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1
 
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
 DESCRIPTION="Python port of material-color-utilities used for Material You colors"
-HOMEPAGE="https://python-telegram-bot.org https://github.com/python-telegram-bot/python-telegram-bot"
-SRC_URI="https://files.pythonhosted.org/packages/source/${PN::1}/${PN}-python/${PN}-python-${PV}.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/material-color-utilities/
+"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/avanishsubbiah/material-color-utilities-python.git"
+else
+	SRC_URI="https://files.pythonhosted.org/packages/source/m/material-color-utilities-python/material-color-utilities-python-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/${MY_P}"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
 
-S=${WORKDIR}/${PN}-python-${PV}
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]"
 BDEPEND="
-	${PYTHON_DEPS}
-	dev-python/poetry-core
-"
+	dev-python/poetry-core[${PYTHON_USEDEP}]
+	dev-python/build[${PYTHON_USEDEP}]"
diff --git a/dev-python/material-color-utilities/material-color-utilities-9999.ebuild b/dev-python/material-color-utilities/material-color-utilities-9999.ebuild
index 055dcabf5866..dc23268a8a1b 100644
--- a/dev-python/material-color-utilities/material-color-utilities-9999.ebuild
+++ b/dev-python/material-color-utilities/material-color-utilities-9999.ebuild
@@ -1,21 +1,35 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 git-r3
+inherit distutils-r1
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Python port of material-color-utilities used for Material You colors"
-HOMEPAGE="https://python-telegram-bot.org https://github.com/python-telegram-bot/python-telegram-bot"
-EGIT_REPO_URI="https://github.com/avanishsubbiah/material-color-utilities-python"
+HOMEPAGE="
+	https://pypi.org/project/material-color-utilities/
+"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/avanishsubbiah/material-color-utilities-python.git"
+else
+	SRC_URI="https://files.pythonhosted.org/packages/source/m/material-color-utilities-python/material-color-utilities-python-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/${MY_P}"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]"
 BDEPEND="
-	${PYTHON_DEPS}
-	dev-python/poetry-core
-"
+	dev-python/poetry-core[${PYTHON_USEDEP}]
+	dev-python/build[${PYTHON_USEDEP}]"
diff --git a/dev-python/material-color-utilities/metadata.xml b/dev-python/material-color-utilities/metadata.xml
index a6c454a946c6..a31c67a0ad06 100644
--- a/dev-python/material-color-utilities/metadata.xml
+++ b/dev-python/material-color-utilities/metadata.xml
@@ -2,9 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
+  <email>ran.dall@icloud.com</email>
+  <name>Randall T. Vasquez</name>
+ </maintainer>
+ <maintainer type="person">
   <email>pascal.jaeger@leimstift.de</email>
   <name>Pascal Jaeger</name>
  </maintainer>
- 
+ <upstream>
+  <bugs-to>https://github.com/avanishsubbiah/material-color-utilities-python/issues&#34;</bugs-to>
+ </upstream>
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/mitype/mitype-0.2.4.ebuild b/dev-python/mitype/mitype-0.2.4.ebuild
index e581945ec1d7..928127b70233 100644
--- a/dev-python/mitype/mitype-0.2.4.ebuild
+++ b/dev-python/mitype/mitype-0.2.4.ebuild
@@ -15,12 +15,10 @@ SRC_URI="https://github.com/Mithil467/mitype/archive/refs/tags/v${PV}.tar.gz ->
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
+IUSE="test"
 
 RDEPEND="
-	doc? ( dev-python/sphinx )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 719ba22c29b3..3ef07f3a5b5c 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-material-8.5.10.gh.tar.gz 10384269 BLAKE2B 3f7837b17724e93fa28a906811a8695aacba9c479a13d4568775945aee3943b9f58e017ab71fb81da8c72073a471b736ca75bf721a786309fe822f5898e4d3aa SHA512 ed186b206ffe0b17c96a33270d83ffc3c98262eb608d6889101b6949057e7059642eb83b584f4a309afff64a359ee79625c5a95be62fc37ece069e2404faa0bd
+DIST mkdocs-material-8.5.11.gh.tar.gz 10423819 BLAKE2B 8af9b10fde57a6543d86dc8d6004cb100359e274072486094e7db4f8eeb7d44d83505d00b3f202f02e695a613ae8e2fdf08ac1b39584e7d9aeae430bb560d60a SHA512 7fdc06cf7f64a2831fe2acb05a735bc9519fdf109fbccd5ee1667d07175916fffb295ccfa88a4352a7a0688f0eaf535c26ab49463f672d964d4a87ad8de6ddf1
diff --git a/dev-python/mkdocs-material/files/mkdocs-material-8.5.7-simplify-build.patch b/dev-python/mkdocs-material/files/mkdocs-material-8.5.7-simplify-build.patch
index ac696c40710f..b731b9a37be8 100644
--- a/dev-python/mkdocs-material/files/mkdocs-material-8.5.7-simplify-build.patch
+++ b/dev-python/mkdocs-material/files/mkdocs-material-8.5.7-simplify-build.patch
@@ -2,15 +2,6 @@ diff --git a/pyproject.toml b/pyproject.toml
 index c5bd914c0..3757e983b 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -19,7 +19,7 @@
- # IN THE SOFTWARE.
- 
- [build-system]
--requires = ["hatchling", "hatch-requirements-txt", "hatch-nodejs-version>=0.3.0"]
-+requires = ["hatchling"]
- build-backend = "hatchling.build"
- 
- [project]
 @@ -55,13 +55,7 @@ tags = "material.plugins.tags.plugin:TagsPlugin"
  material = "material"
  
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
new file mode 100644
index 000000000000..88937f70d568
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.5.11.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'"> gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 9cd23a1aad29..e140084e4c69 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,3 +1,4 @@
 DIST moto-4.0.10.tar.gz 2501634 BLAKE2B 02fcd7e4f77589a8cae459d74832d72c8835e4357533023803733e3dfad30a44f264356c5dbb0f535ef441384692b4dafbfe33ef9a9e7077f1c61b342c61fa99 SHA512 f8d9817d8b10eb1a2f87d41453f8e3facfa1075a330cb44b46a1306105c059fcf6d9bf94e66ad8e893cf7eddfc4fdf0fc483988455db5f9c6f42d239fe57915a
+DIST moto-4.0.11.tar.gz 2540794 BLAKE2B 3b68e3fc6ab75b7ada2548c0807936fc5ad0d296385357ffb8b8c490fd3611f1333a78e99a093d3cd3ee8e65a2115ae66a4d3338bdf23dfe3ce8a0ebde43bad1 SHA512 fa721bc8cf8256a120870256770adf165f9a3f5d75ea5c83d76303d32a6869d417bec73fca4b09c5d08794cf2e8e530fd73ac53939271785e31f024217c97fa1
 DIST moto-4.0.8.tar.gz 2488253 BLAKE2B ae707de8f0917b62904f38f977eded8f3e995271da8a7d6be47f05a24e3cb8bb8121e5e52625deb6c8f836e5f328352a7e6ea0855a4278c32dc9363da0faa8cc SHA512 9d3d3164bb6a77901bb55b8c536bfc8822e5b5292d79fedfe89a4a7fefaeab24b740d9a898e9487152a45c5a3bfd15d8aaca042a485bea389e1a82bb0a90bdd0
 DIST moto-4.0.9.tar.gz 2496530 BLAKE2B 596dc00ce0c931d4405d1ad6fdfcff4acc5c7421b1f1d67f442e090249d3df81f89c570368b5e981ec49f14a35aed32621ff3dbedc7003e3c870f891e4eda20a SHA512 fedf2c97779a93b1ab3492122be5425f3d91219eb207cc21bf2822ffa52c6efe2c3c8ca233acafd02c725c46e77e883f8f941c29638bb3e32ffa774ed8a5ff69
diff --git a/dev-python/moto/moto-4.0.11.ebuild b/dev-python/moto/moto-4.0.11.ebuild
new file mode 100644
index 000000000000..a4d952121013
--- /dev/null
+++ b/dev-python/moto/moto-4.0.11.ebuild
@@ -0,0 +1,94 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="
+	https://github.com/spulec/moto/
+	https://pypi.org/project/moto/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
+		tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m 'not network'
+}
diff --git a/dev-python/myst-parser/Manifest b/dev-python/myst-parser/Manifest
deleted file mode 100644
index b45581ab9d6e..000000000000
--- a/dev-python/myst-parser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST myst-parser-0.18.1.gh.tar.gz 769288 BLAKE2B 77f21ae4277ef4ed9020caad86ef3ea92a1efca35f7ab61203fe2125e4fab31a74a740db7a1f1d6ea0a576c24706b0997beea296d782eb5a07ba4e91a0a9e52d SHA512 4bc3a89480f175779da4f093aaa99a1516f76ab4107dcf8747b6614f347e91739f8596693f95529d76aedbb0c84b4efde4262517bc445aa7027d51e05e8b48bc
diff --git a/dev-python/myst-parser/metadata.xml b/dev-python/myst-parser/metadata.xml
deleted file mode 100644
index 3122a9991fd0..000000000000
--- a/dev-python/myst-parser/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>cyber+gentoo@sysrq.in</email>
-  <name>Anna</name>
- </maintainer>
- <upstream>
-  <doc>https://myst-parser.readthedocs.io/</doc>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/myst-parser/myst-parser-0.18.1.ebuild b/dev-python/myst-parser/myst-parser-0.18.1.ebuild
deleted file mode 100644
index 824b4e326b72..000000000000
--- a/dev-python/myst-parser/myst-parser-0.18.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-DISTUTILS_USE_PEP517=flit
-inherit distutils-r1 optfeature
-
-MY_PN="MyST-Parser"
-DESCRIPTION="An extended commonmark compliant parser, with bridges to docutils & sphinx"
-HOMEPAGE="
-	https://pypi.org/project/myst-parser/
-	https://github.com/executablebooks/MyST-Parser
-"
-SRC_URI="https://github.com/executablebooks/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-	dev-python/mdit-py-plugins[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-param-files[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		<dev-python/sphinx-5.2[${PYTHON_USEDEP}]
-		dev-python/sphinx-pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# TODO: package doc deps
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx_design \
-#	dev-python/sphinxcontrib-mermaid \
-#	dev-python/sphinxext-opengraph \
-#	dev-python/sphinxext-rediraffe
-
-pkg_postinst() {
-	optfeature "linkify plugin support" dev-python/linkify-it-py
-}
diff --git a/dev-python/path/Manifest b/dev-python/path/Manifest
index 5b3e7e0653d5..e8d0b73d9c50 100644
--- a/dev-python/path/Manifest
+++ b/dev-python/path/Manifest
@@ -1 +1,2 @@
 DIST path-16.5.0.gh.tar.gz 44286 BLAKE2B 1d96b0003c562044c1c2ba5eba7a525d5503bd9a58ec1f9611d74e9d52581f646447d3d754809b49b4418c18de9fbfd5de34077fe9edb1c4b3d3fd49f9c2af19 SHA512 0b9b306b2b5cce1e51d65a7555e54770e19a3d4796dbaf2d617bbe8282c771e3d7975112e443462e9b43bafc533d6dc61bedb8608b0d93cc0d1febec995d1780
+DIST path-16.6.0.gh.tar.gz 45238 BLAKE2B f1fa3a23ba19f623ca276496c1fa7351ea02858710f2dddbf5f4d96cf2c9f8fc3325c74a56f1b4dec809e28e927f2c8adab913eed9d8893016e0fd3d0b3a662d SHA512 4d7772b7eb7017bee78f95f30f6286b14750d6d8edbf5f58617ede12bd664f1b893921b89bb64f797e1d2eb7e67e361d8f1e01618fee26d64a5b879a3854aead
diff --git a/dev-python/path/path-16.6.0.ebuild b/dev-python/path/path-16.6.0.ebuild
new file mode 100644
index 000000000000..d332bbbeae12
--- /dev/null
+++ b/dev-python/path/path-16.6.0.ebuild
@@ -0,0 +1,42 @@
+# 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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="
+	https://github.com/jaraco/path/
+	https://pypi.org/project/path/
+"
+SRC_URI="
+	https://github.com/jaraco/path/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# unreliable, not really meaningful for end users
+	test_path.py::TestPerformance
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index a2e5e5a27ee6..1abf1f112ef4 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,2 +1,3 @@
 DIST pkginfo-1.8.3.tar.gz 375734 BLAKE2B a3e9779bcb7cd326d8bd8137fa388055032fd4ee7732d47a341807201a97f1d44652d8e46adefd301cf7cd3c1d041e49a6ed2b8752e12347a8a2a2349cf397bd SHA512 54a67bdf078b38600651cb94afa62e9d86fce512022b1e79eb4565289ae3fad2325647654704488968e18cd85cbba4bd0ce28392fd09ae9638ee449e802273eb
 DIST pkginfo-1.9.0.tar.gz 376601 BLAKE2B 1823140bcd109cf2549f0c7f8db4315880a86030a8400838755664794a7cac94998a6a20832db6b29d5f8623fc16d0bed477eb48750184ba04b6440063d6bf02 SHA512 5189929a80aedbeb65ad3b243d6f916854887e34d3489eab71a6ca69ab82d0fb2cc62ec7a49999890eb323be981d35505a6f47d2debc83cfa1cc8bb04523dcb0
+DIST pkginfo-1.9.2.tar.gz 377091 BLAKE2B e217e3d58fbc7a4efe7321d1eb4f6c95ea75cfcdcbdd06c0f8b728eb1ec18c5800a7ed6f6338996c60f5f251f36d40b40c20d0b1700956dd8a23a6e40594a356 SHA512 16eb4708040811a21184e5fff1bbbde775360718fa67df97f56c646381f6f1e58967920753437e5759e4d88c31a4f10c1e4d8be2380981939e51e4ee140dbeda
diff --git a/dev-python/pkginfo/pkginfo-1.9.2.ebuild b/dev-python/pkginfo/pkginfo-1.9.2.ebuild
new file mode 100644
index 000000000000..8a1b1e1cccdf
--- /dev/null
+++ b/dev-python/pkginfo/pkginfo-1.9.2.ebuild
@@ -0,0 +1,29 @@
+# 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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
+HOMEPAGE="
+	https://launchpad.net/pkginfo/
+	https://pypi.org/project/pkginfo/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/pysubs2/Manifest b/dev-python/pysubs2/Manifest
index bfc792763a6d..f51f8273f2c4 100644
--- a/dev-python/pysubs2/Manifest
+++ b/dev-python/pysubs2/Manifest
@@ -1,3 +1,3 @@
-DIST pysubs2-1.4.3.tar.gz 850528 BLAKE2B 8d444195d267d21f525e4e0f197cf539b7f90adc87cd19c566439a97cb50aebd30bf9b4aba50367b86326d6ed65e739b9d22a2ba5d3723021c3eb5d9b00da430 SHA512 f80b366c514db7af65d1de180a2ddd69b7f4fdd659c790f4d8f923dff1074b81cf955598fe05c3a69a59d2b1f2621b07ddd65fd6d4ab0b3bc88709cdbf632e19
 DIST pysubs2-1.4.4.tar.gz 850577 BLAKE2B 00fe742dd0545d816e335370c7691a456f148dc33b7c0f772941c69d6aef7c4ff43e734feecaf56bb8d0f199bc57e558a9a6bf5c3aa8223b87c3e51529eff5a1 SHA512 c8ae6742cafa7097a935dee2a5e2d67620e66bba2f0fefa7ee52d03c5ba53f227b6e6d761b0a60598afd16b34f3bbf9da3d0c423a3133983d1f3cb9437dcc094
 DIST pysubs2-1.5.0.tar.gz 851633 BLAKE2B 2f0ee302495931cfb32283f9e9236c2825b90db8224b356d6c517a084f4be6f61e805071b78d3187a2507703bdd4a7e6b4328a3da931dc745c28ee12aaf6ff06 SHA512 c13cb843da1e684e17c40e0704010182ab574627e66597cc9eb0fb70a25bfe1fa3fecc1aa2dd76bf45f64741fcb4750267e14eae647019f4716f1caee52b0efa
+DIST pysubs2-1.6.0.tar.gz 856341 BLAKE2B 5b1cfb70eaad916f5822465fb11627a1ed79dd419e19478eb1c7622689e9cfae9aec8fde1916efe5c8529bef8fc69a92c020ddc1787ec1fa1f43e261be1e56f8 SHA512 2cdc6d6998735796e948810934e1854e80f3af6de9af165457314fdbd82670f3fd3e5a05264074ed082d820d807ab99781618eb9d46273a62ae48f057bbc134c
diff --git a/dev-python/pysubs2/pysubs2-1.4.3.ebuild b/dev-python/pysubs2/pysubs2-1.6.0.ebuild
index 241b2a09fc76..241b2a09fc76 100644
--- a/dev-python/pysubs2/pysubs2-1.4.3.ebuild
+++ b/dev-python/pysubs2/pysubs2-1.6.0.ebuild
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index c358d742dea7..bb116387f441 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,2 +1 @@
-DIST python-dbusmock-0.28.4.gh.tar.gz 86900 BLAKE2B af6ca30e15e803e66aec63d40d56d121c93e9fe253d7640111104c8e8c0ea5e0491b53f551d6b454ae7370cbbb7f8fb14c07b5be92a8425efa39e04f962311f5 SHA512 f388425ebb68c20b5110a831879bee0d7d0a3941687fd61c9975c4aaa9950b05709e7fc2a9b885c89935a915f473bb7a9b97e93ca79cf3dc6769911a66aeaea7
 DIST python-dbusmock-0.28.6.gh.tar.gz 90579 BLAKE2B 12b4ee02ae6b828b908b203a351f5b88d25193bb1250a0d25bc90b0ac2a244c4ef577bdacb2dbbb9220ba93d785791d900c9035d8d5c3a21aa744b5f850d16c9 SHA512 1efc1a42fc5cc56d683f0f4d022877020f15d81a557c54f47619c704ca2f67716c1fbdb890f987d01f78b7786528a71de8dbfe84228baa41351eb751fc4cce61
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild
deleted file mode 100644
index cf6dfc0fe4b6..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.28.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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_{7,8,9,10,11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="
-	https://github.com/martinpitt/python-dbusmock/
-	https://pypi.org/project/python-dbusmock/
-"
-SRC_URI="
-	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# needed for unittest discovery
-	> tests/__init__.py || die
-	# linter tests, fragile to newer linter versions
-	rm tests/test_code.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.28.6.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.28.6-r1.ebuild
index cf6dfc0fe4b6..a10a63ef16c9 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.28.6.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.28.6-r1.ebuild
@@ -28,13 +28,16 @@ RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 
-src_prepare() {
-	# needed for unittest discovery
-	> tests/__init__.py || die
+EPYTEST_IGNORE=(
 	# linter tests, fragile to newer linter versions
-	rm tests/test_code.py || die
+	tests/test_code.py
+)
+
+src_prepare() {
+	# dev-python/dbus-python uses autotools, so no .dist-info there
+	sed -i '/dbus-python/d' pyproject.toml setup.cfg || die
 
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 1004ae72459f..bab9be5c9b39 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1 +1,2 @@
 DIST scikit-build-0.16.2.tar.gz 269822 BLAKE2B 4fe7d8f3c3a993f1832d94896068b6bede1eededb4d85e3332137f516819d167102a1eb2fde6dfe4ad187d0483a4e962311a4ca56f3aa5a4eff0c96a187ca052 SHA512 ae8dfd74c638e5cda127b24070c4e491ec51a69b35eae476f5f74a54ba97419d69e984ae7dc132782c77472852358d9d984650db4e6984decad74aadceecfa05
+DIST scikit-build-0.16.3.tar.gz 270429 BLAKE2B 32930041e64750dc4ee7d496bf6541bcc3f75c5fbddadb95d3424eec2309381ac6cb67252936fa753b0996db44749d19662575f4f20f174f85c44256d91ec7b7 SHA512 8cec7b01b7a2b892c05a910806b0a3664f5a966165f1a87e9943067afc9b2a2e93657a7a68e47df6578d5d03f1ff0a0bd987e97cf4b0f442d79949f52247968c
diff --git a/dev-python/scikit-build/scikit-build-0.16.3.ebuild b/dev-python/scikit-build/scikit-build-0.16.3.ebuild
new file mode 100644
index 000000000000..9df2df1538e6
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.16.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build/
+	https://pypi.org/project/scikit-build/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not packaged
+	sed -i -e '/cmakedomain/d' docs/conf.py || die
+	# no pytest-cov
+	sed -i -e '/addopts =/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# sandbox violations
+		tests/test_hello_cpp.py::test_hello_develop
+		tests/test_issue274_support_default_package_dir.py
+		tests/test_issue274_support_one_package_without_package_dir.py
+		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+		tests/test_pep518.py
+		# This fails because of additional item setup.py in sources
+		tests/test_include_exclude_data.py::test_hello_sdist
+		tests/test_include_exclude_data.py::test_hello_sdist_with_base
+		tests/test_issue401_sdist_with_symlinks.py::test_sdist_with_symlinks
+		tests/test_manifest_in.py::test_manifest_in_sdist
+		# Wants internet to install things with pip
+		tests/test_numpy.py::test_pep518_findpython
+		# TODO
+		"tests/test_command_line.py::test_hide_listing[True-bdist_wheel]"
+	)
+	epytest
+}
diff --git a/dev-python/sphinx-version-warning/sphinx-version-warning-1.1.2.ebuild b/dev-python/sphinx-version-warning/sphinx-version-warning-1.1.2.ebuild
index d98dd0dc499d..c8c83c78be7d 100644
--- a/dev-python/sphinx-version-warning/sphinx-version-warning-1.1.2.ebuild
+++ b/dev-python/sphinx-version-warning/sphinx-version-warning-1.1.2.ebuild
@@ -20,9 +20,10 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
-distutils_enable_sphinx docs \
-	dev-python/sphinx-autoapi \
-	dev-python/sphinx-prompt \
-	dev-python/sphinx-tabs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinxemoji
+# TODO: enable in next release
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-autoapi \
+#	dev-python/sphinx-prompt \
+#	dev-python/sphinx-tabs \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/sphinxemoji
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 7f47f597f3f1..383426d340a6 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1 +1,2 @@
 DIST tox-3.27.1.gh.tar.gz 309006 BLAKE2B fa8aaa9cd5b03e54c166bb6b748290420b91498b26d2d124d9f88a64806b9ac0578c1886845b25aa024907f6a782c45609fa6c7657d9e1f538b59c2d9f0f4e14 SHA512 5f568bc6c53f871aae91928681dd6f2419b876a8e6ca925e65abae845b548ee3d00513741882875bbbacb78bf64935228d98213f940d3da8c3f788b73f177b79
+DIST tox-4.0.0rc1.gh.tar.gz 273212 BLAKE2B c9123aa23185655c32ebac36adf24ba8cfc57e8a94c011657acff6a5ce5bede8b14218a21a8cae099fdc2af938343336bea7fed802f8f73bc7769cd17b52d918 SHA512 6619fad1a080a095b827968972dd0d854ca5b48b81ef6548d8c39accc30c0279f9e0cc4208b148920e51fe304328dbdf4f4a8c4554b32398baf243484bba338d
diff --git a/dev-python/tox/tox-4.0.0_rc1.ebuild b/dev-python/tox/tox-4.0.0_rc1.ebuild
new file mode 100644
index 000000000000..a0df2f1b8bf4
--- /dev/null
+++ b/dev-python/tox/tox-4.0.0_rc1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="
+	https://tox.readthedocs.io/
+	https://github.com/tox-dev/tox/
+	https://pypi.org/project/tox/
+"
+SRC_URI="
+	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
+	>=dev-python/chardet-5[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-api-1.1.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	>=dev-python/virtualenv-20.16.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/filelock-3.8[${PYTHON_USEDEP}]
+		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
+		>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
+	)
+
+	epytest
+}
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 7c0989baf461..2b5f319699e0 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1 +1,2 @@
 DIST twine-4.0.1.gh.tar.gz 214569 BLAKE2B 82c1793718cfd7d81d9745d16dfe21f59fdfd8b157840ff29629f8b7b86c1e36281f1ed9ba613ec0048c8eef8a2c80d2b9b160893ed953b06c9bfb027f5299e0 SHA512 0b5d24c56731239400b6713e0e52d1cfdb399a84e886b02ea4b59e7af69cc1578e03bf442cca4b2ea5f400995955d27c8d9d3cc17a6ea59013bdaaf6ac63a567
+DIST twine-4.0.2.gh.tar.gz 214528 BLAKE2B c088329a86139eb01d325ec623504c0dfee1231ca8bbbf9ed73d46d4ed9dd79aaac6aaad225cacd64942eb7a3ead19bcb5e224ad9735d9760bd8c9c8e5e69043 SHA512 94dec0b08ea8f4cc5900d743b750f02a668c738d402632a80faef24220f87b4b14824966d6d902e9ddaab741e4091d6a370a7660d02ca27fd6fd0d251a473ab5
diff --git a/dev-python/twine/twine-4.0.2.ebuild b/dev-python/twine/twine-4.0.2.ebuild
new file mode 100644
index 000000000000..2d6569ff8eb0
--- /dev/null
+++ b/dev-python/twine/twine-4.0.2.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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="
+	https://twine.readthedocs.io/
+	https://github.com/pypa/twine/
+	https://pypi.org/project/twine/
+"
+SRC_URI="
+	https://github.com/pypa/twine/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-35.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# pytest-socket dep relevant only to test_integration, and upstream
+	# disables it anyway
+	sed -i -e '/--disable-socket/d' pytest.ini || die
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# Internet
+		tests/test_integration.py
+	)
+	local EPYTEST_DESELECT=(
+		# Regression due to deps?
+		tests/test_check.py::test_fails_rst_no_content
+		# Avoid needing heavy virtualx
+		tests/test_auth.py::test_warns_for_empty_password
+	)
+
+	local -x COLUMNS=80
+	epytest
+}