Adding metadata

23 files changed, 495 insertions, 2 deletions

diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 430fc6d9d860..093108feba67 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,2 +1,3 @@
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
 DIST async-timeout-4.0.1.tar.gz 8030 BLAKE2B 73bb3f38d33608d120a0d633231bc781b9b5530d80a08c98370ab9100486bda5fd9d7a68ae6b16315bf306a75690897d724fa5db318847803bc445074908e650 SHA512 24a72daf9e0737d0be351a35ff28242dea735bed33f06d9865a71983b1341693c80856c0668d6a485bccc8cf7b9adde33fa904e94bf4730e4a678216e572d119
+DIST async-timeout-4.0.2.tar.gz 8221 BLAKE2B ebcb2ef956590e265bbdecc223a877e7260750aecf5b631c6af1f335ce57b51579467901e2344bfa8495010eb1e6e7a39adfd4b6311483d63e0674221888d1f7 SHA512 e9884a525b99bc1a3a15c958a1dbb25a92cb286bb7360b03b0be3198e61685970628c8fef6dc478beba3f031e0ff6f03b1fcc3c2c34032d7fea6f8b65850ac38
diff --git a/dev-python/async_timeout/async_timeout-4.0.2.ebuild b/dev-python/async_timeout/async_timeout-4.0.2.ebuild
new file mode 100644
index 000000000000..9226fbf1c728
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-4.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+MY_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="https://github.com/aio-libs/async-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:aiohttp
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b977f3bfaed0..fc1ff0242a8e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,4 +1,5 @@
 DIST boto3-1.20.14.tar.gz 449126 BLAKE2B b2ef8a101aaecb5d65a60fcbf7f83e89946181092bb4ad1f4a7abcf8b218c5ce797a47cd9ac3e7fdee85c6457d89b91836729f4019f5ecebf1193d015714ca8a SHA512 ff4e3f2accde84fe71cdcb090775c384700d3cba0d43f46a834b653f6a9493d7cd57be1741f39378cddf315d5f5ce07f4f233c300feb1529c22e99a0817af85c
 DIST boto3-1.20.23.tar.gz 456315 BLAKE2B 9f74a1822c631fdcc666db1d2cda5ab464b150ca01cfad807542a5db548910fda971cfb5b5d92bfa2be90680759cb4b9b368b44485228df99364c17b01150f6a SHA512 1cbbdac34f8174b153546f4b6a43f1317fbcb4556e058759c59f4aea23e8517f23d63dc581be776469f49c7e82378ac0a2657b211df70b29bbb94839e263005e
 DIST boto3-1.20.24.tar.gz 456338 BLAKE2B 4192f20a7a5c247a72b381506697034d744fd62c60d06402759942c3dc1ef0c136ea7b85ab80920831f876e098af549bcdff688ff287a0350ed00ed88aaf0adf SHA512 96a2d6dabaca0aa0d85efcbc2f98f8e41b568e2190352c00101c3df85623867036f64ad9935681ad2a104abd9f6aa9e79de8f7136a846e256185d065afed23a1
+DIST boto3-1.20.25.tar.gz 457371 BLAKE2B f1e6ab3add86f0ba25b22d92f58580e4ab86affdfb5c3b6f9a53938a2a647d0fc8cd23975cd60b909e5db339d442820e557497e232bda836ac9f2028b376afcf SHA512 2693134800ad3313785922c654296ca04a5b561e135fc60a45784e8190cdeb1dd525e6a81f314fda9f14f9dfddd5ffd8bde9af2d2be50b61921b9ec1248fee07
 DIST boto3-1.20.5.tar.gz 439166 BLAKE2B c140e15e497e6cdf6b4b77bb99e0a0f5ac01d5b5793f8bfb210b52bbc09e39e6fe06a957951375e0795210dc1c3b2a0afd2f498bc88e449d9e6846f2b357f016 SHA512 2823466e4851684253d4ce42a8c34e5cbdad6d04c823040fe2cebdf0cffb14d5d3f40e28d57ebec14533fab04ba74f27c25f078ddb8791b8f52d0424e11b39fc
