Adding metadata

40 files changed, 635 insertions, 445 deletions

diff --git a/dev-python/adblock/metadata.xml b/dev-python/adblock/metadata.xml
index 642eb8ba79b5..fee7639f4188 100644
--- a/dev-python/adblock/metadata.xml
+++ b/dev-python/adblock/metadata.xml
@@ -5,6 +5,8 @@
   <email>steils@gentoo.org</email>
   <name>Stefan Strogin</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="pypi">adblock</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/aioresponses/Manifest b/dev-python/aioresponses/Manifest
new file mode 100644
index 000000000000..542a81edf4e8
--- /dev/null
+++ b/dev-python/aioresponses/Manifest
@@ -0,0 +1 @@
+DIST aioresponses-0.7.2.tar.gz 28135 BLAKE2B 300d06ed43ad81d61fe9cab4002b9e9bb062a48aabed8aed21e3a8e26d8e153546ed079e6dda6ef26c6df2e843663ed9e02b2855ac71e011b873da926923a72d SHA512 847c687990c38733c714cfd7b4f268406392aeea6764f084dae25f43246b7b5731f149067fb921864b1b22c9e7b2ca66254ff311d726333d0b23a5566ab18029
diff --git a/dev-python/aioresponses/aioresponses-0.7.2.ebuild b/dev-python/aioresponses/aioresponses-0.7.2.ebuild
new file mode 100644
index 000000000000..97abe829509b
--- /dev/null
+++ b/dev-python/aioresponses/aioresponses-0.7.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helper to mock/fake web requests in Python's aiohttp package"
+HOMEPAGE="https://github.com/pnuckowski/aioresponses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/aiohttp[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# These tests require Internet access
+		tests/test_aioresponses.py::AIOResponsesTestCase::test_address_as_instance_of_url_combined_with_pass_through
+		tests/test_aioresponses.py::AIOResponsesTestCase::test_pass_through_with_origin_params
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/markuppy/metadata.xml b/dev-python/aioresponses/metadata.xml
index 2c78306c0011..6e1e0b7528d0 100644
--- a/dev-python/markuppy/metadata.xml
+++ b/dev-python/aioresponses/metadata.xml
@@ -6,7 +6,9 @@
   <name>Python</name>
  </maintainer>
  <upstream>
-  <remote-id type="pypi">MarkupPy</remote-id>
+  <remote-id type="pypi">aioresponses</remote-id>
+  <bugs-to>https://github.com/pnuckowski/aioresponses/issues</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5c6258a59ef1..dce5268e9c62 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,7 +1,4 @@
 DIST boto3-1.17.112.tar.gz 391748 BLAKE2B 071eddfe134face48b86985ccd0171e0d8994fc65cd75e26945dfcab29566f42aa965c82b736cc7dd821a920e6903e4c45917af1759214606c2448b46c528cff SHA512 dcee3f4e2dfaf8feeeecc82ca938a72d654ced7a44f32e3dab43a225d8dcf0b3d20f0699770cfcd8ede840f792d37e124597d096322b88ce54c2e27e109da6e7
 DIST boto3-1.18.15.tar.gz 400374 BLAKE2B 2170319480578b9ac7b6c0da9e9a2f256ce907b8e53bc626bf26fd65f3336ec1974d6dd1917f601fe139e859f144fafd198b2578ffb9097508f09dd40cf82313 SHA512 f330d8249c9f5749770ba5809f3a4fb524f23fc0545b24182023a3b74f815608bdb9986b434d972a017aa7786b1319705e8702b041174275f84a0266bdb7b857
