Adding metadata

34 files changed, 515 insertions, 113 deletions

diff --git a/dev-python/Faker/Faker-9.3.1.ebuild b/dev-python/Faker/Faker-9.3.1.ebuild
new file mode 100644
index 000000000000..1f1f09ada79c
--- /dev/null
+++ b/dev-python/Faker/Faker-9.3.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
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/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-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index a97fcdba1080..7e2a71ba2ea2 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -6,3 +6,4 @@ DIST Faker-8.14.1.tar.gz 1163121 BLAKE2B c4f42696f34872630a5cfc0a5203ef2983ee782
 DIST Faker-8.16.0.tar.gz 1164636 BLAKE2B 162c66e09eeac7c52fd8d289c10b8b9694dca955c17c00d0fd5772da3b68af8a86bd997df0acae1c104a6de4fa3789c95236544725c8094b9abb1432ea2c9044 SHA512 bb74d3d03a8afef8f961a71921f41650d2fb7faebc0be18fc8da341f2cd67746488109a09a2506210a86379eb65423d47054933901de51f33859ab2797f96c2f
 DIST Faker-9.0.0.tar.gz 1164493 BLAKE2B e87a1ccf15ae9db6b263bd229987deb00485a1d43fb20b3c6155ea5a10ef132d1d5def3f66bf00377ecb7db2f9ae24eb259b768d3713257b3c3832cf98f8fc4d SHA512 ba20a218693b14df8cb7d1387695ed8026618b410f0caacc658995ca9235af11d4114a6737aeb5788f0aa8c499e6701acd21983b52da5a5823438c230a5808ef
 DIST Faker-9.2.0.tar.gz 1166874 BLAKE2B 8590431fea1179a2e6459ae9b2d6d55e8b95a91848c26b6f0d9035be2568c5f3ca34708b4bbef7d06b53855c1c1fe800ad723f90ee330f9fab4c13e00530ae60 SHA512 1688bde73002419d73924435fc11b0346cafeae8f3d80d8162c7742859258f1ce34fb3b549d11d92e114fbdbb22c51776a9674f04b4f170a42cb2919ed3b54e4
+DIST Faker-9.3.1.tar.gz 1169930 BLAKE2B 464f092a5014ebfe2d6c1a83f8d30f13507835a35e8307a22accdd6da92dae02a541ae2f686d724686855ded7b7e0f3c1f3922de0040e22478d9b55b2833b84f SHA512 e7468b4d91b47ad22d300a37dfa21b91f354b46f845854a9fe8b40da61624dafea5fca4f519939fcc16a84e9d9d9f33f715dabf4e231b9950b4a5b3a37cfacd0
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 5193db06b013..090e99f8964e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -7,3 +7,4 @@ DIST boto3-1.18.55.tar.gz 422930 BLAKE2B 2e30f585f2a99d30b9683893c706a9d00bcabc1
 DIST boto3-1.18.56.tar.gz 423262 BLAKE2B 97caee83b3bd074157096383d069427f1a2fae7917927983d5e9f3c1f11cf5d710050a505bdfa047259434b9b8f358f276de54a9e879b31c0eafb3c14f5c172a SHA512 cda79fc07e1f4c37b3aa0644bd1e81e157de19b1b47f4cebd5d7a66e5ca9653649ba9bf84c7d88dce383b592d673b0ee85fa823247517aa24f869af13755ed2d
 DIST boto3-1.18.57.tar.gz 423704 BLAKE2B 8b778a6e5549ed81ae411521e3d1e4792a18a539a3f7896022739ca25a9ee1f266b555f4baee507ac71c5129c6a8e919e6d95255f5c0dd64136d89d6fbe5605a SHA512 cad772acd9c93e61fd3f77c935986e0d50235591c63bcb27bc925292012a66c7d0a4a62e6c5129b8f26978eb9e5802eb80533e24566d8b369951c6c5ea42e28c
 DIST boto3-1.18.58.tar.gz 424336 BLAKE2B 3f1d74885b0668e4926c90395da4cdb1fd5a59ae24364d6c3f409ad29e3f8d0bbe733a7166ec6d33aa4ffeef97f42838af9c304ccf3e82815fe6018bfb8c4f25 SHA512 f44f93d2ea5a86f394c5f5875c02fcfd2056071fe0ff4cb482b8c861f01485001a5cd036a4c34435818e55a8bdae6d58c96761ff843dc9326c1cfe22be3129a7