diff --git a/dev-python/boto3/boto3-1.20.25.ebuild b/dev-python/boto3/boto3-1.20.25.ebuild
new file mode 100644
index 000000000000..397ed3e7a797
--- /dev/null
+++ b/dev-python/boto3/boto3-1.20.25.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/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/${PN}/archive/${PV}.tar.gz -> ${P}.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.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${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}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d11ee77308ff..583370d9dc59 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,4 +1,5 @@
 DIST botocore-1.23.14.tar.gz 8486875 BLAKE2B 93a3fd40b26d026dcee10172e560b4d59cdea803964e0f7ec85afbdd371d700ddc1594aad895730fc82d6684db4aa041b9c0e4e1b0b17ad701e5b87d082ca1ee SHA512 900afcb4d7378e1bd1f7a9dee1f6809151ad161f3442a7e197b2986db41af998d550d21ea225f66d1ff6374853da7bf13166186978edda08139a2c3093ff4b6c
 DIST botocore-1.23.23.tar.gz 8679727 BLAKE2B 89e54120caec616ffb539ef9df93923d9514ad29ba2430d36dbfa5392325be181d9c8c132983d062f120ce0629a411f3136e55fec5fa2c3e7299a9551652448d SHA512 a4e14b680fd71a6c5ec499ed9c75f55a51cffa1f6ea569e3a3d231646f90e4729a7fbacf9b6a0ee5ab0b5321b8078970a0db2a74087500991a65d164091b2ab2
 DIST botocore-1.23.24.tar.gz 8677151 BLAKE2B c12382994208f673cfcfa71e17fed028abfd299595734af7f604612fc6f1fc45dd67a1de17d36accf831d296a5eafedb75b6249e219fb3de75a6a4dbb6e41d59 SHA512 a03b64236c61fcfc7111d8218fa5cb6a305522c20f8eee28dc83983560cfd5a32c9bf5933e6005b49f188b7b673614389a9b79fd5f81701acb09b0816e5bac54
+DIST botocore-1.23.25.tar.gz 8685879 BLAKE2B 6eff15d35c66ded69a07ee0a276efe1e42dac9a3924a1d9735cf55ad89307a6a695e2ab6ee092e6454d1b6d682d329afdcf40644a8a6b89099dab1d53543adda SHA512 f09cb0564e0208816b05ec827d534bf866d4de827466ce53d91bcf21b08060934c937e38f756d02735412bc965bb831283f0c44a4c957af4271ba754215a6545
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
diff --git a/dev-python/botocore/botocore-1.23.25.ebuild b/dev-python/botocore/botocore-1.23.25.ebuild
new file mode 100644
index 000000000000..62c8c402ae39
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.25.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/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="mirror://pypi/${PN:0:1}/${PN}/${P}.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[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+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
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index 4899b439f005..75dbc8fbf6f3 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1 +1,2 @@
 DIST filetype-1.0.8.tar.gz 804082 BLAKE2B f636e9fdddd93dc8972c434666b82d97fd9572ce94f0c3b617add2ecaec2e1bfeaa267bb5ceaa07a6ed76d0b0ef0736451f9e4395353ce795e1a61e7cce5d543 SHA512 5ab87ec277781d27bdd7a4245f406d230724b0f0a7ab26e879cb78893262fbdff7088bb306203fb1fce38723b5d1c2a998fb8ae113509502755e995a1f81993b
+DIST filetype-1.0.9.tar.gz 804325 BLAKE2B f17cfec5d4c971d96a36d9cf4718ebb74f9c128c0818fb271a506323b978a68235db7700001baa52eb47beb3ba93a452495b08fb0c1ddd23424b9a8cf42d3443 SHA512 4d59c32c83a448136ac0d5aef55a24d13cee1c234f3a6d713ad7c63696c9e5b6bd502b4f365244be84f8579705fa48a31dc231ae8e52b2656aa72255dc61cef8
diff --git a/dev-python/filetype/filetype-1.0.9.ebuild b/dev-python/filetype/filetype-1.0.9.ebuild
new file mode 100644
index 000000000000..2d40c8d04985
--- /dev/null
+++ b/dev-python/filetype/filetype-1.0.9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Small, dependency-free, fast Python package to infer binary file types checking"
+HOMEPAGE="https://github.com/h2non/filetype.py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 484d518c7e83..e7460735ecd9 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1 +1,2 @@
 DIST httpcore-0.13.7.tar.gz 64734 BLAKE2B e6c4b1720ce4bf62689995d3e1c648c4702bb416f3b3586eb8dd2f0cfd2155046e64181c4c04e65f721a5f0fcbc23b5ffd01c2930c7c69d37ee4c36e37b7d0d4 SHA512 0cc48828d0710066b3ef89998ec85975285763ac63a8b59106952ef2dac5a02dac71e7e106c4b6ea1022eb4d06a9cb5ee3e634eb564bad49c5508beff75279d6