-DIST boto3-1.18.18.tar.gz 401335 BLAKE2B c5bdccfe065444d726a7115042de4bb4294905da589fe31e7576f99ad53e4c4eea5940909ee39adf2f2dc4457dc049ef5905d2b2523300009cf00fc772506b0f SHA512 201c97c8c7d5fb7d4dffe050d7dba38a5b9188729be8ca3094f266e42ef3568dec198df24525bf26ea19560657100d63a32fd914917ec55ade6da42f1973bf5d
-DIST boto3-1.18.19.tar.gz 401907 BLAKE2B 6b333fad48a06c6c047bf415bf30620f81846a1c7862af47767588c6f5cf34f8f3342131ca511ffadb6d16a899c9fa499273a17e8db226c7314b69645a90ef2c SHA512 055d0d2d6f0ae51d311df8a9af742c82ae4224a1f5adaa873bf8e688ffa98310553630c147622fbdda304ef8a271c188c187d9e7851ea009cbf0c1bc2d5947d0
-DIST boto3-1.18.20.tar.gz 402208 BLAKE2B 6bf4ccdb388590bbc182c76204b3a82f91cd31332cd8c386872ed8be504931592cef01ae24786d8f8e7d2128f427570eba39a365c0f23dacaac4ddfd2eb9df13 SHA512 b91f1f38fa4832b8f9a3da6aef180f910cd676ef82b029735b984158115ad69fe4d87a86d8a915aebeda56d8cd0c3158a6a93ca37876bfeaafadb2f0364a3032
 DIST boto3-1.18.21.tar.gz 402611 BLAKE2B 39974c66ed5ad0697be6df04dbb141ce28e9a09863349f7adfcf756666d58ed02232453a9d86d46e62380c0b7f197a52b6869469309dff0c532e50a6bfc88403 SHA512 9920891b7be9d98c3a3d2f3065183532624e78fd2ff7a94d26594d2499cd5d17db0ac4ba6adf27f0e0f67fa836020dfac648babc144e4339a3dd717a1bd56ef7
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
diff --git a/dev-python/boto3/boto3-1.18.18.ebuild b/dev-python/boto3/boto3-1.18.18.ebuild
deleted file mode 100644
index bee358e1c595..000000000000
--- a/dev-python/boto3/boto3-1.18.18.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.19.ebuild b/dev-python/boto3/boto3-1.18.19.ebuild
deleted file mode 100644
index bee358e1c595..000000000000
--- a/dev-python/boto3/boto3-1.18.19.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.20.ebuild b/dev-python/boto3/boto3-1.18.20.ebuild
deleted file mode 100644
index bee358e1c595..000000000000
--- a/dev-python/boto3/boto3-1.18.20.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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 ~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 nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a8b44a9b2bfa..63c630422e73 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,7 +1,4 @@
 DIST botocore-1.20.112.tar.gz 7917776 BLAKE2B 6a5ebf3d32c505ec2c1fc4cd3d97aa94c76b6206dda6ba28a946dfdc9973073019389c05d1cf09a0eced701fe86a9b8a292835415c0b1ceea75959a3186f65c6 SHA512 4b36367ffdd011aeb7654fd5c52c38e95bae4c55e5af85e38b0764140539ad1f8b9d75b0c7fd1009fda8d005ef4b17673b06f85a76b52fcebf05925297b6bbbf
 DIST botocore-1.21.15.tar.gz 8012673 BLAKE2B cdd2b4128e67c85879e85f61265b10c1e5765eebf65333059af56a6a5b1d650a7612c4b569afde2396704015294e74b717c35d49c3e08396b2c603b7d47c632b SHA512 a5916ffa64568b2040d6f76571d9d716d50339fdaaed61f4ff7be92a5dac2c3f967280330fcbd3d6c2e1c1faf7bd6012ce75dd66ff26fde9d830d334a9d7c45a
-DIST botocore-1.21.18.tar.gz 8034404 BLAKE2B f28cd392a0ca34bc5baa6316bcc9b040ab7cf429c6b16b1c9cb832d310640a75df21ac22634a565d91eeefcb1476f50487e2e80b52cfbfca1cdb9683e76d801f SHA512 485e3d293684659731061592082582678035ad657fe47cacd9f7608cf09d801bfd73951a3c0de77c65a79e6070638f0b3dddfa357d7f0ddbb773c70334b214b8
-DIST botocore-1.21.19.tar.gz 8042956 BLAKE2B 69f1ac5ad0282308998374fb4625c3a4e1203dc338c4f945b75f8c18c02754b02fdf88e65e9333876ea6495d7d2ee45e2b6592f6602676ace57f65b5f3fe6fd0 SHA512 2fcb1e8879ef963c54100e81923a05bef2830238c67f44f0627003be65335a019153c4537d375a54e5f180ac37cf99f30bef3b4f41edd350259128de48d1ea74
-DIST botocore-1.21.20.tar.gz 8041821 BLAKE2B 3691f5bf248c3d9d63e0ae46ce460e9d72662c1b6c526048cd2cf5ee4868892a2e86b41b37abd9fa8e9f90be92a1a171bc260a4de97de110aa3aea35f0170120 SHA512 b142fc293242f7364dfb29837436f84371c44289547668446a31180eae3615b31da6cc3a0634bca6d8cbebc990524009fd059b492979fb76250338d952fc99e1
 DIST botocore-1.21.21.tar.gz 8042971 BLAKE2B 888abb929e1d66c293bff9d3d25682590e0fce3173ca6e121b969d1ef92dd4bb3fd010f72ab4bed664ed6e2df94fd61a9211a3aad72742eb1d4ee2b192cb4f7d SHA512 f8f47c2a2ed07f90263fd5eefe593bf14e8bb2a8df599660f2c84c504a16eb1c370ff8edea0b809be34f1fe9c7e8a3d604b74689b9e16c0686e6ff7c640534a4
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
diff --git a/dev-python/botocore/botocore-1.21.18.ebuild b/dev-python/botocore/botocore-1.21.18.ebuild
deleted file mode 100644
index 5684261bd4b3..000000000000
--- a/dev-python/botocore/botocore-1.21.18.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.19.ebuild b/dev-python/botocore/botocore-1.21.19.ebuild
deleted file mode 100644
index 5684261bd4b3..000000000000
--- a/dev-python/botocore/botocore-1.21.19.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.20.ebuild b/dev-python/botocore/botocore-1.21.20.ebuild
deleted file mode 100644
index 5684261bd4b3..000000000000
--- a/dev-python/botocore/botocore-1.21.20.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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 ~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/mock[${PYTHON_USEDEP}]
-		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 nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index 545c8a5dda0c..e39f0a9061b3 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1 +1,2 @@
 DIST django-debug-toolbar-3.2.1.tar.gz 231177 BLAKE2B b07ed03a92b5799dafd1b15b41335c5da6994be1001b579c85e0923ccc092e617ce04c9a2f4344716213cdd62425737838a8539ca5b566928bf8b4c133e8451e SHA512 d28e13cc2e3bbb27e9c728037229adac444180e3831b88c9ac1aa0e139bd1e85f9190c7a324afe3292bde4ad0c919bd17fbde4998be266f81314b9b22c4a28e6