+DIST boto3-1.18.59.tar.gz 424810 BLAKE2B 1228af67809b75284a3c1688e83aff35e9637bab5db82a2be22f5ccdfa3f999df4dbfeaf0cea2bd1ff02d5224a67c8e0a39e7301e1357a5ac1cbc1f6d00219db SHA512 93c6892eeaeb8b48e7e10f2d8fbd5d84b600fe0bc8474a7589ed21aa084b986b67a84a88d7cefe0ce5db16a4b9a4dbf86918aa22f1abd019aed835d130ac28ee
diff --git a/dev-python/boto3/boto3-1.18.59.ebuild b/dev-python/boto3/boto3-1.18.59.ebuild
new file mode 100644
index 000000000000..30a0b44d3f8c
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.59.ebuild
@@ -0,0 +1,53 @@
+# 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 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
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index cd9c64dcdeeb..a9a072b4dc46 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -7,3 +7,4 @@ DIST botocore-1.21.55.tar.gz 8225756 BLAKE2B 8a0d333802cc196552d905c61716f601e27
 DIST botocore-1.21.56.tar.gz 8227172 BLAKE2B 0a783e76c0a4a3ea577661a5995fdb2e53658aa462a6e59a950979c3c35864e94df1848aa5af40270e03833797bcd48c45f633dd8fbb198b2913df975f59069a SHA512 cb4f3e72f8d0bb9451b6b748e3763f6456937938047a2d9a6c5f47c498329b6930bc324e7d6f296952816c96aeb74047f7c2e33044abb551d289d24659a406e5
 DIST botocore-1.21.57.tar.gz 8239528 BLAKE2B d2b98f37468e0faf593d5fd42341dcab32d7ade253c80929722adbe7523ed6efb2b491a12b4335faf779703acc6eabbd3e1c6e0a02994d24dd13cea7d376bf6e SHA512 6bfcd57c7ac77c1098004e5e8a77c14a3718099eda5af00fbcaa0f54fabd93caf0ce66212c5807ae58d565cadfee25dfdcff9dcef8a68e66ba74f03ee28acfb9
 DIST botocore-1.21.58.tar.gz 8243903 BLAKE2B a8666451aa7e39114afce45d1eb82fed8f1747b6f994dc5ec76f8c675c363fd196c2c23d26738ca2a1c67e451d2eff1024d01ef97ff0dfb425d8fa85a9c0eef6 SHA512 424f13d7f3c5c2b3b2546cf42f22588a53c407867c8e2672c01f6c3791d101ff42f5d7a300cffbcccafdfc78f28a4386ef9acc4562de3c124198d1c898e5701d