+DIST httpcore-0.14.3.tar.gz 64650 BLAKE2B 140c55af60f54ff13db958cecef50af2b8857837c00c2e5b1ec48d8866bc08146f608864a3dcaed0014505ba0ea10b8d457a763ecf434a0d40a2e11debdd4003 SHA512 05e92109839c2e2f7ec81fea9507fb15a12d1bf6ae92048170953b1cb0139237b81c892feff1bc3840e06887e8916cadcc4124725874344524e45e3640a00379
diff --git a/dev-python/httpcore/httpcore-0.14.3.ebuild b/dev-python/httpcore/httpcore-0.14.3.ebuild
new file mode 100644
index 000000000000..f493be71b986
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.14.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A minimal low-level HTTP client"
+HOMEPAGE="https://www.encode.io/httpcore/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	=dev-python/anyio-3*[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/h11-0.13[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index eae536885318..384fbc91716e 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1 +1,2 @@
 DIST httpx-0.19.0.tar.gz 1667455 BLAKE2B b8d4cb0b6e7f643b62b507930ccf1534d73d93261cab9281ef57d6392f00da325e897d5339aebacfa07aeae8278d3a81b78d6501a1587ffeaef68cc5087bfdaa SHA512 3b327f07d62cf0430672d4f1a4f884618e588496f049522de327f5c34f7260eb21739b7f1fbd6f43a21962bc8737547f3eddbc22751546647f56c9cd7212840a