+DIST django-debug-toolbar-3.2.2.tar.gz 239313 BLAKE2B 0e53709a3857cefc0ff7a7176ca248891122b2d758264c32171198a22b0c105af414eaba0095b1435b4f071120038f4665bd84438d77a8f65156c056d523f60f SHA512 df1956d63e88d3cf9f831609b6191446a162afbf396cb6d20e5a42aab4276ab385943cc305cad58a9f388382b0dffabc8baedf2150182a4302e7da58ab3d6a5c
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.2.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.2.ebuild
new file mode 100644
index 000000000000..d5dc1ee3da54
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.2.ebuild
@@ -0,0 +1,48 @@
+# 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 configurable set of panels that display debug information"
+HOMEPAGE="
+	https://pypi.org/project/django-debug-toolbar/
+	https://github.com/jazzband/django-debug-toolbar/"
+SRC_URI="
+	https://github.com/jazzband/django-debug-toolbar/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	emake TEST_ARGS='-v 2 tests' test
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ewmh/metadata.xml b/dev-python/ewmh/metadata.xml
index 0efcc2f18dcd..6b34d95ccf53 100644
--- a/dev-python/ewmh/metadata.xml
+++ b/dev-python/ewmh/metadata.xml
@@ -9,6 +9,8 @@
 		An implementation of EWMH (Extended Window Manager Hints) for python 2 and 3, based on Xlib.
 		It allows EWMH-compliant window managers (most modern WMs) to be queried and controlled.
 	</longdescription>
- 
+ <upstream>
+  <remote-id type="pypi">ewmh</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/happybase/metadata.xml b/dev-python/happybase/metadata.xml
index 0f2e57ded13c..5f093b6f9587 100644
--- a/dev-python/happybase/metadata.xml
+++ b/dev-python/happybase/metadata.xml
@@ -5,6 +5,8 @@
   <email>chutzpah@gentoo.org</email>
   <name>Patrick McLean</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="pypi">happybase</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 0cddb611f8c4..121487129137 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,3 +3,4 @@ DIST hypothesis-python-6.14.2.tar.gz 9135496 BLAKE2B f77f0668c4d0c2f5a952e06a40a
 DIST hypothesis-python-6.14.3.tar.gz 9135537 BLAKE2B 2effb0c68cf3a7a2f7d56c0c46c2ba36cbed4fed35b8a617ec68a721990247370772b986f0492aab112f7420c07409f8d738485ca28f42e7aea919af52611b10 SHA512 1722c5dcf1eb7375fd09d4208851826582808449fcaaa0345f1461d9a531961500a9c888bec5a457efbbb34f8178464b3358a3187b94bb5c783af42b4e7287ce
 DIST hypothesis-python-6.14.5.tar.gz 9135819 BLAKE2B 2e42949f81024038b901231a8446203388c8052ebaacf4a87d21356265fd1c09c9aa8b191dcd65780d45cc52ed9d48bb16440fc553addb4671e0ad901213ef64 SHA512 d047eea19129d5855bee5f012f5c91fe1f0de40228600fadad9c76709f951c003450f613f59848064b58f9d0e559b54b44744ae0aae689687488b6506cc8fe1a
 DIST hypothesis-python-6.14.6.tar.gz 9136187 BLAKE2B a9f0d24882266d5ccce0e940fb7e28ae654361215829ae87410ea18a0d304a78ecbfeaa8b74f7c415d60991e43f7b4beaaecbaaabbb697dac47aa360c5d59366 SHA512 fecf5af77d5f355861b6fbf3ea964a741b501a9db032c3f2ded2fb51605f2b961e2ad0633f671d6ffbc2e6ff4ca27412eb456ca7bd9a72a4a9e8b89cc79a7042