+DIST botocore-1.21.59.tar.gz 8247144 BLAKE2B 6c3a5030be52dd59c6aa02baa13766134957c929cebf5332b0ba506e7cc0698b38062b37149367e405633ddd35ed7b0b2977500c5f9416eeafa6107f5536f03e SHA512 9675824c6509fb102bc124a8cf35329f2742526381d4f8966a6ef7dd21ac37b15f386f8c1f268f5528732d81d8b853ab5f1b96e869ab1d3bed099f2e871aa43d
diff --git a/dev-python/botocore/botocore-1.21.59.ebuild b/dev-python/botocore/botocore-1.21.59.ebuild
new file mode 100644
index 000000000000..9cd77a5ad4d0
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.59.ebuild
@@ -0,0 +1,50 @@
+# 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/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
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index aaf01e794f86..544195805139 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -2,3 +2,4 @@ DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac
 DIST charset_normalizer-2.0.4.gh.tar.gz 363800 BLAKE2B 81a0474238fc2fad6792201629286c261af73ed5dc3c7c4da525b356507f53bfb3e53d1ed325647295986a16fdd2a1e4bec00ee0648cb6e44f201196ef778556 SHA512 64fdddf2b6574828cc37dcb310e5e023d994e9cd4f8a7f6fb5796e997542cb1b14d9444994ab2594267361712a125fa476205462f9c7fea95505eef3c9770d5e
 DIST charset_normalizer-2.0.5.gh.tar.gz 368109 BLAKE2B 42e4cdeaf9a4e57c87e9813a6d1f31492aee29e37eb8c42721748b658064b16f0926dc6ffd794bf165718c4caf9484e139ca4024b89651d7ccdcbc6d907cf7f0 SHA512 5be0a72e51b9454e8a1ab670815526d54e03e42a0fd6de6ff5705000b3cb9af1ab2ad7f3457a898274d39c091603cdc8e2a925dd3c8e39a63910a5e480155b0d
 DIST charset_normalizer-2.0.6.gh.tar.gz 368270 BLAKE2B c80304b0e0f949d933fe210184d3892b7cbf52aeaf266834c4c358ee40abe14f660e2ad465aeecb76aebc8d3a12fe897b9cd7bd8ffa9e92fe0cbad07fe1526b2 SHA512 04ea17fb1d61b88b4036f33a4b03df824e246e57590a5b64ded8e44298bb1d07ebf276ed6a2dc189580d7563e267ccadb3280728f1e5ac5f29cedd5b84bd6dc7
+DIST charset_normalizer-2.0.7.gh.tar.gz 369094 BLAKE2B c04be56df2eb936fbad26c083d5057a2614c9ec4eca694e9c49c8e6eb63e803f82f97863b857d842204962949894b2e5971dda285c279d00ae61f7e2a5d8b5bc SHA512 a5fbcb03348239254b4e4ce9eefbe676f41aed0248af9f2e3224f8d3a4265af97f044eb1dda5aeb20db2b901d3b656d68bb50d507453cfe0eec6031ac87b86d3
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.7.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.7.ebuild
new file mode 100644
index 000000000000..58556810e6b3
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/ousret/charset_normalizer/"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index e533bb475961..c0b2ce702cdd 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,4 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.5.tar.gz 691258 BLAKE2B 66bf340956b760d996ce424f977b407eb74062db56108e4910459dbcb7c271820ca655a648021763aede1c4d87c44524cea0cb34f969f203f630d48cf15b05b4 SHA512 fb78b4920a2f18afb9545a6f13910f491708443965881954fff6ee8553ab3d6bd898f7a95df1091435e8d5627ac850b880a6233e716a6acb934ecc195ec2ee52
+DIST coverage-6.0.2.tar.gz 722511 BLAKE2B 43a860610921fd0df106cbe26ba094e5a11bf1137a795a15bc22d82d0f813e8dc67bfe660757d325f15f719429b480ca625ebe66569489ed8c4c477bac23c393 SHA512 a43a312d4668846b6f72eebac1a289d0a603303cd32624c3308cce8934f693c7d3786b36da5cea3ff1cce60f93110a2ded168304e1ca9a79053f0886b7f1bf17
 DIST coverage-6.0.tar.gz 719495 BLAKE2B fa2768cc34f5c8e5e1b0bd328dda4b83bccae4bcb37b1e2ea8ff9a7fad973239a264f12cea7fae7ed129abe1a7aa86b43e2e32fcfd5c4de2077c8b32f405cd3a SHA512 b9a5dcb2aeb8517a9a52feadfd817727086d88682d9d93d65d9f4d7b6116d8eca1ecceaccc98ff34ca2fb1c2d4dc457d0d58d387465e67970ae4df0f4c9f7ca5