+DIST httpx-0.21.1.tar.gz 2155133 BLAKE2B c3c800657abaed461ab6f44e3cd9799be4b6499070a5db2ee8d5d61c776d86591c74192eb1c88d4072dc361ea4c9448a3ed061c715fa4504fc931fdd96ccde62 SHA512 a4f737f6c6ae909fd3ea811e0ff3b78ed6496da8d797ef49746f744216e055f8225d613fe935d5e2780aa1b233053ad436e8849eef578e662ca8ee34513ad12e
diff --git a/dev-python/httpx/httpx-0.21.1.ebuild b/dev-python/httpx/httpx-0.21.1.ebuild
new file mode 100644
index 000000000000..a956d843ea56
--- /dev/null
+++ b/dev-python/httpx/httpx-0.21.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Docs builder mkdocs not keyworded on all these arches yet
+# DOCS_BUILDER="mkdocs"
+# DOCS_DEPEND="dev-python/mkdocs-material"
+# DOCS_AUTODOC=1
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 # docs
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="https://www.python-httpx.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="cli"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	=dev-python/httpcore-0.14*[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
+	cli? (
+		=dev-python/click-8*[${PYTHON_USEDEP}]
+		=dev-python/pygments-2*[${PYTHON_USEDEP}]
+		=dev-python/rich-10*[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/h2[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if ! use cli; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/client/test_proxies.py::test_async_proxy_close
+		tests/client/test_proxies.py::test_sync_proxy_close
+
+		# Result change in charset-normalizer-2.0.7+
+		'tests/test_decoders.py::test_text_decoder[data3-iso-8859-1]'
+		'tests/models/test_responses.py::test_response_no_charset_with_iso_8859_1_content'
+	)
+	local EPYTEST_IGNORE=()
+
+	use cli || EPYTEST_IGNORE+=(
+		tests/test_main.py
+	)
+
+	epytest
+}
diff --git a/dev-python/httpx/metadata.xml b/dev-python/httpx/metadata.xml
index 90ba4216a2e6..b126bd782876 100644
--- a/dev-python/httpx/metadata.xml
+++ b/dev-python/httpx/metadata.xml
@@ -9,6 +9,9 @@
   <remote-id type="pypi">httpx</remote-id>
   <bugs-to>https://github.com/encode/httpx/issues</bugs-to>
  </upstream>
+ <use>
+  <flag name="cli">Install the CLI "httpx" client.</flag>
+ </use>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index a03c23107cd4..f77fd48ed993 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -2,3 +2,4 @@ DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423c
 DIST jsonschema-4.2.1.tar.gz 310668 BLAKE2B ba36be8abf0678fda773a9950f06e4d15f6a4c19fdd9f855310b80f45be1a25f44ce329c35667c4e107aab6ba381b02ff2caa305222932e2cbe733f293de82cc SHA512 349993c00e663f3efa2304e60c8b75e90c012d29faa498a01d5d2a5c47ddf0485f28894fd2ddf4766f9ab91e468f4b4f24a53390c72b7a31fae37d75c6f2b774
 DIST jsonschema-4.3.0.tar.gz 311317 BLAKE2B 6ec3d2cf05923657e9875b5f51b9356a730a7f9a1ab8e07bbf7226fdf1005f729a06c110ec52b62d12a4bba96a14dc647786398e66a6439de93fb38c02eef848 SHA512 3772952fb482660da86b0f71ed509ef267375a80ba2db0e4c12b9bb17f79c1f31f1a8ed2746a0bef76c620d61a63ccf967c77cc55255c7d3fe4e688dc0413b38
 DIST jsonschema-4.3.1.tar.gz 311425 BLAKE2B e524675d64fece5f7687d62ed043ffb35e7627c6d1f213fde3e9c2f35b929fc56b998d39e84148fe24c507361114e047540fcf23606f4d77b2bdfc0454c6d529 SHA512 621093b8964ea94dadd23aab7c0bbbf5eb23ae615b569278886a4213ef7adc779fddcd75cfff87e243087f788fca180f4472cd3bafe8f2f8157e30c04b5f33e7
+DIST jsonschema-4.3.2.tar.gz 311576 BLAKE2B df6e656244b3ad963714e3a5e457971ad29455529b1e032e4ead2aa60a76ef332d31c871d6e9cc98b1a76d52e53b6586e6ef0b601d4b1b6fef8b39e2ea29acfa SHA512 a849282e6661ac28d3116754e87235a1970993bedeb4590d67605409ef875c5c26efe12a35bce7eeb624778a6d7770feda0356b4a0c05f6bc0364da9aefcaed6
diff --git a/dev-python/jsonschema/jsonschema-4.3.2.ebuild b/dev-python/jsonschema/jsonschema-4.3.2.ebuild
new file mode 100644
index 000000000000..dafaa8fef97b
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.3.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+# 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/uritemplate[${PYTHON_USEDEP}]
+		>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/twisted[${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
+)
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index ddb90f2fdc61..be14e47c6596 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -2,3 +2,4 @@ DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a
 DIST prettytable-2.2.1.tar.gz 45102 BLAKE2B 59fe355603791c8b3a584b1d1f2864559a7e2c7249923d5299c967db74dbd37baef9557d8d5511defe54f64e3f4625ef45635cf2f00a051a599177a3774da1a5 SHA512 5496b1525342b9df4b88cc2cd6079d8c329787b20f7e581465dcdf447b90f78aad764c6505aab8a0e3c4cbb44c943720672373cf754d6f7313b68c28005a707c
 DIST prettytable-2.3.0.tar.gz 49386 BLAKE2B 368dd454da9dde3900009ed52c0d55c30ed69315b36fb53eaebc764af419851b858dc648ac5d8ca62592c2aaa68dac91ac03a1a1bf29d10ee5162981f2937c22 SHA512 feeaeeb0a1897c0aaa2bc0ac7f470244529e8c70debb26976494719607840c8b8a80698b7e463402031b250fe152091e947555be2a6f983764e01bdaa1a71a22
 DIST prettytable-2.4.0.tar.gz 49756 BLAKE2B 594dea7e1c3c9ba070420c83960b9fc4016d25bd883126ed2331cb5ce06909fad92e94ec141e1b4838233f00cfabc394e1a7025aa02cf246e8608903bb45533c SHA512 50983855868d23a590004dcb81ad9a3f22191c656532683f71260a369df5bd2a0001db946268944cc169528f64f36833eb524fc46efabe562434ec32832ce011
+DIST prettytable-2.5.0.tar.gz 50015 BLAKE2B 75bf06625ee8aaa495ce86f69d751bf89edb8fd0c530009cd4eec9f44b6155d0168d2f4b9f55bef6c3c591a3be17bd87eefc447315f9ed867f6a7edd8c0225c5 SHA512 e4f07e842668b3874ecb329b5e9d6b61433c6ef78f3df6b9872bd7edd1d7266bf61e80b8aab641d42eb7dce1f2fc3463e1598128763ca4998618ea835cd74fef
diff --git a/dev-python/prettytable/prettytable-2.5.0.ebuild b/dev-python/prettytable/prettytable-2.5.0.ebuild
new file mode 100644
index 000000000000..f6421aee6c3e
--- /dev/null
+++ b/dev-python/prettytable/prettytable-2.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="
+	https://github.com/jazzband/prettytable/
+	https://pypi.org/project/prettytable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pygit2/pygit2-1.7.1.ebuild b/dev-python/pygit2/pygit2-1.7.1.ebuild
index dd5e629beff2..f2cb32f22c0e 100644
--- a/dev-python/pygit2/pygit2-1.7.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.3*:=
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index c158f72a0c2d..398a8f1e759e 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1 +1,2 @@
 DIST pytest-httpx-0.13.0.tar.gz 21515 BLAKE2B 691ce45dd2b27c8f47724e3356ba96e62a0d6a7ce7d3feea68295a873c12f9a3df00d5b25aad7ef8a1154e887077ae6f6c1b12f3685a0669534a0d0ee8aae68c SHA512 514d9acacdfd60d13b5ce2c5ebe46d0e4d16c1b06fd359b0b9515ae2fa9091296537f369882a78bdfad48e9a0aad0b2f8c172c2e54f4ae9e23ba03220c7c17fb
+DIST pytest-httpx-0.17.1.tar.gz 23310 BLAKE2B 3b26a50380916a556657a02bc4d44ceb523261f14404eaf3461dae8adb99e913e820c55942bc200b6d23f85447bf74e37c8cbfea2c934489e5d91a56f47b186a SHA512 8fa9447bf50f9bf46ad781abbf9e5d46609e2796a6ec26d39b15c1cda99fc936af6b540c27f9cbe4f40948f041ceedd074c312815fe5ea6b023da20112c83f69
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.17.1.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.17.1.ebuild
new file mode 100644
index 000000000000..dda4c402aa99
--- /dev/null
+++ b/dev-python/pytest-httpx/pytest-httpx-0.17.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+DESCRIPTION="Send responses to HTTPX using pytest"
+HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
+SRC_URI="https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/httpx-0.21*[${PYTHON_USEDEP}]
+	=dev-python/pytest-6*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index c6b242780910..4134ccfde678 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -7,3 +7,4 @@ DIST setuptools-59.5.0.tar.gz 2281671 BLAKE2B 51b3435a1d7962a06f7cf07c31487a1404
 DIST setuptools-59.6.0.tar.gz 2281973 BLAKE2B 1e7ffc94626684f7e82a1bbba14889af052898f87f79205618fb76d78252397d3fb555778cb3920d2eed55bc1ee2c95ceec9206940269a4ba35b3bc44eb91226 SHA512 25472ec7c167e07113c6645880952458969b146766b64224ec8f40dfc2a29b23e47104b63e806292ec81ee4e9dbbdc4663228f39b4412b586cba644f69b52309
 DIST setuptools-59.8.0.tar.gz 2282358 BLAKE2B 2f1b49285fc70420e24f958c4955200ef0407a7f3aa52fd581a165fd47c7bbde8366c26963f1bbb36f0f77797c12cbb9016fdc69e1a5cc696bb67aacca16d140 SHA512 d906558b498bda8abf28831224502c6f0290a4cdbf087fe07af8321dba3dfd1e19fa5b4a820033e54c4561b82ea8ec54c287b4fd657892ed28c2a7de91a9107e
 DIST setuptools-60.0.0.tar.gz 2282339 BLAKE2B ad9a78df348c71d4374ccd773495cc3bfd6d02c214a327eece5daea06538c6a7a55975b22175afb6e67692a0945a7d48cd7b317040c7b5c4878a030505d5dbb1 SHA512 088c3dc38485ca16441d38e3404bce7d822f3ef8e48588101e9e93209905d8b1e1676de1131e2fd993a95caed0fcb3681386fbb7b679712ad0632cdbbcc04f51
+DIST setuptools-60.0.2.tar.gz 2284789 BLAKE2B b3763673e65ae7e6e7d8d2e7bb5d4b72e348a873496d5d0ffdb85daa2a65280fdd71be411132ee92717fd5f3437e10c36d244b0389d0a845b8f1ecd6f2094514 SHA512 1323c5993fcb1d8f23c6fc88d217af59d08d0130d06e84d38f0ac5ed6e3bf6d5595027a8f9430f3441d9a065686562d79b413ed32771276410a31f3addcde116
diff --git a/dev-python/setuptools/setuptools-60.0.2.ebuild b/dev-python/setuptools/setuptools-60.0.2.ebuild
new file mode 100644
index 000000000000..38e2e6e81691
--- /dev/null
+++ b/dev-python/setuptools/setuptools-60.0.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0_p1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~floppym/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local EPYTEST_DESELECT=(
+		# network
+		setuptools/tests/test_distutils_adoption.py
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		# unhappy with pytest-xdist?
+		setuptools/tests/test_easy_install.py::TestUserInstallTest::test_local_index
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_test.py::test_tests_are_run_once
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
index ff4fe699de0d..17e54f70922a 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
@@ -13,4 +13,4 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"