+DIST hypothesis-python-6.14.7.tar.gz 9136527 BLAKE2B 46176df0ffac48d3bff68a83b03b316506236e8a89365c419d61d0e8dae98a54961da3715377475ba7ce89d9d989e63b75eed1473758896c13bc8c0937617b12 SHA512 bb04434893c7cf937c1f1fc733fc424b48e87ec00d3f650ad85b1749b37f18b3a4718c346739d9121b4461d46516ee1af934a34922cc6ec626defa5ffb1e531b
diff --git a/dev-python/hypothesis/hypothesis-6.14.7.ebuild b/dev-python/hypothesis/hypothesis-6.14.7.ebuild
new file mode 100644
index 000000000000..01270134d6dc
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.14.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pytest-describe
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/markuppy/Manifest b/dev-python/markuppy/Manifest
deleted file mode 100644
index a3aef08d273a..000000000000
--- a/dev-python/markuppy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST MarkupPy-1.14.tar.gz 6815 BLAKE2B 219a220c3aefd2870a6cfa6e4d460989cfdecf65a9e760a222f70d202ee4d6d4ce287f08a7e881218360d662c5281f140c9a4a176182fce19d548707a998ec63 SHA512 dbc0abaaa0b9ffd95d2aebe62e5f718a44a0e614eeded5f3624df190778f11a10aa98e34c444e38295ac05de38c4ddad57fe885446ebe7c4b9fd1d64b312f168
diff --git a/dev-python/markuppy/markuppy-1.14.ebuild b/dev-python/markuppy/markuppy-1.14.ebuild
deleted file mode 100644
index 89cb9d172572..000000000000
--- a/dev-python/markuppy/markuppy-1.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-MY_PN="MarkupPy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MarkupPy - An HTML/XML generator"
-HOMEPAGE="https://pypi.org/project/MarkupPy/ https://github.com/tylerbakke/MarkupPy"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64"
-
-# MarkupPy does not have any test suite
-RESTRICT="test"
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 6b2266332ce2..0fb1f79533f6 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1 +1,2 @@
 DIST pydantic-1.8.2.tar.gz 301802 BLAKE2B f02fca273c356dd0ab177de73d21da7749e1a9ea1ead92f4e82b44285b97e8b8431961b2c30d230cbec817698791e4b0cdf8498615b7a0639fa739b09f1b58e8 SHA512 0a28c64b97678b932092e546da877a4a6d104fc7d3b7cb043b3494f0b7c6900cdc1ab8a83bdbd1879956a81da1b28ca27578b1a003bdca3e08f0f107e5690e06