diff --git a/dev-python/coverage/coverage-6.0.2.ebuild b/dev-python/coverage/coverage-6.0.2.ebuild
new file mode 100644
index 000000000000..4d180441af18
--- /dev/null
+++ b/dev-python/coverage/coverage-6.0.2.ebuild
@@ -0,0 +1,54 @@
+# 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 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" igor.py zip_mods || die
+	"${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		"${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index c60ccc28e3ab..bb87261c8e78 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,3 +1,4 @@
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
 DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
 DIST flake8-4.0.0.tar.gz 154732 BLAKE2B 3d469e3e12212051abfeb93943ac8ec310e607c86c06db47b5487544e582f39480e76bc8ea621c5dba6493592eff64b19cb2be9b6b122527c66993415fab15ab SHA512 202b89c9b93f10a09453a215bbcd4260513ee21e4c1b3591088779155a4ca7277a1c274edbb12fcaf33d29ebe9389a3c57ce5aa4e12434f17960dcb0f769680e
+DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
diff --git a/dev-python/flake8/flake8-4.0.1.ebuild b/dev-python/flake8/flake8-4.0.1.ebuild
new file mode 100644
index 000000000000..3cfc2fbff3ef
--- /dev/null
+++ b/dev-python/flake8/flake8-4.0.1.ebuild
@@ -0,0 +1,42 @@
+# 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="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3)
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		${PDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	# remove version-limited dep
+	sed -i -e '/importlib-metadata/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index c6921b38447c..8748c8483c0e 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,4 @@
 DIST google-api-python-client-2.22.0.tar.gz 26831856 BLAKE2B da93f1bca651cc01819c5f5ab43a6c767662db7eb85efb9aa08d2f9b54bc9efcc7622bff3207604ffafea9c88de8a393f5084c225078d896da5fdee1f2e56350 SHA512 427ead4173ed14b2df0560e35c5ff48a98d4abb5d449c26f84d9e7bb169bf46402eaaea0dab7988dbefd5ceee975b19a160cd797d2169030bb5bf1a54accda11
 DIST google-api-python-client-2.23.0.tar.gz 26877979 BLAKE2B 64ae1132f8d380e15b5856c7b7683ceb7bf6f0f65400b2407195be7e30a0982288a0f7892e70b659c0984823d5dd0c3d4115eb781643a584091580ac1ed480b4 SHA512 da8515a0db759cfa4e9b991fd04811e9d213a35c184e993e2439e00860ce86857c2968da75dee3ec755a2f679ab44219d4cc1ed817e7ac24664e667412205566
 DIST google-api-python-client-2.24.0.tar.gz 27072085 BLAKE2B 285da09fff461ffd100a5fe603f970fab6d552197690279e0c0d411700b95109bde523c1cba84a3fbc04cdf7bc13237a4432014912e0c79aec0c1d82e42c8c69 SHA512 84f0e0f95de0bede13e76eac3885b2a40a61d3ad522cb11a59cd3ab1d7bf6a7368a21232f9a9f64905bfaa2bd7a9b359ee3dee2a53e1dc303e8aede14dbdd466
+DIST google-api-python-client-2.25.0.tar.gz 27073397 BLAKE2B 0bc1d2c75cf826cc3326406909ab874b7ac51fc823bf5367fd56abebdfba50c035d4b92e3a0d19b8cebd8d570742e9aa3bdc7745c139624e261bc89fba8c789d SHA512 7940408b1d6ec42e1a9cf5a3ecb20eb3d4c3b35d4b363237c6bed0f32a1fb4be0fda11a0c9039a6cc5cf28ba05d0f183ff7b7bb2f5cb3f1bdf071f328b851035
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.25.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.25.0.ebuild
new file mode 100644
index 000000000000..8647284e7595
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.25.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="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.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[${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-4[${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 --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local 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
+	)
+
+	distutils_install_for_testing
+	epytest tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 53996f4e32c0..6159509d15e4 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -2,3 +2,4 @@ DIST iminuit-2.7.0.tar.gz 384016 BLAKE2B 857df47e8f4779c41b32e624ce3c5dfe16f39f5
 DIST iminuit-2.8.0.tar.gz 389147 BLAKE2B f54de6fb39d942c39438e82cb38f04974f0e565d31c3bb06ac39f73a28b82207f7590d9039e491c8dc44286e4311ee3f6f0114be94754104e0d0a06af5fa8acd SHA512 89655a5c925d6f02cde3c8a3139a0c93e9a667a6e0a34ec1f99d5b0f91c79671f2b325553359daeed91437d474e31354088b66a58e53e8235dcbbb4bf6da4935
 DIST iminuit-2.8.2.tar.gz 389847 BLAKE2B 0d30e2f3a933c446e985d205b4a5d4289856ff48743486cdaddfd6c655dbbe833a0d0a6aca10ee2d747d51a18f8b20c3e1cdc4cf87717321a2cc9f87726f98d8 SHA512 02a3d3e436bc78840ff48af425449cf8467265d9f95c1a9bdaced664e3f167bb29876d1b3717b1e0fca656dd4108f1526d0be846a6ec0cdfb9f1d7243ccb283b
 DIST iminuit-2.8.3.tar.gz 390386 BLAKE2B bf5d67c92722c5623b9cf19547d934f1c53c5aeae88ef3e4d9d9c9fac00c99a3969e29a2e00d1cf2ada35cac4373b15d6f7831a217e91068b307d2c256854949 SHA512 201844da1cc3c9eb5c06a851f5040370ec57d86ec7e47d531cd49595142d2c5788468f76da4de1ac73ca6691bbddef8c0f23444aa9036a9309c80c1e9d218190
+DIST iminuit-2.8.4.tar.gz 391667 BLAKE2B 15d82db308ac361f45399debb342ba350c6ec83e111fca16baed99dc029010284b946292f4236e26ae5cdd60f7a130902bca53669b31e335d706ead77f6603db SHA512 564506921027d6addffb9df6f2ad2aec69981af49e2552f4d093d03fbf79f12a72e6dec58f159810d621a58ddd56dbf1258359d01d56d33a7c30b08eb5b333ed
diff --git a/dev-python/iminuit/iminuit-2.8.4.ebuild b/dev-python/iminuit/iminuit-2.8.4.ebuild
new file mode 100644
index 000000000000..81d69bf76f88
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.8.4.ebuild
@@ -0,0 +1,32 @@
+# 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} )
+
+# forced implicitly
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx epytest -p no:pytest-describe
+}
diff --git a/dev-python/ipykernel/ipykernel-6.2.0.ebuild b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
index 835ff26b76ef..e727869d3caf 100644
--- a/dev-python/ipykernel/ipykernel-6.2.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index 34de6f839c2f..be1eb9d482b8 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1 +1,2 @@
 DIST pooch-1.4.0.tar.gz 57097 BLAKE2B c891387011c99edbb78d84a8301e18fbfce36ecf6e87372ab384921d7e608abc2db2d3b3b37229ba193f3dcebb03f8df546c266075a0a35f18856ff38b3f94e2 SHA512 f883ecbb8831a179338ad497376ced25afa812ba3fdce7db4eb85aca00368aaf7c9c9f4dd58348b24f182b59e5de52bf490f03b6d4b6a807c4dcc182ac89627b