+DIST pydantic-1.8.2_p20210719.tar.gz 310729 BLAKE2B 1905ddd100e3a40b48eadc7beb75542f4a59ff8ef55115105041b0c06249ee67df1ca91003bc01f828c543c757ec8931ff2d31663d33ca16f356f62f71a61474 SHA512 c9d91788b3143b211755806e533ae0ccafa2ab101159f98eeba921ec9370956e8f8b0f210e6ddddcef2345ea391d2e1011ea5498d2f7985bd711f48d025e30d5
diff --git a/dev-python/pydantic/files/pydantic-1.8.2_p20210719-update-py3.10rc1.patch b/dev-python/pydantic/files/pydantic-1.8.2_p20210719-update-py3.10rc1.patch
new file mode 100644
index 000000000000..d4700a7e33b7
--- /dev/null
+++ b/dev-python/pydantic/files/pydantic-1.8.2_p20210719-update-py3.10rc1.patch
@@ -0,0 +1,174 @@
+From: PrettyWood <em.jolibois@gmail.com>
+Date: Tue, 10 Aug 2021 18:00:16 +0200
+Subject: [PATCH 1/2] refactor: rename `is_union` into `is_union_origin`
+https://github.com/samuelcolvin/pydantic/pull/3085
+
+--- a/pydantic/fields.py
++++ b/pydantic/fields.py
+@@ -41,7 +41,7 @@
+     is_literal_type,
+     is_new_type,
+     is_typeddict,
+-    is_union,
++    is_union_origin,
+     new_type_supertype,
+ )
+ from .utils import PyObjectStr, Representation, ValueItems, lenient_issubclass, sequence_like, smart_deepcopy
+@@ -557,7 +557,7 @@ def _type_analysis(self) -> None:  # noqa: C901 (ignore complexity)
+             return
+         if origin is Callable:
+             return
+-        if is_union(origin):
++        if is_union_origin(origin):
+             types_ = []
+             for type_ in get_args(self.type_):
+                 if type_ is NoneType:
+--- a/pydantic/main.py
++++ b/pydantic/main.py
+@@ -38,7 +38,7 @@
+     get_origin,
+     is_classvar,
+     is_namedtuple,
+-    is_union,
++    is_union_origin,
+     resolve_annotations,
+     update_field_forward_refs,
+ )
+@@ -176,7 +176,7 @@ def is_untouched(v: Any) -> bool:
+                 elif is_valid_field(ann_name):
+                     validate_field_name(bases, ann_name)
+                     value = namespace.get(ann_name, Undefined)
+-                    allowed_types = get_args(ann_type) if is_union(get_origin(ann_type)) else (ann_type,)
++                    allowed_types = get_args(ann_type) if is_union_origin(get_origin(ann_type)) else (ann_type,)
+                     if (
+                         is_untouched(value)
+                         and ann_type != PyObject
+--- a/pydantic/schema.py
++++ b/pydantic/schema.py
+@@ -71,7 +71,7 @@
+     is_callable_type,
+     is_literal_type,
+     is_namedtuple,
+-    is_union,
++    is_union_origin,
+ )
+ from .utils import ROOT_KEY, get_model, lenient_issubclass, sequence_like
+ 
+@@ -966,7 +966,7 @@ def go(type_: Any) -> Type[Any]:
+ 
+             if origin is Annotated:
+                 return go(args[0])
+-            if is_union(origin):
++            if is_union_origin(origin):
+                 return Union[tuple(go(a) for a in args)]  # type: ignore
+ 
+             if issubclass(origin, List) and (field_info.min_items is not None or field_info.max_items is not None):
+--- a/pydantic/typing.py
++++ b/pydantic/typing.py
+@@ -191,14 +191,14 @@ def get_args(tp: Type[Any]) -> Tuple[Any, ...]:
+ 
+ if sys.version_info < (3, 10):
+ 
+-    def is_union(tp: Type[Any]) -> bool:
++    def is_union_origin(tp: Type[Any]) -> bool:
+         return tp is Union
+ 
+ 
+ else:
+     import types
+ 
+-    def is_union(tp: Type[Any]) -> bool:
++    def is_union_origin(tp: Type[Any]) -> bool:
+         return tp is Union or tp is types.Union
+ 
+ 
+@@ -251,7 +251,7 @@ def is_union(tp: Type[Any]) -> bool:
+     'get_origin',
+     'typing_base',
+     'get_all_type_hints',
+-    'is_union',
++    'is_union_origin',
+ )
+ 
+ 
+
+From: PrettyWood <em.jolibois@gmail.com>
+Date: Tue, 10 Aug 2021 18:02:57 +0200
+Subject: [PATCH 2/2] fix: "new" union and generic types are not the same as
+ `typing.GenericAlias`
+
+--- a/pydantic/typing.py
++++ b/pydantic/typing.py
+@@ -28,10 +28,10 @@
+     from typing import _Final as typing_base  # type: ignore
+ 
+ try:
+-    from typing import GenericAlias  # type: ignore
++    from typing import GenericAlias as TypingGenericAlias  # type: ignore
+ except ImportError:
+     # python < 3.9 does not have GenericAlias (list[int], tuple[str, ...] and so on)
+-    GenericAlias = ()
++    TypingGenericAlias = ()
+ 
+ 
+ if sys.version_info < (3, 7):
+@@ -194,12 +194,16 @@ def get_args(tp: Type[Any]) -> Tuple[Any, ...]:
+     def is_union_origin(tp: Type[Any]) -> bool:
+         return tp is Union
+ 
++    WithArgsTypes = (TypingGenericAlias,)
+ 
+ else:
+     import types
++    import typing
+ 
+     def is_union_origin(tp: Type[Any]) -> bool:
+-        return tp is Union or tp is types.Union
++        return tp is Union or tp is types.UnionType  # type: ignore  # noqa: E721
++
++    WithArgsTypes = (typing._GenericAlias, types.GenericAlias, types.UnionType)  # type: ignore
+ 
+ 
+ if TYPE_CHECKING:
+@@ -246,7 +250,7 @@ def is_union_origin(tp: Type[Any]) -> bool:
+     'CallableGenerator',
+     'ReprArgs',
+     'CallableGenerator',
+-    'GenericAlias',
++    'WithArgsTypes',
+     'get_args',
+     'get_origin',
+     'typing_base',
+@@ -260,10 +264,10 @@ def is_union_origin(tp: Type[Any]) -> bool:
+ 
+ 
+ def display_as_type(v: Type[Any]) -> str:
+-    if not isinstance(v, typing_base) and not isinstance(v, GenericAlias) and not isinstance(v, type):
++    if not isinstance(v, typing_base) and not isinstance(v, WithArgsTypes) and not isinstance(v, type):
+         v = v.__class__
+ 
+-    if isinstance(v, GenericAlias):
++    if isinstance(v, WithArgsTypes):
+         # Generic alias are constructs like `list[int]`
+         return str(v).replace('typing.', '')
+ 
+--- a/pydantic/utils.py
++++ b/pydantic/utils.py
+@@ -23,7 +23,7 @@
+     Union,
+ )
+ 
+-from .typing import GenericAlias, NoneType, display_as_type
++from .typing import NoneType, WithArgsTypes, display_as_type
+ from .version import version_info
+ 
+ if TYPE_CHECKING:
+@@ -152,7 +152,7 @@ def lenient_issubclass(cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any
+     try:
+         return isinstance(cls, type) and issubclass(cls, class_or_tuple)
+     except TypeError:
+-        if isinstance(cls, GenericAlias):
++        if isinstance(cls, WithArgsTypes):
+             return False
+         raise  # pragma: no cover
+ 
diff --git a/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild b/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild
new file mode 100644
index 000000000000..5400cb2e0eca
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.8.2_p20210719.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+COMMIT=0c26c1c4e288e0d41d2c3890d5b3befa7579455c
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="https://github.com/samuelcolvin/pydantic"
+# No tests on PyPI: https://github.com/samuelcolvin/pydantic/pull/1976
+SRC_URI="
+	https://github.com/samuelcolvin/pydantic/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-update-py3.10rc1.patch"
+)
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	# seriously?
+	sed -i -e '/CFLAGS/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 7f7de412fe04..45565b674f4f 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1 +1,2 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
+DIST python-caja-1.26.0.tar.xz 314936 BLAKE2B 1fabd7bafa19051a19643aa9f10180d72062bc485231760439d988936406e07b9e600a80c1c9d45c88a5ac40c0b16e90878c02dba81f722d8a6f60713fe28cc7 SHA512 632b0b4a9fa29bdcde3b84b37820a7e171b59e78972f71c0c3d25d52cad8233ae7d1548e23ed6d3a06734b084532db1c4e85c3beaed15fce88cf8abff5be35d0
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
new file mode 100644
index 000000000000..036ddc12a0f7
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="Python bindings for the Caja file manager"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
+	>=mate-base/caja-1.17.1[introspection]
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.1.2 )
+"
+
+src_prepare() {
+	MATE_FORCE_AUTORECONF="true"
+
+	sed -i "s/\$(PACKAGE)/${PF}/g" examples/Makefile.am || die
+	mate_src_prepare
+}
+
+src_install() {
+	mate_src_install
+
+	# Keep the directory for systemwide extensions.
+	keepdir /usr/share/caja-python/extensions/
+
+	# The HTML documentation generation is broken and commented out by upstream.
+	#
+	#if use doc ; then
+	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+	#	doins -r docs/html/*
+	#fi
+}
diff --git a/dev-python/python-caja/python-caja-1.26.0.ebuild b/dev-python/python-caja/python-caja-1.26.0.ebuild
new file mode 100644
index 000000000000..840dd3b06294
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.26.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Python bindings for the Caja file manager"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
+	>=mate-base/caja-1.17.1[introspection]
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.1.2 )
+"
+
+src_prepare() {
+	MATE_FORCE_AUTORECONF="true"
+
+	sed -i "s/\$(PACKAGE)/${PF}/g" examples/Makefile.am || die
+	mate_src_prepare
+}
+
+src_install() {
+	mate_src_install
+
+	# Keep the directory for systemwide extensions.
+	keepdir /usr/share/caja-python/extensions/
+
+	# The HTML documentation generation is broken and commented out by upstream.
+	#
+	#if use doc ; then
+	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+	#	doins -r docs/html/*
+	#fi
+}
diff --git a/dev-python/python-caja/python-caja-9999.ebuild b/dev-python/python-caja/python-caja-9999.ebuild
index 0a2e3fdddf7a..ffe8c3d3b7a0 100644
--- a/dev-python/python-caja/python-caja-9999.ebuild
+++ b/dev-python/python-caja/python-caja-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,30 +13,40 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-
 IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