+DIST pooch-1.5.2.tar.gz 61167 BLAKE2B 36c3ac00ae1d05b688fabc31ae9eb88536d717a3dd179a02bf76f9c8066520bc165af0a71d5cd514e7c9f2422c4a3ee189cf93215bc9a9189bf9f20a77f95e61 SHA512 acb1a48e94a97f79503125f0cf1312d715719ec32817771d2e19d2bd89b2cfd34b50221d67d1854cd93818140d8536f6f5b3db1ae0bbb185fffa2cf9886f98da
diff --git a/dev-python/pooch/pooch-1.5.2.ebuild b/dev-python/pooch/pooch-1.5.2.ebuild
new file mode 100644
index 000000000000..88353cd89298
--- /dev/null
+++ b/dev-python/pooch/pooch-1.5.2.ebuild
@@ -0,0 +1,35 @@
+# 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="Manage your Python library's sample data files"
+HOMEPAGE="https://github.com/fatiando/pooch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pythran/pythran-0.10.0.ebuild b/dev-python/pythran/pythran-0.10.0.ebuild
index 9f61c0b9075e..52c9dbe2330f 100644
--- a/dev-python/pythran/pythran-0.10.0.ebuild
+++ b/dev-python/pythran/pythran-0.10.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
diff --git a/dev-python/pyzotero/Manifest b/dev-python/pyzotero/Manifest
index 9c0c80365cc0..7b0bfc956c70 100644
--- a/dev-python/pyzotero/Manifest
+++ b/dev-python/pyzotero/Manifest
@@ -1 +1,2 @@
 DIST pyzotero-1.4.25.tar.gz 521569 BLAKE2B ce4e3587667078d295c0d2b7d0695aba0b9da22d40caa3aff405a6ed88b3061693d0d9d0db5bfdde074a3003b088705ed5c9443f3fa0f156d803114b25288b2b SHA512 d00d30da57d7f988b9e301d496a26bd983933567ffeb87d6d494dd7c93290315ad7fda8e791c4be382bedfda51ab5928ed37230f6649f60ce731f6b2f8ddfd39
+DIST pyzotero-1.4.26.tar.gz 520629 BLAKE2B 7ddcd55a1c21d6dcc4b610a9a29bc86ff002afdf2e2a90513219b9fd13b3d5b504736e122850fc81acf7a4bbca0b8c5da3a92c8eb3a6f07392e3d17a9dc7d73c SHA512 a0b0bf92458746b0dd0c01511efb05dd8fb471434c9e813c9d6dab7741a2eb1a10af2b9c5f68daa4c681353ba8c93cab140ec2da5962d06c76e8a229d4742009
diff --git a/dev-python/pyzotero/pyzotero-1.4.26.ebuild b/dev-python/pyzotero/pyzotero-1.4.26.ebuild
new file mode 100644
index 000000000000..617232e03b3f
--- /dev/null
+++ b/dev-python/pyzotero/pyzotero-1.4.26.ebuild
@@ -0,0 +1,39 @@
+# 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 Python client for the Zotero API"
+HOMEPAGE="https://github.com/urschrei/pyzotero"
+SRC_URI="https://github.com/urschrei/pyzotero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-text/zotero-bin
+	dev-python/bibtexparser[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httpretty[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# do not install tests
+	sed -i "s/find_packages(),/find_packages(exclude=('test*',)),/g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index a92be1d37ff8..56e6df96b26c 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,4 +1,3 @@
 DIST regex-2021.10.8.tar.gz 703541 BLAKE2B da2a35c0f95c208fe2a9951d4c8cf756cd9eecb3ff27c5d729e9b5702256cc12bdde896019abf2aa12d206cbaace0fa693be332ff8d8baa5e6e628866eb64dea SHA512 395fbef61d54fad539bbd1e51c9100cba02bcd3a147e95a32ff8c32cb7fca66df98bade638e24f9a5c6e5d6c7becca033f925c4fa675b4e6689cba8316a8b46d
 DIST regex-2021.8.28.tar.gz 694689 BLAKE2B 1aeceeb77df3c67e3ac14811000dc0f0cccf2a4994fd349f01f3a4e793f265dc9a73ea685202c6a7af8f507f0db94d6b74b1ae448ce58dd985ca4122c3454cba SHA512 da95f8ce03200f45b6be8730b65d01170847d074202e9b5f311688e22e3d59c32a8ff93768e2ac0105bac02936cbcde49eb114b762e89e6ebf895d8b799b4bf9
-DIST regex-2021.8.3.tar.gz 693937 BLAKE2B 886dfe1a312bb34d83a3fe9442231215be7e263cbd123da24c454cdceac1055cb4dacfe4a3104699b6b97f86b14e2b723ea1267a13c2395ce2baad4ca367d77e SHA512 3ac33421ca15e47a1d8beeb3841b6e698d492e96965955afe69529dc71cc7d522e5e8236e4f577c934a3fd27036340a8084c84055bcfff0a9572e8fb56ba272b
 DIST regex-2021.9.30.tar.gz 703504 BLAKE2B d958fa97aabb4c25c424591cfc9b6006c72e72d33029902a00e705c0db6786dcca92b006c4d77f98b0dd183405f63e282f33af75361d20d2b61f65d70da40da6 SHA512 3ce87e01a6e90a2519046595548f9ce38fb177db0d5c2359c57df857a2a9f14be1c6d228b7bd724d5bd66f723e33fd6056180fb45c50931bb0ec5e723df2f16a
diff --git a/dev-python/regex/regex-2021.8.3.ebuild b/dev-python/regex/regex-2021.8.3.ebuild
deleted file mode 100644
index 6d59b40bf9b5..000000000000
--- a/dev-python/regex/regex-2021.8.3.ebuild
+++ /dev/null
@@ -1,34 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest -s "${BUILD_DIR}"/lib
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index 0aed4f58de76..d5ebf3b88a35 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -1,3 +1,4 @@
 DIST resolvelib-0.5.4.tar.gz 14474 BLAKE2B d1424bf6a019e16e9b662741b6c089258bfef26d5bffcfc9e0c8d9ba105b689654fdce7bf9068f71c49a2ce590f05c16b93c53bbe468fc1a339e7fa489adece2 SHA512 cb027c5478c217f6f8288b42a933665aaf6e59280e7aa88a25f6594e589e34ac2b75734764e331d0889ad9cf0c60b8cbdfa14b01dce023a76870bb21cfc4d926
 DIST resolvelib-0.7.1.gh.tar.gz 764630 BLAKE2B 32c50ef0a16e07716f18994efe4b2bd212a2ee5068ff155526e17358e3bbe4c92c4d59817c17de152882a738c924c7f5ba389d2a7d13ee1b2dc0de54e8175c3b SHA512 de5c1c29790ce1eb4393021f17f1a19a0f2de29e5d8688fc307e412d80052319b822bb24fceca47fe550e21393ee38d58fa6e6cfefd207b7a88b632b9670d282
 DIST resolvelib-0.8.0.gh.tar.gz 765655 BLAKE2B cf10ebb01a01a5601091c5374da87ad55a057144d928106d7e9c19cb348277fd5f4d455acfb49ee1979842a68ecdb1f682a1d0948339533074a540a04294c226 SHA512 6cca8be16c36e5d8d60d41fab3ab9bb3aa82e1bb4d1887b5bcae3b21db90af9799676032c566a52e2026f14b19480c000f20482c87af326d8440d2c826eb5b1a
+DIST resolvelib-0.8.1.gh.tar.gz 766632 BLAKE2B 59bb02a08cf0f9bc6070cd5c5109826a7cacc5bda07479358fd591ff018bad761b53ed48f0a330e5ef60b8fa8d5db14ef044b662423e372aad7fc477df5b97ef SHA512 bc99d0661f3605d97074066df3c57edec8db40f66111f0d7a23ad88097ba4a162368ab396ef75632d09cd8a76417fbee2554d0cdb2f797795c246d16e7e3b955
diff --git a/dev-python/resolvelib/resolvelib-0.8.1.ebuild b/dev-python/resolvelib/resolvelib-0.8.1.ebuild
new file mode 100644
index 000000000000..44f22b8744b7
--- /dev/null
+++ b/dev-python/resolvelib/resolvelib-0.8.1.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+DESCRIPTION="provides a Resolver class that includes dependency resolution logic"
+HOMEPAGE="https://github.com/sarugaku/resolvelib/"
+SRC_URI="
+	https://github.com/sarugaku/resolvelib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/commentjson[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 39dbceebd319..23ae4a531bfc 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,2 +1 @@
 DIST rq-1.10.tar.gz 598643 BLAKE2B 503c2e45d134434373eb89ce205dc1a82f16e0281c1f872046d51538b3352b0ffeeef72f64991d093f271c276c1a8a3be92fdda4d7db3e083549f69ea7a04560 SHA512 7e2de3e36309eb3c095d34c28d9cba340d0699b8b4b457491d12420bfc1370e0336dc10f4f1115e83ac0ea8884500750895417f8b5c2090105d3c9e32d1b5bec
-DIST rq-1.9.0.tar.gz 592217 BLAKE2B 831fbc7a3fe23ead59041e2556d37e4aa885a21bffa9aeeb0765382e84b56a2ee6d34a864cb03a9a12274c8ac80b714f10a7752d0bae7a79b8e2e7149be4aea7 SHA512 a2ec7b05fe1dda983cfb30182401c6e5367c54b7649ddcb1d3c6d0f0a5f6583665b39ed7c1cb6bc37d067926f089e3fd80ea7558856233edc1bca8234aa728aa
diff --git a/dev-python/rq/rq-1.10.ebuild b/dev-python/rq/rq-1.10.ebuild
index 1c62576fd51f..5deb957ec024 100644
--- a/dev-python/rq/rq-1.10.ebuild
+++ b/dev-python/rq/rq-1.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rq/rq-1.9.0.ebuild b/dev-python/rq/rq-1.9.0.ebuild
deleted file mode 100644
index ce42cb0c2eb5..000000000000
--- a/dev-python/rq/rq-1.9.0.ebuild
+++ /dev/null
@@ -1,53 +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="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/scipy/scipy-1.7.1.ebuild b/dev-python/scipy/scipy-1.7.1.ebuild
index 550c40c76b75..25c4bdfe6ca1 100644
--- a/dev-python/scipy/scipy-1.7.1.ebuild
+++ b/dev-python/scipy/scipy-1.7.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="doc sparse"
 
 DEPEND="
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 183b775a0ae3..e8eb2c660310 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,2 +1 @@
-DIST simplejson-3.17.3.tar.gz 82434 BLAKE2B ae6f303a204f0c5a6bc7a10aa8da3dadbd4fc3a257abb15e330d13299dcbd5bc6be97506f6d5b48f3a3fe24570ac28b331644870d03aa30f80d40e69f4d2ec15 SHA512 b4ccdff3df2c87ed6f5119e93560ea7ddf60fcc64f996efeef1f6077f3a559c8f9ea77fd217348c1cba2de50e40523714899de110614953baf8385bb78d10af6
 DIST simplejson-3.17.5.tar.gz 83182 BLAKE2B 8fbaa83c81a7478b3c62c6625e717874f6dd3bef236b85504788a66d2b820dbf601e65edbcc7056528e67a66b806b3847b8efcc522464604bd4987dce9870643 SHA512 f5af32e4f9b4575323f9c0eb8163e794270a8607710d08a72cece953f57861e3619038798369ea049d82b9b53f293b9d9eefdeb4dd94ab4f043506bc3f1ddfad
diff --git a/dev-python/simplejson/simplejson-3.17.3.ebuild b/dev-python/simplejson/simplejson-3.17.3.ebuild
deleted file mode 100644
index 9ecffe5e9ba9..000000000000
--- a/dev-python/simplejson/simplejson-3.17.3.ebuild
+++ /dev/null
@@ -1,19 +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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DOCS=( README.rst CHANGES.txt )
-
-distutils_enable_tests unittest
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 56e1d04b9ae7..ff8d93125185 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1 +1,2 @@
 DIST stripe-2.60.0.tar.gz 219649 BLAKE2B 208826e62560f6e9acb5016cecae4f3128106d562f8b5de6caa106179f6991376bacd679ab4cd61a973a60f68a84aebb673d17c1ca8d10541c2ab4a1e761da0e SHA512 eaae2356ed83285713be6396c071b8f5761ad0ff651691b1560b06bca190a5c5df3659182e5a25e8d286257046162f32755854f0e382a280cb63180478114502
+DIST stripe-2.61.0.tar.gz 231302 BLAKE2B e971c3393e255d09eb84bcdf24b5eb32ca42d7d04332cc6fac7685606164c1b95f2b5bffeadb39f11be8c50360da03feca2dce1b4f5f84a3a95cfe4458ff1970 SHA512 5b331d862ea832a821a9dff9bb7569aa2b94726c2d36ec5f304a5a41b3fcdda1096f85f444500f0826fd3e349c47b5ef18ab91b8ec5cb67d966346a0cbd1a7ef
diff --git a/dev-python/stripe/stripe-2.61.0.ebuild b/dev-python/stripe/stripe-2.61.0.ebuild
new file mode 100644
index 000000000000..77e98877a3c9
--- /dev/null
+++ b/dev-python/stripe/stripe-2.61.0.ebuild
@@ -0,0 +1,62 @@
+# 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="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.112.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}