+	>=dev-libs/glib-2.50:2
 	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
 	>=mate-base/caja-1.17.1[introspection]
-	x11-libs/gtk+:3"
+	>=x11-libs/gtk+-3.22:3
+"
 
 RDEPEND="${COMMON_DEPEND}"
 
 DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.1.2 )
+"
+
+src_prepare() {
+	MATE_FORCE_AUTORECONF="true"
+
+	sed -i "s/\$(PACKAGE)/${PF}/g" examples/Makefile.am || die
+	mate_src_prepare
+}
 
 src_install() {
 	mate_src_install
 
 	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
+	keepdir /usr/share/caja-python/extensions/
 
 	# The HTML documentation generation is broken and commented out by upstream.
 	#
diff --git a/dev-python/python-keyutils/metadata.xml b/dev-python/python-keyutils/metadata.xml
index 1d5e26b4da15..26283c4f12a8 100644
--- a/dev-python/python-keyutils/metadata.xml
+++ b/dev-python/python-keyutils/metadata.xml
@@ -5,6 +5,8 @@
   <email>bkohler@gentoo.org</email>
   <name>Ben Kohler</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="pypi">keyutils</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index ccc173e4bd89..963c037941b3 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,3 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
-DIST sip-6.2.0.dev2107131757.tar.gz 1180225 BLAKE2B 456111e610d872c4b7a875f99e151a82ba3ed1ff11f7d93b19558c52f37e710e448387256d0f620a497d260d97c583c53cbcc5a42affd6e7c05e4f557ae97732 SHA512 260d86d676a56440ac78099de9998697114ed5deb1ed15299aaea68b49b8ea829dfb92f990762875abff0a0c653e4998f1a91437895ba8d38cdac5cf4f2c5761
+DIST sip-6.2.0.dev2108061427.tar.gz 1180652 BLAKE2B fa1b64d1960c2687a0eaf8a8e611885a7860d46fe3a23be65d86ac3bb33c19d2d6796461aa04dc75568ca8313aee04a74b848e31897889b02f96966aa0de4c89 SHA512 68f9708b7113516c25257890c1dd3b4497b9268193c3000fc29b372e82e15cdbfb66c8a6417e066e257f4a28e336f04ada6e126207d5b8778e78e0b9970f62d2
diff --git a/dev-python/sip/sip-6.2.0_pre2107131757.ebuild b/dev-python/sip/sip-6.2.0_pre2108061427.ebuild
index 1ff4a314a900..1ff4a314a900 100644
--- a/dev-python/sip/sip-6.2.0_pre2107131757.ebuild
+++ b/dev-python/sip/sip-6.2.0_pre2108061427.ebuild
diff --git a/dev-python/tablib/Manifest b/dev-python/tablib/Manifest
deleted file mode 100644
index 7e076250afaa..000000000000
--- a/dev-python/tablib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tablib-3.0.0.tar.gz 95049 BLAKE2B 6c7c39f4ba6d8ad08264d3ed6c848ca37d8e2c834aea863a1f79fdcac783ef5fe25779f7d83d38b07c4e2fa47184964e732bb35a8094a98e1350812c2f6bbc6f SHA512 32deac7a05663da9d96f4ef7dc5c4b5e3b8fc4b7a0477c1a807ae83322035e8a99d4f709dfa11ec19af69ac75d7044a469c1b360cdcde3311cdf97d0f584b0e6
diff --git a/dev-python/tablib/metadata.xml b/dev-python/tablib/metadata.xml
deleted file mode 100644
index a69acba7f85b..000000000000
--- a/dev-python/tablib/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">tablib</remote-id>
-  <remote-id type="cpe">cpe:/a:python:tablib</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/tablib/tablib-3.0.0.ebuild b/dev-python/tablib/tablib-3.0.0.ebuild
deleted file mode 100644
index 64ad1a8b210c..000000000000
--- a/dev-python/tablib/tablib-3.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Format-agnostic tabular dataset library"
-HOMEPAGE="https://pypi.org/project/tablib/ https://github.com/jazzband/tablib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/markuppy[${PYTHON_USEDEP}]
-		dev-python/odfpy[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	sed -i -e 's:addopts = -rsxX --showlocals --tb=native --cov=tablib --cov=tests --cov-report xml --cov-report term --cov-report html:addopts = -rsxX --showlocals --tb=native:' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/thriftpy2/metadata.xml b/dev-python/thriftpy2/metadata.xml
index 0f2e57ded13c..01d484affc56 100644
--- a/dev-python/thriftpy2/metadata.xml
+++ b/dev-python/thriftpy2/metadata.xml
@@ -5,6 +5,8 @@
   <email>chutzpah@gentoo.org</email>
   <name>Patrick McLean</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="pypi">thriftpy2</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/tldextract/tldextract-3.1.0.ebuild b/dev-python/tldextract/tldextract-3.1.0.ebuild
index 77a6460bb9e0..7671dfe1ce88 100644
--- a/dev-python/tldextract/tldextract-3.1.0.ebuild
+++ b/dev-python/tldextract/tldextract-3.1.0.ebuild
@@ -21,7 +21,12 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests-file[${PYTHON_USEDEP}]
 "
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index d70efdee269e..53cda200a570 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,2 +1,3 @@
 DIST tqdm-4.61.2.tar.gz 169665 BLAKE2B f5dff67eb549cab0dd667815c25f6e885a2e0cefc2ad68e97fdc09599eb41b13589f7a88d5a445813973454a5e5f835b3139651ec2e09b717db0fd6dc705890e SHA512 bc33e8fe00244f90f61ab51d0c7c0b98d5580efebd9758284d9dbe2a699eabeb0d92871eedc2f95f377e29dd0f7ea4b5247b96cb4cc1687dcfea3a9ed1152ab7
 DIST tqdm-4.62.0.tar.gz 169668 BLAKE2B 64a3df2f00a4fcba6bb67ae15e04f392a73b54cf7284f3c013ad31d00317e9d84ac2e1feed302137aeb7ea9e3c9d1d730623cbd96e8c76c46df6382435146efa SHA512 dd60d5522b68086410ec5f02574477dcc33a887ef509cc1d1735921dd906f951180d6115680517b3abbd2cf6c4ee1c60b9c950654ea9b7642d52d28052326088
+DIST tqdm-4.62.1.tar.gz 169567 BLAKE2B 99e14631abe19d20d0fd67e1f885c307544103928f22e8913952b35adc2e596d4efa54fa4fedf4efdb1f8b83efdcee5de25052d6aba1974a668ba44f80de37dc SHA512 485d5a88588d026b3311419839abd57f8092295a2e68341708aa2c4ff35a97e30e9eb0db0db4ef9b0fc19c4d7b575ec6f30b213b97cb7498a9267d7c6e0a57ce
diff --git a/dev-python/tqdm/tqdm-4.62.1.ebuild b/dev-python/tqdm/tqdm-4.62.1.ebuild
new file mode 100644
index 000000000000..fb5870f00137
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.62.1.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip unpredictable performance tests
+	epytest --ignore 'tests/tests_perf.py'
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tzlocal/tzlocal-3.0.ebuild b/dev-python/tzlocal/tzlocal-3.0.ebuild
index e99ac6fcb87d..42b2b74fe924 100644
--- a/dev-python/tzlocal/tzlocal-3.0.ebuild
+++ b/dev-python/tzlocal/tzlocal-3.0.ebuild
@@ -19,5 +19,9 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
 	' python3_8 pypy3)"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index 0ba65e2d73cd..1997ddc674c2 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1 +1,2 @@
 DIST zeep-3.4.0.tar.gz 163748 BLAKE2B 52709b22bf3dbe228630fcaca33dbfb1f9bb2fd6fab9a2f3ad1cfdf92f84aa2a5b1b71dbd5d41eca3bc12a9ac022d27191929533578441ff020e574fe2b95cd8 SHA512 31adea141ffaabb122a2127bcbba2742ed15d4cef91907c8db4aefd8550b2259502a4122825cbfa62559fd5babd3d0c6ce2bf82dd3b79cd9026d8ca008897349
+DIST zeep-4.0.0.tar.gz 163646 BLAKE2B 84547f5ac5bfb42f6bfbe9879ae19466270e7699764a0f91b68d927d1776a040307ccc4f482dce93b765b8b3de191615d6a7b6a3fda38655c312c02a962fc954 SHA512 1ccc59d6ad1979f291cd89d0ac73d7bfc886501d7939c7e788b700454c571deffcc5a93c0e4fee7d6bbce4ad3cc2b309a95da57bcc4551ee5b37111e2fbc0acb
diff --git a/dev-python/zeep/zeep-4.0.0.ebuild b/dev-python/zeep/zeep-4.0.0.ebuild
new file mode 100644
index 000000000000..96ef55d69033
--- /dev/null
+++ b/dev-python/zeep/zeep-4.0.0.ebuild
@@ -0,0 +1,51 @@
+# 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 modern/fast Python SOAP client based on lxml / requests"
+HOMEPAGE="http://docs.python-zeep.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="async tornado"
+
+# TODO: remove six dependency when this is merged:
+# https://github.com/mvantellingen/python-zeep/pull/1250
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-file-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	async? ( >=dev-python/aiohttp-1.0[${PYTHON_USEDEP}] )
+	tornado? (
+		>=www-servers/tornado-4.0.2[${PYTHON_USEDEP}]
+		<www-servers/tornado-5[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aioresponses[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/python-xmlsec[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpx[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest