gentoo resync : 05.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-05 09:25:57 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-05 09:25:57 +0000
commit: 6d691ad5b6239929063441bbd14c489e92e7396e (patch)
tree: e294f87b1ce66397fee1273bd6c7131aeb586f51 /dev-python
parent: d99093fb4bb5652015c06274d64083daa2439e4f (diff)
248 files changed, 2865 insertions, 935 deletions
diff --git a/dev-python/BitVector/BitVector-3.4.9-r1.ebuild b/dev-python/BitVector/BitVector-3.4.9-r1.ebuild
new file mode 100644
index 000000000000..2f65d58fb9bb
--- /dev/null
+++ b/dev-python/BitVector/BitVector-3.4.9-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
+SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index d7fb33cce11a..030d3dd4bdf8 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,3 +1,4 @@
 DIST BitVector-3.4.9.tar.gz 128306 BLAKE2B c9559596dee2d9315e9a906e24d4d67ff74c56e2a0f94ccf7dafd360a5554b46f61a7e7e5bc30fa6a4175c97f6d42022468966ab123250319d36f65b23624079 SHA512 be2144a35990b46aa2cbd71d65db51baac5fec65d4c91a1e2222857b307c96f5551adf1c5a86f145f01fa895465b99bc02a485d5d7a43495dd1e05b9a0d9d513
+EBUILD BitVector-3.4.9-r1.ebuild 636 BLAKE2B e1122498ca15e89fccbee27ad1901fde50e36ab5d1c446c32316e55d2f363933283ea3638eeff799dbd1dd0774ffa7a9062189bd40c82c4b3635555df41dfc7d SHA512 602fa8a5d8f6b7cf87b548a94c25e76f0e75ecf1cc3d0c5aad1e20d75d40c103363ba9af103bd335913a79fce6f0761134b86c04e270d8f8f02406d011c3390f
 EBUILD BitVector-3.4.9.ebuild 633 BLAKE2B 7dac849472e4ef7d65e568c83933405477d951f77d78a3564d3803f617a075a772347b3081490477591d2d2af276165e68d104de622db3b50c849d4d37227e83 SHA512 5bade649043ded831f1d090ad1ba9f4a7efd0555d58f2b72d57f570617e00a14b27f1f445a47b39181a72d7a5868af3f436245d19229081d6f4e3fca288afa0f
 MISC metadata.xml 419 BLAKE2B 36f8dbcebc7fabbff0be1eebd52558eead8092cb15dbdcf5a816ce834c4486dc3743022f11b8d8944fa6e055b3450a7a45f2327617289b562c07d8057966c990 SHA512 dd2061a42827712b25efe3b0ac14db337945a89405506241a199cd17387c138361155e7e42bf8a3b9e75a03ba008957f376b2ec3294f05308cf07395b074ecdd
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ee9a4065ca88..d17c9f66622f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
new file mode 100644
index 000000000000..1671756c1f93
--- /dev/null
+++ b/dev-python/aesara/Manifest
@@ -0,0 +1,3 @@
+DIST aesara-rel-2.0.1.tar.gz 7975083 BLAKE2B 6dfeffb5abbd2a9b8097b9f91b537f215b1d2ee8ec9d2ad2abcb823761b722c2e4de75843c74584445c96add175366ac4e2a62eced88ad75c58d0c31f2b4df87 SHA512 8dad298ada2d4a20151cf86c08424b02e1c0afc5060915844ba06a492866b04225e6cb0407bf1de8d651c0e7ed8bca34e184f2f9a2778a66ed41f08d4b51bfd2
+EBUILD aesara-2.0.1-r1.ebuild 1904 BLAKE2B 5826aa94aa158fde2fa8690f9a28ae1f676fc081d92bcf4134e566678292eddc6d40fa6694cff63be219dc7476be67b20cf42d2f483e561b5ca39b8342de7067 SHA512 9885c85d1756870c19c22e88ff0c1628c7e6773561bedeef2aa2fcce42055e7d5a8031bb7b2fd455fdc4352a6d1663526caab324f63a3a7b9d505790b60c0971
+MISC metadata.xml 402 BLAKE2B a82c76dff3cfcbf83936f2815e15d051d4ab26a739a970848573f5856610e763d9f346e2d265b2d38e53460df6bcba879ce50d6e60bffea77af6052d03d8dc5d SHA512 f3c86b74cbaaadb63bb98ffc2a3e6e1d121c141b33edd574cfdee3652a43e9f8b05e3276050bd407f00ddbec1d6fb6eda87983520075ad368ab8792e0ae17143
diff --git a/dev-python/aesara/aesara-2.0.1-r1.ebuild b/dev-python/aesara/aesara-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..e637143ab45e
--- /dev/null
+++ b/dev-python/aesara/aesara-2.0.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/aesara"
+SRC_URI="https://github.com/pymc-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv ${exclude[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aesara/metadata.xml b/dev-python/aesara/metadata.xml
new file mode 100644
index 000000000000..e510de7ea817
--- /dev/null
+++ b/dev-python/aesara/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">aesara</remote-id>
+		<remote-id type="github">pymc-devs/aesara</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
index 26d64fb637ad..bf913f4cebb0 100644
--- a/dev-python/aiosmtpd/Manifest
+++ b/dev-python/aiosmtpd/Manifest
@@ -3,9 +3,11 @@ DIST aiosmtpd-1.2.4.tar.gz 83329 BLAKE2B accecbc3fe66efc748d0bc3c85504d731005b90
 DIST aiosmtpd-1.2.tar.gz 51457 BLAKE2B c2dba38c5d5a243a65c332cb3b6bf85a124eb6ab9c3526d0ef57788eb7e24e64ec86c56eeaa57e5171631c8a965447f125366741b1d1c54fb48473da5123ed40 SHA512 520b0fae80423d3963d4f17ef393cc0ce9e342fd1237c909159706bfe1e13f27df849fbc14aa1c94ad02e7c9108308984b6f9e21c7dbddb09093ef00884983d8
 DIST aiosmtpd-1.3.2.tar.gz 110769 BLAKE2B 985684d8183c89670c362e39b81cbff187fa820bc3197a0c0c18cd61eb4c00912bf489d935303be0fedfee3dabfafaf81c7d4be3e428374624ed9a1fab6ce2c8 SHA512 b5d183671b8a985dcf774fb1b35ffbdf5c058e24e7cb81d77b2b0ce00b2b4dff27ff8bb167e985d5bf84cb6816c014d7cd601aab59243136ae409975ef3da30d
 DIST aiosmtpd-1.4.0.tar.gz 136307 BLAKE2B 5ae007be6953de8fd804bef25e290153ead6730bf44dbf71448946c1380a972a59b0fcf6f669035dd23acc582d697dc746efe0b03612e6c3ee51b31d58aee309 SHA512 cefbc819a51cbdacc8f24d0f5ff4f2a92ad6e4c5809a9b97635226767f1dd20c63565522ab66fd6c7ede5efdafa89c42e3c3bae4e94ea5c57b49531b02e1bad6
+DIST aiosmtpd-1.4.1.tar.gz 137171 BLAKE2B 601cbcc1eb409277dfada35bd8bf39c7282651b479a4db4a7716ef74dd66fce37bdeb7b0fd8fceb9889ec247e1ec32d9b2305de74868feceba208c23835e08de SHA512 f018e0a75adaa269c1f003a6f7fbbe92257c518ea9b62ffd807bb75a169362ff1159b69562b0d6cfa211ff5cd19f0756ed78c92a7be533a0c1929608d6eacc82
 EBUILD aiosmtpd-1.2.2.ebuild 604 BLAKE2B b5d7a51a15335f12ea7479be582db17be6fd7a929db3db086238bc0ea9b4bf305d7c351d4d943fc09b40983c3cb1aee95a9378f5a507c4cb999ea3512d600885 SHA512 4b09dcff6e06f621db49b94c50bbfb2be17a49b5a5e2c64d28dd725ed37b78f51440081b93aca9b7f6f95e64531810b8e9994a472a014ad9fd77a2fbf67af368
 EBUILD aiosmtpd-1.2.4.ebuild 481 BLAKE2B 7f1e922676bdf7abf8323aa883c282f0705cc2931139dcd9c0a8167e584764550fc40a0004de9e71e76d5bb15bb9d71b62ed08ab7dfd99b36f0cf36f2cdf2beb SHA512 8d6e06c4e21d789f36c4646baddbd239be2dc25d0a078b5c4472410a3c0521bc20696e221b66cd3ee5e801036419bdd1ce0216a6bc4e3e0e08637b278b26cffb
 EBUILD aiosmtpd-1.2.ebuild 569 BLAKE2B c6147ea15f789e3324ae80739619916a80574e2978ee8fc00eaec4c0acc9ec56241f21bc7830ba1330a3f51dcc36597ff20a036a15fb4e3cb7a14210f1d570d3 SHA512 c1669e3177372be4fef402fa1629e33f8f998ef070c5250844fec86c6e1446406649f6754af54b10f19f5b8f4b839977b05a52b34fa0161045a45c08081e87ee
 EBUILD aiosmtpd-1.3.2.ebuild 627 BLAKE2B 25c69f1ea753d119197475f1a4b769d973ad74f8cc64a86f37ccc0204ea988deb1a2874ec79e214c792ba3fefc30a00284e2a273b4960bbacc2f20bee056c4f5 SHA512 668180bcbdbfca58bb1c79b37495a4ea2162cd092c326ef131fbc265081ba6c8631f224e6c60634db74e793ab96bbd17c56b5132ea3bf7b2d3f49bc2cadd82dc
 EBUILD aiosmtpd-1.4.0.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
+EBUILD aiosmtpd-1.4.1.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
 MISC metadata.xml 461 BLAKE2B 26a357ec03cbd43372f7fe77a2b7ba7330c9c1c18695887c5e297f7d769d3af34ae456f30743880098080f3c6740180bbe0e7e0be5a02a0059096b18177968cd SHA512 67f76d5cf941e2276006c55471a101e0be62e79a2cf3c69d74fac6566da9ef44b14fa29d7fbe57b72d2452318465d4b43aa9337c1cdac798b874a3b3ce2f1734
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.4.1.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.4.1.ebuild
new file mode 100644
index 000000000000..3c32f8604a09
--- /dev/null
+++ b/dev-python/aiosmtpd/aiosmtpd-1.4.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="asyncio based SMTP server"
+HOMEPAGE="https://aiosmtpd.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+# TODO: run doctests using sphinx?
+distutils_enable_tests pytest
diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
index 4d670d5a4a0b..cb21c09b8645 100644
--- a/dev-python/audioread/Manifest
+++ b/dev-python/audioread/Manifest
@@ -1,4 +1,6 @@
 AUX audioread-2.1.8-test-deps.patch 691 BLAKE2B 0b43f16dc4ba6a69a3e3477a23312685b2d549b71f0df908c1ab8ee1b07b85e249772cd04915ae9d5481343d2e474c73f754387180f155c289ef4c82b6dd179c SHA512 a2bf5af05718147319d0690afd2ee269aa079a4eb2353a4564e9e4e8eddabcebe843e157dea2e7bf9ed479516b5b52c8526abdb122813beb12a6a1da9c04c845
 DIST audioread-2.1.8.tar.gz 21222 BLAKE2B 78cc55d45dd987fbe0171cd3da9f8441e38b60fa6f1b0ef8b0781abc91e6b447b8cf839437b59bfafdf13ca90bb50a032788e0470250f303122a46ddc24ebd19 SHA512 9db5ad1f8b2047256b5f6b4bbee2366043ed19d35ffd2766ae3ab66bdc5b9f63910bcf449fd42aab074fd8132642bf730c432aa0c8f3c5368cd6ef36d7f4f5a5
-EBUILD audioread-2.1.8-r2.ebuild 869 BLAKE2B 3e5bfda1e740ed3dca232aec53511aff45f1692882b585a6838a2e9d3e9005b052eaf48fbb535259cbd868ffe6390fa0de4c158d67a16939a6008249ab05fae3 SHA512 198e92ae28a67a1db43524d2aa79766163e7cf9d2abfc8a843c5e4866acacaf90dbd07e1473692fd246c9a55d54c97b01640e21213b3f8d874ca5d17d755d673
-MISC metadata.xml 557 BLAKE2B 21c873a48491c6e80133dd86f91a958fcd766940648053eae13029d9bca47d59dd62957cf4b1c2d679b7ac7032aa2001aa4a39d9d94ec0f5296191cfa8f86924 SHA512 60c91d4241fe34a2cb8198af0974a7383dc742d71662cb51b680449c38778b8c3e9b0d7b16191319fa7665c1ce187445fc0234f70572318d2f5103182b88e5ed
+DIST audioread-2.1.9.tar.gz 377500 BLAKE2B a90d1d7531c265a8c2b7933ac0bfc00fbdf298546620fef3ccae0204fc1eedcc584bf2fdb79b1bbda81b29d03346abc236cd0234684ba3cc70642f837033ab99 SHA512 ad2260b6931cfeebb815d48221366a2a5d8095965ff18e94c5eb0809d9a1b02e650a62ad5e895b7f1e003771fa3babf56f59ce4538aca78b678566fd28327290
+EBUILD audioread-2.1.8-r2.ebuild 779 BLAKE2B 9c329f399168dc05aaf954a574256ff4b4c751d59f76faa2f415a513215e5da985bf788ef18157187edcd777a9067aca6bd119576b333d0b3ecb19af3be04d1e SHA512 3a3f9f72c31ed9c315c6a8989b35167d15f36f0ea83dd60e5b654ee04b70f6101ae3ddb0482bbf9815d818164186627bb6e785913e9449b715e9ca6625b54ed4
+EBUILD audioread-2.1.9.ebuild 895 BLAKE2B 4b234d791345367f904e9b0ce30cd2e20d7f77d6a0546779e71db59f862425f3b26cbee9b15edbf82281409aae8edc86ff8b410b6df7ffdc4bf4509cdc3f72a6 SHA512 276a1b0a2ffe4e4652af19de85a367e036cf1ea9b20e609110fcd73418b2531e72ae61594ad49ad50a72fb3d22e17def8501fa30957205ead8777cde5092de0e
+MISC metadata.xml 638 BLAKE2B 1b1365a6aae577d46782c5fe4d74512fe3ca391c96e6893ddeec81703659df86440a9bc4cf85243530a867c6bffa6c67ec3c338ff627bf176533d3fc2948796a SHA512 c5c3bc3e85d67be67c99fb671ce90c54f9d6333072dd3f585a1a792b21b5d5b8383744b5c5f753ebe05be4027a2669794ff9867d584e757cf53abb8d74d73b70
diff --git a/dev-python/audioread/audioread-2.1.8-r2.ebuild b/dev-python/audioread/audioread-2.1.8-r2.ebuild
index d7343f38d24e..c0d64fd1ab2f 100644
--- a/dev-python/audioread/audioread-2.1.8-r2.ebuild
+++ b/dev-python/audioread/audioread-2.1.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Wrapper for audio file decoding using FFmpeg or GStreamer"
@@ -13,11 +13,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg gstreamer mad test"
+IUSE="ffmpeg gstreamer mad"
 
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
 RDEPEND="
 	ffmpeg? ( media-video/ffmpeg )
 	gstreamer? (
@@ -28,8 +25,6 @@ RDEPEND="
 	mad? ( dev-python/pymad )
 "
 
-RESTRICT="!test? ( test )"
-
 PATCHES=( "${FILESDIR}/${P}-test-deps.patch" ) # git master
 
 python_prepare_all() {
diff --git a/dev-python/audioread/audioread-2.1.9.ebuild b/dev-python/audioread/audioread-2.1.9.ebuild
new file mode 100644
index 000000000000..c14c97ad2fe9
--- /dev/null
+++ b/dev-python/audioread/audioread-2.1.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Wrapper for audio file decoding using FFmpeg or GStreamer"
+HOMEPAGE="https://pypi.org/project/audioread/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg gstreamer +mad"
+# Enabled mad by default as it's the lighest dep to ease testing
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( || ( ffmpeg gstreamer mad ) )
+"
+
+RDEPEND="
+	ffmpeg? ( media-video/ffmpeg )
+	gstreamer? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		media-libs/gstreamer:1.0
+		media-plugins/gst-plugins-meta:1.0
+	)
+	mad? ( dev-python/pymad )
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e "/'pytest-runner'/d" -i setup.py || die
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/audioread/metadata.xml b/dev-python/audioread/metadata.xml
index 39c8bb18ab55..ed40ed1ea832 100644
--- a/dev-python/audioread/metadata.xml
+++ b/dev-python/audioread/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		Decode audio files using whichever backend is available. The library currently supports:
 		* Gstreamer via gst-python.
@@ -10,6 +11,7 @@
 		* The standard library wave and aifc modules (for WAV and AIFF files).
 	</longdescription>
 	<upstream>
+		<remote-id type="github">sampsyo/audioread</remote-id>
 		<remote-id type="pypi">audioread</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 6bd4798a1ad0..bb3640e34937 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
-EBUILD blockdiag-2.0.1.ebuild 1708 BLAKE2B 023ccba217e048b81c1b52df97e2235e8cf69347ac80d00b1f4577390c6bab182e990c8ca927a0f7937e1e2b5f32cc6ca792680234e5a6484d31dca9a1e4579e SHA512 f4889bef57886c915e33ede03d794fbfce8b7e1298827ea7960092d10abbfc6977d60591c6285afa04098a0cac002295b94be6906cda7988c8484faeb3b72eca
+EBUILD blockdiag-2.0.1.ebuild 1719 BLAKE2B e4c3a62e35eed9fdd42a7289d44e0750505abb1ede25c79cb5885c4cf6e9078b614cbe6fdbed9408407d5f4e4791a0765a9f5f06fad29f38e99ed52bc2aede09 SHA512 0a48b40cf1dfd54cddaa66635589796894d4637377fba20415c9012ed33e4c820cb6e25b9c7cf8adca5fb635737eef7fa92ac04759588c3cc6d6588d5dd2cdda
 MISC metadata.xml 773 BLAKE2B 898f9291909c30bee45f6b25bfd9c2746d536eb9a238535cd7b7770565f64a6a91590fcf51f52fbc6a77cd4604014c3c9a8c66667b04359f7a686a284b8aaf41 SHA512 2d7ca8b92d199ed60f2035868175afb50a01e634da31cdbf0b6d583ca75c8362d186a613edcad83f42172c5abbf42063316116b62a4e6a7513493a734f51309d
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index a0667c900eb0..74b07ea3454e 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Generate block-diagram image from text"
 HOMEPAGE="http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://github.com/blockdiag/blockdiag/"
@@ -25,7 +25,6 @@ RDEPEND="
 "
 DEPEND="
 	test? (
-		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/reportlab[${PYTHON_USEDEP}]
@@ -34,6 +33,8 @@ DEPEND="
 	)
 "
 
+distutils_enable_tests setup.py
+
 python_prepare_all() {
 	sed -i -e /build-base/d setup.cfg || die
 	# unnecessary dep
@@ -48,14 +49,10 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_test() {
-	esetup.py test
-}
-
 pkg_postinst() {
+	# TODO: Better descriptions!
 	einfo "For additional functionality, install the following optional packages:"
-	einfo "    dev-python/reportlab for pdf format"
-	einfo "    media-gfx/imagemagick"
-	einfo "    wand: https://pypi.org/project/Wand"
-	einfo "          Ctypes-based simple MagickWand API binding for Python"
+	optfeature "for PDF format" dev-python/reportlab
+	optfeature "misc extra support" media-gfx/imagemagick
+	optfeature "Ctypes-based simple MagickWand API binding for Python" dev-python/wand
 }
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 073888846494..667b004d5e35 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,12 +3,14 @@ DIST boto3-1.17.12.tar.gz 346906 BLAKE2B 47ada52081fca432f23e6c373949bbea74c0439
 DIST boto3-1.17.17.tar.gz 347835 BLAKE2B 7861befb9275b0cf36235749369f65b69845ef710404708c2c51c9223d370fd46eede4121be501eb9022f6a62a0158d2cad03ce4095640064def3a9d35be7478 SHA512 5d6bc48f9480963abcbf41c4b95e86ac6339f5386508be7108ec08e91c07c280786d3a4bec2b731c7b5710351e0398c4ab86f4fb95440e83936409b40e1c3015
 DIST boto3-1.17.18.tar.gz 347971 BLAKE2B 1390758e578763d0e8faba73e44e769224f6b3ff54e88798cd2d3a79c7d0fe5c3ef58a08e6a4aec70a7c3a64bbcbac22cd8471679951794fc1c0e48623f31008 SHA512 372baa35ddb770d65cd680544c9dd504a1e19b1052355b729f5b3ae8ef480ad4e250bef305671b1ec9741d953e813209398e8afe1bd396cc1e9c79221e34c629
 DIST boto3-1.17.19.tar.gz 348163 BLAKE2B 47b3f24dd7af7362fb37fb66bb333ac7a607b3d55790e47e3987d88f1ae09fe0a5bcafbbbe6245ecda378a8c56f6cfaa2a86c0b6e0dece58b0b6d2c819646a8c SHA512 ddfccb03335b3389a820a37e2e3ea40414291243291887be6dfd4243e43d918882e7386373578cf6474c5b8c5f592a15e650528b5cf61cb3b989522d4bff7ec1
+DIST boto3-1.17.20.tar.gz 348258 BLAKE2B b26a72e3861c8e45a11f4d8da3733cbdefe5e2b4a9328feac2e87a03c92e32efa0f896a60cc1a7e286ad3c93bfc07c1fd92612fed716607f7a408a837ec5954a SHA512 430d796ca12cf6497e70afcde7be5ab77910728bc0cc6cce74ceefc232d93e592d71864c33f403f75a8fb1bf67e7da9435e0f563d8d83b75d315c6ed50f779f1
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
 EBUILD boto3-1.16.63.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.12.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.17.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.18.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.19.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.20.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.7.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.20.ebuild b/dev-python/boto3/boto3-1.17.20.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.20.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+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 ~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 eda91b1fe5f0..c262b50123e7 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,12 +5,14 @@ DIST botocore-1.20.12.tar.gz 7466322 BLAKE2B 07eb28f5b0fef5ffb284a5eac0c78e3430c
 DIST botocore-1.20.17.tar.gz 7483893 BLAKE2B 5a9ea5c1d3bc5caa91ea939943d86236d58f24b440d7d0de96356836ee6417c62fece8e782f9fd81e14daefac8919a001adb95e67d42110709b7f07f849b71da SHA512 864f938d07b28341128c06186542c0c214a133f1b7a78990e357436463f7cd1a36031101f6588ee706073b78d4ef99571853658f77755eb9f0739882fc706634
 DIST botocore-1.20.18.tar.gz 7485852 BLAKE2B df22d0c74796ddc5c7046803039423e31784a2221556a0cb224f0a006870bb4406cf3e576fac1cc65457da0267dbed92159d98d4198c3beef1b995ef7565f06b SHA512 e1881ca20ffc0b3eaf59635a321f0191775b4c62f4aed4d8ada54dee6066ba85fa1af00bea00949ccb245dce4e1279eb1d120237da097420d95e1c3c95c50d6f
 DIST botocore-1.20.19.tar.gz 7479977 BLAKE2B 4193cb9975dcde134450968ffcf4cc07b7aece4bbd0d8306483f24eaba63c891cb88d0af640f602b03eb400e5815eb977fca0da927dae0eec82f2922e6c185da SHA512 f4d4ffb88edfb95a13b637c928701966d7903bf50c493926674d8c1c0e6004fa6ec2d9b63402fca5829af3d381ad04221c4154a08e2a0cab065110ab65d44fc1
+DIST botocore-1.20.20.tar.gz 7484162 BLAKE2B c9b14936ca8d59070cc99ec56fb7124c2c162f8b3473e3049f57218e41df8bc0bf20172bd65067d504e6317c917573e16d456169564d93dd969e69e87944fdb3 SHA512 aff520c93bea5b600d1c0decd20d49208b2dbf7113f435a633b4b4c68dd0dc46f04079c4e38132d03e5f9aed7a124bcdaaae55ed0126c002acd30954e9609352
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
 EBUILD botocore-1.19.63.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
 EBUILD botocore-1.20.12.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.17.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.18.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.19.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.20.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.7.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.20.ebuild b/dev-python/botocore/botocore-1.20.20.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.20.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+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 ~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/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 5892736d1778..bb671fc4fccf 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,6 +1,3 @@
-AUX bsddb3-6.2.7-py39.patch 898 BLAKE2B 5d4c6cf6f4cdd1e65aec5d959f31cbe47a37cf4df803512b28dd4692961ef0184642abeb3d8eeac68f074c50d639d1944393785eb0ca30f5aedbdb9e0adc4de2 SHA512 584e65fef1dd7ccc8c75404fc73780db9845e7a73796dcce80e4506f0d7c51ff7234d9d2d48c8ea873e4f304d7abaf3f6fe2662ccf847c094b7e54b567969cce
-DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0
 DIST bsddb3-6.2.9.tar.gz 230475 BLAKE2B 68c7c498d581dd5ca860060a3152f7ae135bbc75d00714764446d071e8ea88d303a73d1aa411db1ff8fc922aa6d486632fe38bef3596550150ed511a97fc9c9c SHA512 9e878ef865cba608fafe4274b660234927b9106323c3e4ddd728682b0f11b3c7edb9a3dd56cdfe8665eba890df4121695c9710b95bb2f43b8a0be3ec4050f61e
-EBUILD bsddb3-6.2.7.ebuild 1706 BLAKE2B d1b9f0e5e0fc8ff856bc8453ec95edabb5ef0591dc49cbe8404dd43d17f45e3988f072ff3346eea54452cc418d354fd80618fd847574fb0958f134b4438b684c SHA512 41f9974c61054faf11db07650491e4e30440e3e87185a4544852906170e75f0aa2184a2f8a456b1a89cef7f8e7a3b5698d9c97f6af73689df0360640da6058d7
-EBUILD bsddb3-6.2.9.ebuild 1662 BLAKE2B ac77f8ca00747dcd3dc268f6b5862399be05a7e07d102eaee22760b53ac24d28386c16c086ad7a362d13f7833c850e2bf63821810a31cb7b657b3b3883a3f1f7 SHA512 bab21c96fb66db16dd4ea1b2afbf42cc1663f2c1ad16970c75b78978a353ecbd632b359494d20bc2e12d2b389fe5f44acb4b1e90af3f9c3fc25ac42f0ffb687e
+EBUILD bsddb3-6.2.9.ebuild 1660 BLAKE2B fd8e6f97ea1733ae47a30f4244731785b30443bb92062cc9f03698032813e2839e4cf54a7f1d71cbb4bce299ef32c674ae0d7acd35eecb560968e537318ac0c2 SHA512 a66c57468e88fefddf0925ce93f45cdde111681722435002eb92d4d566d4e364a35d5f953597ea65abd76bb2d14891b996f87f7c7d5389a2709748440b3b9011
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
deleted file mode 100644
index baea2b392f2b..000000000000
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit db-use distutils-r1
-
-DESCRIPTION="Python bindings for Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<sys-libs/db-6.3:=
-	|| (
-		sys-libs/db:6.2
-		sys-libs/db:6.1
-		sys-libs/db:5.3
-		sys-libs/db:5.1
-		sys-libs/db:4.8
-		sys-libs/db:4.7
-	)"
-DEPEND="${RDEPEND}"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-python_prepare_all() {
-	# This list should be kept in sync with setup.py.
-	if [[ -z ${DB_VER} ]]; then
-		for DB_VER in 6.2 6.1 5.3 5.1 4.8 4.7; do
-			has_version "sys-libs/db:${DB_VER}" && break
-		done
-	fi
-
-	# Force version.
-	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
-		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
-		-i setup2.py setup3.py || die
-
-	# Adjust test.py to look in build/lib.
-	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" \
-		-i test2.py test3.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# These are needed for both build and install.
-	export BERKELEYDB_DIR="${EPREFIX}/usr"
-	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
-	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
-}
-
-python_test() {
-	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/bsddb3/bsddb3-6.2.9.ebuild b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
index 2c50b6decd17..b30ba33d00f0 100644
--- a/dev-python/bsddb3/bsddb3-6.2.9.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch b/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch
deleted file mode 100644
index 77d4626912af..000000000000
--- a/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/Lib3/bsddb/test/test_replication.py b/Lib3/bsddb/test/test_replication.py
-index 2fd6aa0..9d78241 100644
---- a/Lib3/bsddb/test/test_replication.py
-+++ b/Lib3/bsddb/test/test_replication.py
-@@ -105,8 +105,12 @@ class DBReplication(unittest.TestCase) :
- 
- class DBReplicationManager(DBReplication) :
-     def test01_basic_replication(self) :
--        master_port = test_support.find_unused_port()
--        client_port = test_support.find_unused_port()
-+        try:
-+            from test.support.socket_helper import find_unused_port
-+        except ImportError:
-+            find_unused_port = test_support.find_unused_port
-+        master_port = find_unused_port()
-+        client_port = find_unused_port()
-         if db.version() >= (5, 2) :
-             self.site = self.dbenvMaster.repmgr_site("127.0.0.1", master_port)
-             self.site.set_config(db.DB_GROUP_CREATOR, True)
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index a0b4b947ab71..07dc61ace26c 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -2,5 +2,7 @@ AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32
 AUX carbon.initd 1259 BLAKE2B 06d75128329df6efe82b2d2ac2c35bb5f8726b760fc3e34335bea972a8c74070b6f892825b2b34144e15a41833cbbbb0e64d449f1c3326e7fae7b88349e62c48 SHA512 f6ccd3a3abdd8b8e1eff55aa6a0cd0b26e5cd6789ff6f8f795890e61adfac7369c101788a0db2e7d6fdaeace622cf8313a331aa6e0f54e9dda7ec8194351019a
 AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
 DIST carbon-1.1.5.tar.gz 72365 BLAKE2B 304e515fd3cae806e141d0a76983d13967885a7e57c310d86c0c83560aa306a573676fb0135fceccf14cc7ed42d8a9dcb7869ab0d6ac3b2fc00c2fb088011873 SHA512 1b3a0a0d4005e2ec8d5bca062b41f0e18329c1bc4d3a4b3eca5e8f7c94c20387281392eefceaca90294e51860eabecca242c487068433119f1f249f8659ed560
-EBUILD carbon-1.1.5.ebuild 1996 BLAKE2B ee98338e8c5d05f3119a93b3cd9aa3955a34b469ff791b76ea87743b7ac6ee957620711efe690e9cc063363404b7079cea1b5958412a4e8c91f6f8caf8cf73f2 SHA512 49e34839ca52b6f9545b6823cf99a08ef35f2cc79121de67c40732c351a2efc925d5ce9cf88c5762e1968ce16b946fd8a707ee1144673b7f3d2b32c57f4845b9
+DIST carbon-1.1.7.tar.gz 73380 BLAKE2B 8f9c807bc5e1c6fc020ae31179b6c0c11724b1110def323f92e158c5cf7c88291686bdc7f9078fb9234e5f2877fd745f7ec581533fa9a77e0307bf56f8ba60e0 SHA512 f0c5c64fa02cfd5940a7b23dbb3f2af27f67595e301ae719f4e2e9cdb48d4a5673d36a60adc8d338a55202f8e89873a7539c960cc16649903305191c6b0fc875
+EBUILD carbon-1.1.5.ebuild 1983 BLAKE2B 07c973b2eabdaa73b4968b8345a001b9aa78f9414b47a59315fa2572f200648e374bf3f8542db153868f7dbaaeb019f9d8e35cd3ff814afe9a954aa8bae316e5 SHA512 7c3fb474ecdd54342fc47861311253058d5876f5342cf17366c5ac2e69a59aec61645b0b657f7c2d5533e71c62728c8f93e5a374574d67e102bd719f3b988b27
+EBUILD carbon-1.1.7.ebuild 1976 BLAKE2B 17434aca43a27ee36177698f79d54be23dfeadcd3546f69a79a30143fd48a4ed00d76be114b61dfb6b24ad6dcc8cd5d9d01f525843be1629f0985f9fd1718d13 SHA512 0fc942a5a56ba0dd05311f28ad957602e6e0bc372a439b0e4d195298a2871d8807fec2a075f6f30b793188b29746c75a41b580cc5afe91e74ef991509922c4f0
 MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
diff --git a/dev-python/carbon/carbon-1.1.5.ebuild b/dev-python/carbon/carbon-1.1.5.ebuild
index e115171fb0a7..6fedf6f4cfea 100644
--- a/dev-python/carbon/carbon-1.1.5.ebuild
+++ b/dev-python/carbon/carbon-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
+KEYWORDS="~amd64 ~x86"
 
 # whisper appears to have been missed from listing in install_requires in setup.py
 RDEPEND="
diff --git a/dev-python/carbon/carbon-1.1.7.ebuild b/dev-python/carbon/carbon-1.1.7.ebuild
new file mode 100644
index 000000000000..906b0342f044
--- /dev/null
+++ b/dev-python/carbon/carbon-1.1.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="https://graphiteapp.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+# whisper appears to have been missed from listing in install_requires in setup.py
+RDEPEND="
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand.
+	sed -i -e '/data_files=install_files,/d' setup.py || die
+	# We want FHS-style paths instead of /opt/graphite
+	export GRAPHITE_NO_PREFIX=yes
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/carbon
+	doins conf/*
+
+	keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
+
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
+
+	newconfd "${FILESDIR}"/carbon.confd carbon-cache
+	newconfd "${FILESDIR}"/carbon.confd carbon-relay
+	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
+}
+
+pkg_postinst() {
+	einfo 'This ebuild installs carbon into FHS-style paths.'
+	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
+	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
+	einfo '(see /etc/carbon/carbon.conf.example).'
+	einfo ' '
+	einfo 'OpenRC init script supports multiple instances !'
+	einfo 'Example to run an instance b of carbon-cache :'
+	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
+	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 08ff8e69e07b..150a5b84d352 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,9 +1,7 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
-DIST coverage-5.3.1.tar.gz 684457 BLAKE2B 82c8e311d85a6f758c46767957199e94099838e3c340f5da1472813a2877293245583cb190acc0139cddf3363ee5f299fb42f955c59912b80d9d1ece8cfb09fa SHA512 981ebc9f9490efe613edd68afdef83cb161b303e6de266335ffd2d1d3634bd5a088cbff249b0243071b55cb4f31b4b0c7537b5764660ccc86a7059307badd571
 DIST coverage-5.4.tar.gz 687727 BLAKE2B 54c9e605eaed551aff0c6764bf2747e2ce64a7c0596cb78cb4ad6998c4b7d79fe31bfe98eb240aee4c838dde6a4536f8e84d00c14846bb671b51b28168a96947 SHA512 c682806bce603fff1ff09234c72e17370093192053961656f06ef4bcc7928f052ef4a350e80687c640d7608a22f4f3434e1836d83674eebca53459745838f519
 DIST coverage-5.5.tar.gz 691258 BLAKE2B 66bf340956b760d996ce424f977b407eb74062db56108e4910459dbcb7c271820ca655a648021763aede1c4d87c44524cea0cb34f969f203f630d48cf15b05b4 SHA512 fb78b4920a2f18afb9545a6f13910f491708443965881954fff6ee8553ab3d6bd898f7a95df1091435e8d5627ac850b880a6233e716a6acb934ecc195ec2ee52
 EBUILD coverage-4.5.4.ebuild 696 BLAKE2B 978145cf86643bcc100bafa81376905733e2da2dc18b049c2113ca157fce6ee9598bfe702ab3a971e625c9e808a49a8deb2975423caab242cb67226342b502f5 SHA512 4aa40ca9b749700ddfae1eb9ed2ab06bf6e2a342d1e54e4cd191caec4d6b25465399fe693d46e7cfef70a27855335e9e02039342a3357344408c663e52dcd463
-EBUILD coverage-5.3.1.ebuild 1903 BLAKE2B 931042378ecf854a041e560c9491b6212f16b0083c4c3892c10b2a7f2fd1100e869e4954a47a45c8b51b1587d41a855ea3da4160347f4a8d38fe7d4b4a11bfe8 SHA512 137b30acca02935186ef656ae1c2be1227001e030fd838fb6f9ca56482af843af6d83a266d738a169ae51ecfcd8a32f83e2a9404ac53c74f17bcaeef41e2232b
-EBUILD coverage-5.4.ebuild 1905 BLAKE2B d73a1f317295f0005bef5aaa2588d1b0b51c188e1c97287af835ee1466cc7175f26455f86229a00a9c40ea857adbf4be7d40364090487d33e0ebb403089afed6 SHA512 039ca94fc403a4600de41fc9d2363969f85682dfe7f6c2123f079acc2a16bc6c97635cc69985c2c7af32e37689e4006dc648e54231175704f2fa082c662a8762
+EBUILD coverage-5.4.ebuild 1903 BLAKE2B 931042378ecf854a041e560c9491b6212f16b0083c4c3892c10b2a7f2fd1100e869e4954a47a45c8b51b1587d41a855ea3da4160347f4a8d38fe7d4b4a11bfe8 SHA512 137b30acca02935186ef656ae1c2be1227001e030fd838fb6f9ca56482af843af6d83a266d738a169ae51ecfcd8a32f83e2a9404ac53c74f17bcaeef41e2232b
 EBUILD coverage-5.5.ebuild 1667 BLAKE2B fdcce3b28ba2dc6ad3ad47ad15d69ca7681bcbb150fdc9b17f9625534a76584e3270612e6a9d863267a65a378235ee1e07294afa7f4800307cc92d75b0547dfa SHA512 395c1d8d9b0fb041e7477c3f30200b2ba3b11083acdaf31c19d42e17e609865d89ed92bdd68314cc56844686801d05849ba21c9e7292b3c0184d1c2b4f84993c
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-5.3.1.ebuild b/dev-python/coverage/coverage-5.3.1.ebuild
deleted file mode 100644
index 89003283d675..000000000000
--- a/dev-python/coverage/coverage-5.3.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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 ~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_compile() {
-	if [[ ${EPYTHON} == python2.7 ]]; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-	local bindir=${TEST_DIR}/scripts
-
-	pushd tests/eggsrc >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-
-	"${EPYTHON}" igor.py zip_mods || die
-	PATH="${bindir}:${PATH}" "${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
-		PATH="${bindir}:${PATH}" "${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/coverage/coverage-5.4.ebuild b/dev-python/coverage/coverage-5.4.ebuild
index f0583abf1026..89003283d675 100644
--- a/dev-python/coverage/coverage-5.4.ebuild
+++ b/dev-python/coverage/coverage-5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index b949d763f04f..d7f921419a7e 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,3 +1,3 @@
 DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
-EBUILD cython-test-exception-raiser-1.0.0.ebuild 571 BLAKE2B 430dc1a722b0b5a498f6029da79f861fe425cdf6ae70f69e3789554d030c966cda92594e9f3e7e6e449198d6797be1a30cb54d9d4cd20bba65a51a306f22614f SHA512 6fc6f714dcbbaccba606c4f0df7774497d5abfda102a5236a6d4f8d13d3506bd63b34798c5964f7fd92ad17ac8ecabc14fb3b9f679ce2ef72a16193d1581fdd8
+EBUILD cython-test-exception-raiser-1.0.0.ebuild 583 BLAKE2B 1a742070a914aebca3c1980f88bc779443ac13714346761321eba153f6d2b7ef472d8a3c1ec1928d68901fd94d93287b97b1dbb46969eea4f2e8491f0f00e5bd SHA512 4d49a44afee03265d5ee22002943bbc8abbde39fe07bf36deade6aa2c89fe0001f1fff2a7457280156a6fabb6e3d3727148ab581a925fc01477d7ae5661f019c
 MISC metadata.xml 385 BLAKE2B a99aacc4e3a21f41dd413b185fec8ac393e1c1c2f3897fd7173d717a72b056acb8362a0b5c9b6028021365678f828549fc0b711e9697620f50f9d66ff83952d9 SHA512 1b978c0d50c3b60bdcba9bf93d6da041d83cc9614d4fc6b9837ce9797b0c251d2ed08777f7bc0877d98a9c76b8f8ec744f7f171cbb663aa36e55e2e6a7429fd2
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
index f76e3e4f96bb..8d32fe93d5c3 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 80c8c99c8a8a..898e79ae11f2 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,3 +1,5 @@
 DIST defusedxml-0.7.0.rc1.tar.gz 33950 BLAKE2B d2794d0d06ca7bd1faa0b33f3fa7e02fcfb8b7bb7bfba5e0cf4119f7341a618daf80b08e0a6949cad67c5d3ceb84a5d984d731ae129b9aed383b5b583b114013 SHA512 068a6610fcb791385dc1956d1ff1e8b17b143a0138e6a10a293b8f18153d733e160e924f52c565e2df503101faa9b2c3d4718b2980f0e5652034e250b8a82f55
+DIST defusedxml-0.7.0.tar.gz 34412 BLAKE2B 661003c15c4e22877ccbd5c746f782d662bf8ba16dfb998953d979867eed181df01fda51bbec0813497059a27665ab391db7c4d442f90f1f22faafa6a27fe500 SHA512 7738175dafb4092a61d1a73941aecf5d78840e3674e2ae6bbf45e4e0ab6c71a9c9abce8a5394a148d50d90fd6a20d4e02c65241212af2ba6b655c1935e432603
+EBUILD defusedxml-0.7.0.ebuild 771 BLAKE2B 7db25489ae6023850c869e566641bd07f50f23689386c7ed42bd43299ab99e6a14ae2dec83f9b8044175c5659a9542b55c165d7e77ebe557d0e145f7e58ab712 SHA512 5fb7054c2f02260a815f238466f927230abb17bed5e1dcc75c3781d21c0678f349c74cdcf42dcd99bbacec2c4cb29bbeafebbd1c45f4ea921693796ed769e9d8
 EBUILD defusedxml-0.7.0_rc1.ebuild 763 BLAKE2B 4ce16ef59ebaa00ecc4a578428f6988464f281398639fa73abe5ff5de72becfdb34f02e523c3ef9a32b4156f2f42ff6ec5020df5b52b2edd37dd800fc221fa6e SHA512 660a3cd3038dd50bb9d2e4c291e09fd41a07821edc8e01496167093fe1ec34b59ce043f097f50babb7ef711af173809ac20f0436be35d56b1ff6e5e200befa6d
 MISC metadata.xml 406 BLAKE2B 365781c65fe4cd1a48d65f80056d5ae136c8fb81e88f80e57b5832f0424a30a5c836f8b5f0645f59ffb0e22b7d0732827f96a015699b6469a211bf02935f6f99 SHA512 5185c963f9ed00372963adc8ccf5270daa902704452fa7b2538dbff3a9be51ed860bd92407daa2199be6ff0147c5916ba744cc02ad0012605cfe4d9980f8aba9
diff --git a/dev-python/defusedxml/defusedxml-0.7.0.ebuild b/dev-python/defusedxml/defusedxml-0.7.0.ebuild
new file mode 100644
index 000000000000..3955f4c70145
--- /dev/null
+++ b/dev-python/defusedxml/defusedxml-0.7.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
+HOMEPAGE="https://pypi.org/project/defusedxml/"
+SRC_URI="
+	https://github.com/tiran/defusedxml/archive/v${PV/_/.}.tar.gz
+		-> ${P/_/.}.tar.gz"
+S=${WORKDIR}/${P/_/.}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	default
+
+	mv other examples || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples/
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
index 5fa104e73f14..0a41ad5adf52 100644
--- a/dev-python/dicttoxml/Manifest
+++ b/dev-python/dicttoxml/Manifest
@@ -1,3 +1,3 @@
 DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
-EBUILD dicttoxml-1.7.4-r1.ebuild 479 BLAKE2B e8b84a3eb6c127806cdb37182573522c75d757011263e85f6ac993a196b2cf76df61dd588b6bbf72f00b45574611085639df3555c96741b41f967c50c77a3c4d SHA512 c02225ea47a7dba7401c1f32a3794fa59e608bb525ae02827df200dc5847d37468c8fe9c4224178362b1b0b8f7c5e33c766f077fa525ddfbb0a3de385d72d318
+EBUILD dicttoxml-1.7.4-r1.ebuild 485 BLAKE2B c0e650f38e955b2aeeb7fc967836a109504962d2c471cef833e615bb7149f9309e1553ce19ac6ed0d7e4c51512e5264a212521acd18176b83589bb0b92007dc4 SHA512 5ac813ec429c7bcea6b43498c053bbf4a30f17c2deb663bf294911eaa8ff2633597722d79d0624225d5d9d6c027a1a616b0484544b313373c0a59deed4ccab6a
 MISC metadata.xml 503 BLAKE2B 6669e69ea7d5afa8edb064e78652a4b035f19dd786aa8eb531ed2cbdc4274a884330e7159b9a3ed051a28a0be531237bc88fe893961e5b59fec738a6d902a0c9 SHA512 3bf0c6926f48f42ce8e81c3111a625f43d043af1a95fc74eeb2463f789a2226591cea81b5f1ec1f4c12bbf365f3002f5f652f2dc7ce0ae2bf26bee1eceef75b3
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
index 9b6dbebc5251..528b6d92c7d7 100644
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index e88515ff106e..9d85940dc472 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,9 +1,11 @@
 DIST dulwich-0.20.15.tar.gz 391841 BLAKE2B 8db19f84154dff0851fd16bc534d92b506c93a93d7180079bc9829a2c81bbb25b04b234770e62ddab82440973d0702b8523896a9db90d771d8cc915b6321cdaa SHA512 a4e746099a90ea2d7eb5f0309508a4f625d41732bdda78997fab07b38ea2ecbd2c2aed08c8ef05b1b73fe3e2ba9b8c8cbf02270f8edbc6235d66cdee0317365c
 DIST dulwich-0.20.18.tar.gz 392023 BLAKE2B 891a02380eae06f2a6331825f6380917c0fd43b418149c30f640566f76b49996f79c7295215d3cf006af86d8ed5bd1465696bcbe402dcfd6b68748043eb4e376 SHA512 ae4311c5d460d7859728c9e9fa9e1888f228488a5cc427a637a7e3d1ae0de3effb1136500b13e0706da38158a245147b0996392b157e67d928caa339416bdf7c
 DIST dulwich-0.20.19.tar.gz 393004 BLAKE2B 89a63943a150ccd15549898689af68769b7f0cf25065e6cf9c9c5addb0fb3635fbc5c0fd23c79d2facdaf3086fd5e853e7ac3f9690f7fe40e0b561f0709651e9 SHA512 07a6b127fc1170a929b22cb04e34a0653131d175d3813fccc9e47e6d250bfa217bb0a2557d5e7fda6edcc5376809e6593dbd0fa52eb73360ba9c3dcdac69c81a
+DIST dulwich-0.20.20.tar.gz 397197 BLAKE2B 941cb09c0537ec9ab96fc65cac12f94cc74b549eb2a8a516def96f66a8d31ad602ae4253910a24efe7254411dd4723832481b0df3189a9cb8708e3bbd512eb6f SHA512 ca83bfe3566981830bdc91d2e4ed039625fa6780dcabf74e0e91c9d89001e06dd04c8a10e8dfaf5c5ad67081d77fc9e996e2e3e1a0589954faae09162c545b02
 DIST dulwich-0.20.6.tar.gz 388660 BLAKE2B 1a193d03e0f21a9fdd125617823742b87e9bea74c73734da10eb79f1ecbec0263cb90224f78413c724db8998f4d06ff6c448e7a6d50ce760ba1545f3321b95d8 SHA512 2f11ce9a1c716fb4242f1f93fce92f756bd93ed8f0951fc2e6b3fb18b0a495b0f372966149fca587efcafc0eaf00e9fbfcfd957442a96cc2004eb66cb7f0773e
 EBUILD dulwich-0.20.15.ebuild 1622 BLAKE2B 4575bf17b5e18a6c9b24e874ecfca0d0570011c7192ff015df65e0ef61410dd3f9db3b0d514cbba33a58321bee9c94375460a4d570b03355b11f55d7263cfdae SHA512 30e6a165a3b63a84d4e107b70a6a7a9bbe9fac37dfd7ca1b195b282a51c4a5547b948fcb5e7a57801d3e782c2cdd654261864ba46f7c9c7f8ca3aeba05b91297
 EBUILD dulwich-0.20.18.ebuild 1624 BLAKE2B 349c954db5c2625e0d20e8075795e42e6765b54a929e2276fd25d9ffa8db211d4268358d5b4d75cb1288ef695a2025bb3599f710e73b468454bcb830e10938e4 SHA512 cc9762cb667344f9d2da5c80599bfbb97c0165cce992ff606ea43e3a2f91372aa17ffcaec5c74c70bc1bd6011ec65a5b8c636b7c024e04836967195423305981
 EBUILD dulwich-0.20.19.ebuild 1623 BLAKE2B 50106cd3c4484d1e1feace25a67f11531fb12d8724684fa007b3bdb8a4705ef0d4089c6ea6d0acfc78b33a4089ac4a3ee372552f32140ef80e0bea2390a17477 SHA512 1de83698c4151d82879edff3acdc605597dfa7e6dfdbf5a6eea427088c4b5bba1810c7640c183458262a7a8e3252e76cea760ec52c1ff97d93e65f174d4a09de
+EBUILD dulwich-0.20.20.ebuild 1634 BLAKE2B efc98f7ef54b9d9f4edd2ade18aa8c6033357c5215b4258b6aa6fa12f990501749512871676e506bdc2723aad490f44f73276b749f83d462b410860fdcf70548 SHA512 b2d2169bc5693b78f8e3c29e460d2d0b658fa68ee8002aefbd513ff4e7791dc5122d138d4ecd238b6f7774f96d59e445d43a17c5964f9f68fe6563ec6506b881
 EBUILD dulwich-0.20.6.ebuild 1616 BLAKE2B d82dd9edb8fe9e96bf7bd7adc8d78f8fefd1e3a853fa851d5de6c5b48310d7bd15bbde07215586efc8721ad0408bf69ed5ea3f350415b337dc4a1f2d0109c6bb SHA512 867cf515ebb647f25bcb356f924739e412aa9746cc4842cbbab63ac23e8431ef2a06103fa3324aeff6ee04a9f66b3b142f06b7515cbfd2a20be6ec87e68f490e
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.20.ebuild b/dev-python/dulwich/dulwich-0.20.20.ebuild
new file mode 100644
index 000000000000..dca05e756a2a
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.20.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/dulwich/dulwich/
+	https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		!hppa? ( !ia64? (
+			dev-python/gevent[${PYTHON_USEDEP}]
+			dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		) )
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	# remove interference from the tests that do stuff like user.name
+	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
+		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/enrich/Manifest b/dev-python/enrich/Manifest
index e5cba10be773..ec72df369010 100644
--- a/dev-python/enrich/Manifest
+++ b/dev-python/enrich/Manifest
@@ -1,3 +1,3 @@
 DIST enrich-1.2.6.tar.gz 15581 BLAKE2B 06f104a11b2dc85c1d80a2b14c548aaac40c78795e86b1c6ae733f884fbd7af0776af53d8cdd15c15d6abb91ca89dd7f815823b419fc2b3de322b50e55844dd0 SHA512 07c280d3526538af9d718c6d423be50d67e8285007a6702b7f3d842725a63cb282192c29481cbea6cbe7da886b630e5694776092dc0ffcaac522ccf1e895b5a9
 EBUILD enrich-1.2.6.ebuild 574 BLAKE2B a69513a6d7b1297a10694102223ec43f6a140c1c6b818523a7015a7cb6a4c053e80cf9acd489ad5110335e529e81d0abd167b96409e576c1c1f3e3da81d0c750 SHA512 d15b0ea2c25b55214bab50e06dd6c736558a22e35028a8002b3b12c542e1c6fa710ab81818051507019dc0a4ed1e08f695132a1948d3fbb05ef032210880b988
-MISC metadata.xml 395 BLAKE2B 6db8a13adebe54f20dfa9498e572f58c2043173f95c8e626dfcdc01b3ca5170ece7fbf34d230b8605af7024f9540e772defe1590ef37eb59b94fc3e1c48a0211 SHA512 06d1c1d8c249995f2ca340ef2334f99c6d52d2f4a772c37c1b71375592ba0ace19ecc9272eb052ad00a6c14c1a74af0bdc1f18bdd84f0b05d359f4ef9421d23b
+MISC metadata.xml 496 BLAKE2B 4f11c188583f10e4750db82c87f972561ea9fb603aafeffec9c1f87ddbe8cd3668222b6298b98a6879a841fa1681f28671a311f1c538666415f91884c76509c1 SHA512 068687d824f7e3f25f4fbce5d9a265485cd701328002c420d019f2909d223046164bf8e159c12ca38367dd7d4c4321eccf3ce963a19eb8da2ae08567849cf246
diff --git a/dev-python/enrich/metadata.xml b/dev-python/enrich/metadata.xml
index f64ef0857b02..fad428c514f5 100644
--- a/dev-python/enrich/metadata.xml
+++ b/dev-python/enrich/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">enrich</remote-id>
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 4745e307f1bc..b9c9b6f6ddeb 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,5 +1,7 @@
 AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
 AUX eventlet-0.30.0-tests-socket.patch 607 BLAKE2B 3da02ca5cbc16ef2a8ecbd6fc9f817404cd2ad6cd6378e0faaaac7c9721e0ac03d3becee1962f44df3edfe0c30c55d7eb92c66b4a01bc94468d4f1791e40eecc SHA512 3a4f6985c3880a85578591ccbdcc0e76f5dce7c4c8897489d2f2976faf3e73e7ab1d755c91ddfa4cf28b1019e730580ba45184179c0ceef6eee859a2bf6ae28e
 DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
+DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d6850262b28f7a4508f4f3ccfb9b49dc392dcb6eb0cf20c5d171d26d2a6639627188c97123546162e4e8c61c464d SHA512 af31a7b126f2120dd77699dcf25c7134af1bcf664f40b2422238a3d2120457d5a4d5764e23016ce209882a8b888f94d2776fe194c33092f4a33111b2ac8f0cf1
 EBUILD eventlet-0.30.0.ebuild 1831 BLAKE2B 8f45971352cc6fecfe468a0c59dba62fc62ddd06ffbdbdeabc69cfa579734eb7e20261a5458ed6f178a1d29d45e3dbfc590ae593715f92e1c889a4513fa2e4f5 SHA512 256c6a0502e18cd4ead3f607c42c609c6b811f6b069fd392f37f1f83ecb28b344659bfbf4569f388e7d0b3698a3167fcb462b3fa85baed681c041b60fc6c6024
+EBUILD eventlet-0.30.2.ebuild 1793 BLAKE2B a455fb6b2da27ead1f71dabbbe00554cf5bd3fc5da88cf9f461e8c277c7c054eb86f34383811d0752918aa75b9053d8bb4a65d3851562f2e4895e2a4ac7a8736 SHA512 dea7c740cd2ea05f3ec7a22332a6fc279453bc5f141c5d89a31504235c3de220895d0b3fbab29501cd46c574d3e64a19363ca0cc291aa2cb02088254c252ba4d
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.30.2.ebuild b/dev-python/eventlet/eventlet-0.30.2.ebuild
new file mode 100644
index 000000000000..24bc5ac1c1b8
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.30.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
+SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 )
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.25.1-tests.patch"
+	"${FILESDIR}/${PN}-0.30.0-tests-socket.patch"
+)
+
+distutils_enable_sphinx doc
+distutils_enable_tests nose
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version -b dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" doc/conf.py || die
+	fi
+
+	# Prevent file collisions from teestsuite
+	sed -e "s:'tests', :'tests', 'tests.*', :" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	unset PYTHONPATH
+	export TMPDIR="${T}"
+	nosetests -v || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 70b28f37258e..af4f280cdcd2 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,5 +1,3 @@
-DIST executing-0.5.3.gh.tar.gz 303234 BLAKE2B cb9de0492c4aa31b53310abf65d97df888278671fbf24e5dc2f3f4b00fd22d233fae2265bffe240c092c5b67bfca1e69ec1c4eaa937a0d4c90bedced1f156e2a SHA512 faf591de8e6354300fb572065bda304c3cbc529725b4044ad4f4ca1f86d892da21598ba7245059824e27894937d46e4ef9ef5962a9d7dff78e4144a3e0e6b388
 DIST executing-0.5.4.gh.tar.gz 330687 BLAKE2B 10f526dfb3a9f72dda788af97547e011425a56d1af73c30f5704fb8d348beb4e4538e118355dd415ec6125507ca9b2b015c02dc0bd81a2ef732a60aafb89f12a SHA512 3953ee1f6667c32fea28f964b395d53e99fa7869e27495a241f70179577865ec430ddfa07776995b6b1aaddd660adf6c6b61a8e8931589c0faeea94743fbc209
-EBUILD executing-0.5.3.ebuild 1073 BLAKE2B f85315fd1f818982010ed056d90581c3db7c703be4f911ffffbdb8fedf99d0d291dae31dca3c553919134a91c7494ce3d331cd109cde38199ca3f5b0a5f20ddc SHA512 c3391e3e768438e29e60bc4e54744a1c10db21d424bddeeb9a5f70da2bd23cd77d22e9c99d97e896aa988f950c26c90e213d0ebe9c8b4dcb73e00a319ec728ae
-EBUILD executing-0.5.4.ebuild 1087 BLAKE2B 02aed97679be62defddd3449c8229d4179ed347c83296c0492bdfef4e156d62777800f27287f7de35b5c0029eb6e991fb0518a2da10ff0795160f5928d1d4ee3 SHA512 31ba49d1ea1def909de6161d7515f0d442ae1e7eea83ce3ef9e844e5a0c76035b35c0fdfb6feb9faaa9cf788c063afaa1ac431a3836b0dbc83b54b962b416bd2
+EBUILD executing-0.5.4.ebuild 1085 BLAKE2B 34ead6a0101c73ae23e14513f52253ff0ede0e9c7bd5d927bb31116971edcf049854fce417861ad4accd0f10516d072e0766f48929beba4bf44bdfa516dfaeca SHA512 ac479051c079ed6ad1b4337cbb593224e81f1d8c5e62791e8f6387a0d4e8f9bb686bc0442dafd1250986c843651ada922fec6455ddb80c2b58832c7901c0de86
 MISC metadata.xml 350 BLAKE2B d128d36a837974853f5e51c64b03ca8eb749eaba54e5049033153e1c3671eef5a91490855820a47ce718f28e2aa45dd9d26df75e81fd923d7f119d546b6d9b61 SHA512 ff4ae4abcc417476ba024f7e9ff8f8de8c57d70f34c36bd2a4adae498c01489c16bf315ff174616ac9d65de3431983c35da66edae60668c9e526ada2a026555a
diff --git a/dev-python/executing/executing-0.5.3.ebuild b/dev-python/executing/executing-0.5.3.ebuild
deleted file mode 100644
index 602ada173f5b..000000000000
--- a/dev-python/executing/executing-0.5.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Get information about what a Python frame is currently doing"
-HOMEPAGE="
-	https://github.com/alexmojaki/executing/
-	https://pypi.org/project/executing/"
-SRC_URI="
-	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-# asttokens is optional runtime dep
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_prepare() {
-	# Kill off useless wheel dep
-	sed -i -e 's/wheel; //' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# this test explodes when collected by pytest
-	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
-	pytest -vv tests/test_pytest.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/executing/executing-0.5.4.ebuild b/dev-python/executing/executing-0.5.4.ebuild
index e301b0c3d35a..d75b67883dbb 100644
--- a/dev-python/executing/executing-0.5.4.ebuild
+++ b/dev-python/executing/executing-0.5.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index a6de436433d4..ed37ba62b05f 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,4 +1,4 @@
 AUX flask-restful-0.3.8-werkzeug.patch 1517 BLAKE2B fa895690ca771f1b4431c62baec0577554fca082418c2421eb8012be2e234699eab54f2690d237dbd490f536eae5fe0fdfd8fedad16fc60bd92351f66c93a7a4 SHA512 96db20a0850f37ebb90fad0964448783c3af8b9b8128709fc52d509f9b1edad72455330a09f81b4b766eea7b88f3b79fb01e112f1684be7776a8b3a78ab90a19
 DIST flask-restful-0.3.8.tar.gz 114588 BLAKE2B a18eac613300102bb5a5ca78cea1e6f81f3de21d8bd2e6c72f2f1a559e8b4228175cc7d372b68f131267cd8bc759e354e5782e527d1e992579210348cd2b78dd SHA512 15172114fcedc2f4286cf5f583d95e42c8c8ce6553f9a44e57124f2b1417bf9f094dcb5154a6933ebebc8022f39d4d7969d29d38576111f9d5b45f630b36a66c
-EBUILD flask-restful-0.3.8.ebuild 1002 BLAKE2B ded75a8b755bb89e741acedb16227990460325f4bb1fb94dd2711df5d47652bd7b7e3f5df0d9558b3194ffbffa8b6a9b8b5a815dbc486677c03379f0590dbef2 SHA512 74e97a4c7f905f2b7015533a47aa3ab454068a4674b584cb28d7c4617ed75d84c0b2c6401b2284558f66078488bb3259e24e4fe7c3d5822d6ad07599bedff58d
+EBUILD flask-restful-0.3.8.ebuild 1006 BLAKE2B 952156256c65bfe2b4962d0df8df914e27026a92ab1a178a760a9738e59885e1fadc531883ec29f36ff88a552f7053345b0997a9fe8073c69ae0b6b4c9eb46e0 SHA512 bcbad3a388eab456d78f6ff3ea985a8c1009cf07db5ea9376c49b751a943dbac248ac4a6f151b8a5838d5ca282e7a9012475d3b3951a55bdd8c05a08e53519dc
 MISC metadata.xml 407 BLAKE2B 32075e72b358faf256d1f2b0a650eb7b1d966dcb4376a4394933545b0b96d77d633bdcd8cdc6db044c825fdc237b9b4674d38d3d90027f9cb758325121dcba6d SHA512 2b7f74ec3648a92e7740b22a8ee5f367d61553d37fbc854a90cf2774a383e1fdc3382217c7811d21f8a0a98dd363ebefd873a8a8286cbb8e0f781382584ddda5
diff --git a/dev-python/flask-restful/flask-restful-0.3.8.ebuild b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
index 1554dcb94c6d..eea5a35b47ce 100644
--- a/dev-python/flask-restful/flask-restful-0.3.8.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -23,19 +24,19 @@ RDEPEND="
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 "
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
 PATCHES=(
 	"${FILESDIR}"/flask-restful-0.3.8-werkzeug.patch
 )
 
+distutils_enable_sphinx docs
+distutils_enable_tests nose
+
 python_install_all() {
 	use examples && dodoc -r examples
 	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index 1cc7531bc8a1..99db9ad55de1 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
-EBUILD flask-sphinx-themes-1.0.2.ebuild 541 BLAKE2B 9b9f4b42310a91fc2e22d6408e8865f959b6982bec2b0f2b477b13854f2bbbd828691757953a4ae2ee50141cd997ad3ca8f5a9c68ebae9af859b45cb5383ce0e SHA512 6cc3924c346c96738b004cadd1f60228d5e3ce583a9f13df1123b1856a493358d98f657b2364147b95f0f8e334e0c30b1c069e7df6f6b990f952e6a362bdd02c
+EBUILD flask-sphinx-themes-1.0.2.ebuild 542 BLAKE2B a4f70f68ebd359129a58bb7d2bb9383c728350beaa465bd742716a7b0345a08e51ff8ea28ca6411d451c1571bc31549d3d9387e8ea8ec50f79127d5a151fcdda SHA512 2baa39bc12b78a09acff099981f22c07f229af66c161e74783e2146850328c24182aa903db1fb7c7ff16d1912536774025596f40ed3b4fbaf3edc7c283c79dd8
 MISC metadata.xml 503 BLAKE2B a425dd302c3c1254405877b96d657eddc79611ce4d383d2cb0345b58987aa73037bb6f6eac18250c3f1a6d2c37980de8e18d0a8b52f9c4b661583ae562eb3a27 SHA512 c77b32565154b02799b53c0b7b9bf5e2329a287aeeb0c0ade266b5d7773d06d743d79dc90cb3399c70ae436ec698b3b1b2f040fae0475998036e9f40af870c05
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
index 703da0f0d646..95bed176a27e 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,15 +6,14 @@ EAPI=7
 MY_PN="Flask-Sphinx-Themes"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
 HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index b75e4b47b518..c144a36c5d2d 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,3 +1,3 @@
 DIST flexmock-0.10.4.tar.gz 45362 BLAKE2B 4ff79cff3b0d8fb0c97bd60b0d5aa5555a7b939d3d6275a17c9bd1002b1d7acb53d4f63f5f834faf0d349d8b8d429eb063f121c4d7b6d12aa1bb3e7bdbadb861 SHA512 d190fcb66f0c2c4e3be2384d68b95a22c695ffa0fe8f8a218f2baa68c91683641396197cac69ddab21e4b0990b9930f56423bb7cd85770ceade9c22ece72cedc
-EBUILD flexmock-0.10.4.ebuild 622 BLAKE2B 97a4b8ab402b4a439a253c56127b32c8bf18a848c723c795cbfabc7a94a712dbe8152b03541b34808c61e4c6743eaf851586af16936f0d4959c36656ac517a77 SHA512 e76565e50e35455d99507bb95b98916d1f30b88f75c8ea3a89150b5713d99155d9e46abee685dfddc1925d964ef05a3bf972cb8e2caf9f6f5e35e41a7ee3a710
-MISC metadata.xml 603 BLAKE2B 7bc248befb25b5071da321c7ad0cbefb6c57ee6f4fb9870a27c4888dac3239c90cac23a7adb0cfe41f7301edcb453463decf1c1b2be644a5e0c2fac5a41c0c0a SHA512 30088206cc5e7f24858f474160bc646e4744a0ebf14ac39048d5c31cf767da5f97d02559062c1002abba59d0a1ecd08861e52c3d2a29ad6b7e9d1d35c06e96f8
+EBUILD flexmock-0.10.4.ebuild 482 BLAKE2B fff2ba5ff38dfbc29ca1d46bcaeaf420cf281b340c55dd1bb94e4849363d27526a575d4e713cf68739153bc0001b5e033c9d35dedb07fbd7b9b2bb772e215cb6 SHA512 92c17bcf5552727f4e78fc0a249d342fde3f0edb28038ac96e767e8852fdd1d10609e1837ad664470908cadf085427786d0e27bd872a609e1d40cc68d689b075
+MISC metadata.xml 627 BLAKE2B 11783ac18217aab3e01807480f034400a47be4bad123c8eb23ebd1b91c562a01c86b4dc42612a7f50183594c44916bc42c4c48dbc9b57d23c7ebe4caea0e9acc SHA512 c352d2ef1e38dde5147b46323eeb4a0cfa669582e8933f28a38c37b9d19930010465190fb909aa088590732e7a97997f58dc9b4390f704c13b751fc51877a9ff
diff --git a/dev-python/flexmock/flexmock-0.10.4.ebuild b/dev-python/flexmock/flexmock-0.10.4.ebuild
index b93e57f3ca2d..22c19f0099f6 100644
--- a/dev-python/flexmock/flexmock-0.10.4.ebuild
+++ b/dev-python/flexmock/flexmock-0.10.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,21 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	"
-RDEPEND=""
+distutils_enable_tests pytest
 
 python_install_all() {
 	distutils-r1_python_install_all
 	dodoc -r docs
 }
-
-python_test() {
-	pytest -vv tests || die "pytest failed"
-}
diff --git a/dev-python/flexmock/metadata.xml b/dev-python/flexmock/metadata.xml
index b15f95a46db5..c6d684cf9f17 100644
--- a/dev-python/flexmock/metadata.xml
+++ b/dev-python/flexmock/metadata.xml
@@ -13,6 +13,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">bkabrda/flexmock</remote-id>
 		<remote-id type="pypi">flexmock</remote-id>
diff --git a/dev-python/frozen-flask/Manifest b/dev-python/frozen-flask/Manifest
index f8cc49d5c820..d9886d4b6549 100644
--- a/dev-python/frozen-flask/Manifest
+++ b/dev-python/frozen-flask/Manifest
@@ -1,3 +1,3 @@
 DIST Frozen-Flask-0.15.tar.gz 477516 BLAKE2B 1f9ecc59cabc547f7c4358c5fbbde0c57264a6c8e45bcf567c00f5c20eef288b8d261edf878e1295ef702d863c16dd605b59982abfe4daf9f073b29787b01921 SHA512 8cb80ccb5018abdaaf53a43c219504d57f2630af3d8d5c7bd6bee44c7cf483f50530bc00ff49fd674d54c0e1f6a5e0caa004bff04e95dec7f58a8bb443a36241
-EBUILD frozen-flask-0.15.ebuild 1019 BLAKE2B 29a2988925af97c61b0ea3dc77dcc97df972b85472bb703b8a02dddcd4142a12617edb737285b1a59907cdd750f0ede1b62cce1ec4ef5af1ae395623510e4a08 SHA512 08b6ff6893126ea7f5606dd03128610a78bb7ad3ebb3e1e174ca76724931af4ec391a12e059442727ef56704d9158f0c750e844fb0e7f3ea781a46ef0fb01e33
-MISC metadata.xml 392 BLAKE2B 556a70b7cc4ad351b7bbea9b531e6bca52f954e09b4c5846a14ea9be59760a2915f6e6e62c3206987789948e4cb5055ddf2ad24bd54d6bbcea7863c037f7c50c SHA512 e5e9532f9339c004a62d717717381eecf0dc858114295feae3461a77db767a8354d2e6ede388e5b98cb695f1407b150bc282eddbd5f17d076b371f3ed452bca3
+EBUILD frozen-flask-0.15.ebuild 853 BLAKE2B 47ef6e7daadd445e13f71cb7c625fc572c86ff74b895ba86e1e26dda1822a87dfb5fbca88d500dd986a6a8688422b8bf111aec513c36b889932a644b1b68ef3c SHA512 c8812a1e774e3daa75b3ff3e78ba4cde8e97518d958c96a6a53a0bc96f30f49c5d83d1beb2b13248a87df7c21bdb0ecaab92717680859a4a8312278e4d38f53d
+MISC metadata.xml 417 BLAKE2B 2bdbac5df39081dd75056d27c5e943bcf898baefbd76b6080e1cb8f6cfabe0ca9d0ba5b073c1929dd71d3207d7557dbd23267464d59633c1ded1e8e429708898 SHA512 94b50fe00a2434157ac8aabf79e19e68306b70a7112fa2ab20299e1754910c55182678309ba13c6e2910016e3614812067e482e6f6d638ad787c3baff4c2bd3e
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
index 5a8fc84b7cc4..d34cbdb14e74 100644
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7,8} )
+
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -12,20 +13,17 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Freezes a Flask application into a set of static files"
 HOMEPAGE="https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/flask-0.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
-S="${WORKDIR}/${MY_P}"
+distutils_enable_tests nose
 
 python_compile_all() {
 	if use doc; then
@@ -34,7 +32,3 @@ python_compile_all() {
 		HTML_DOCS=( docs/_build/. )
 	fi
 }
-
-python_test() {
-	nosetests -v || die Tests failed under "${EPYTHON}"
-}
diff --git a/dev-python/frozen-flask/metadata.xml b/dev-python/frozen-flask/metadata.xml
index 7a2661fc5876..17088374e068 100644
--- a/dev-python/frozen-flask/metadata.xml
+++ b/dev-python/frozen-flask/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Frozen-Flask</remote-id>
     <remote-id type="github">Frozen-Flask/Frozen-Flask</remote-id>
diff --git a/dev-python/fusepy/Manifest b/dev-python/fusepy/Manifest
index 4054e3dc247f..db7905baabec 100644
--- a/dev-python/fusepy/Manifest
+++ b/dev-python/fusepy/Manifest
@@ -1,3 +1,3 @@
 DIST fusepy-3.0.1.tar.gz 11519 BLAKE2B c76319b0d0b64a8dc674b803551f32352fed9a1e6e050110963a159259c3fed8fefbb63cfe6dda689738f07cb796c6b9da14e3070c4a1cf5b70892a6ebe52cc2 SHA512 f913dfd9f29412daa8239548c8ad8bcc64f8fc7be1425bf34cd40a5c4d22faae67c5d5575c187395d911f64ad0dda186614ada598b38b9557e18794639d43767
-EBUILD fusepy-3.0.1.ebuild 502 BLAKE2B e042f927a2d1e5fc0610fb2701b874ba08653b838027643db6cb4e03b06a3f4fe8b05147e90fb7f10aa30cf6aa1a3302c9cea3dcc42a083b3a21bae22c2e3f6d SHA512 9186a007daa89d0b87939a00f74fa535aa1a7a616fe361fad1e3d090e9ccae24aa1a7ae9df8506faa2015bde8aa8c4de5a9cc7523440db26772b8b799b60399b
+EBUILD fusepy-3.0.1.ebuild 455 BLAKE2B e180c6fbe523f6471d803551b6d4f52059fc03eb193f2f0d38ab2967407e38096ce6f85bdadd0e3c47c5e82daa798e6035ee7155659ee10311c5b3d4c701f609 SHA512 a08a87fcf77c6a2a1b719c834c256d41beda7cd1c3ac3899ee16433b016ab8d33885f6293dcba48f735a1e46d4d363e76c23dadf8bc5ae176994bceca03f40bc
 MISC metadata.xml 537 BLAKE2B bd577b1a9cc36b6d87e709111d118980d1ef6506922dfda669a21c06dd332e9875370ae2c0153661d3035e70342fe40af9c18c208f846aa227eb8ee1aa6ea070 SHA512 d45a93a1a0eb1b70f96e0c6626be5c5996a66b108a2b787df02471b72be1b596e67962ff314e5e67fb9899a49d4d86f932c5d6a34b96c9b36e042cfdaf69af8f
diff --git a/dev-python/fusepy/fusepy-3.0.1.ebuild b/dev-python/fusepy/fusepy-3.0.1.ebuild
index dd734582dbb1..d8801526d83e 100644
--- a/dev-python/fusepy/fusepy-3.0.1.ebuild
+++ b/dev-python/fusepy/fusepy-3.0.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -14,7 +15,6 @@ LICENSE="ISC"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	>=sys-fs/fuse-2.9.7:0
 	!dev-python/fuse-python
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
index 6024f170c0ae..f233a36219cb 100644
--- a/dev-python/geoip-python/Manifest
+++ b/dev-python/geoip-python/Manifest
@@ -1,3 +1,3 @@
 DIST geoip-api-python-1.3.2.tar.gz 35674 BLAKE2B c6c4469164347c8c1a8a5231be25370e806768d7f155832cf759469320d8adbd5efcd002d14d1d95522e8bcb4db12668b28b437b45af669bb336024662908498 SHA512 284209a6894d55ef95844c5c4c7aafff99ebcb13996e5ff64a0c31b38677e13c11d51fd8b0250d0fa097f15805c27b572d5aa12c2b217a839afe3cdd0851c414
-EBUILD geoip-python-1.3.2-r1.ebuild 909 BLAKE2B 90600bbae1951c1b0d5e06882fccc6ecff69d0fcce138dc88dfd36c9fee6dd944b307779e9a07cf47e03ea98afd303a6cc0c9a9ec782ede4c052317a6dd5a0ea SHA512 2674983e97b9aab49cc8b3d9a22b3d8b79ad9a2a1f4580f3844f01e2a68bff7214eaa6ca8d1e4075d5adbcf24a08326dddfe9c76237c2da0e4688d113de6d8bb
+EBUILD geoip-python-1.3.2-r1.ebuild 816 BLAKE2B 669afaba47e5af39767852e4749e60145a4b3ea543a58d59e1fa98ac8a015a7d68b8a6310e97dac738355f4ef19883fd6dbf451b956f88b983e6d2e34e84e2ff SHA512 e87984bc2df3f5a2226555ce3e3b8e5b3da26da7eaad447e7a3f60f981420c951b6c90dcca24cecc14f1f3724ac224435afaaa2f64188d7528e80e487671c2ba
 MISC metadata.xml 372 BLAKE2B a64a0eafc20c11334ab112844de60a58eeaec62d2bb88ceb0e72efba9fae4cfd0bb02a169f4913299534cf3243d740a6f0f96fee1448a55bb8d9bffe3ccf3597 SHA512 dfcd2454bac4830995eda03b9fc585ea4f19f3e5fc90c00b57ee75d8d9596dc5dda9294f770481df7b9c6e27dea45f7fcf1f8d6094703121b0eab62f2fb055a0
diff --git a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
index 04f3cb2e12c9..6097ed5189aa 100644
--- a/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.3.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -12,6 +13,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Python bindings for GeoIP"
 HOMEPAGE="https://github.com/maxmind/geoip-api-python"
 SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -20,19 +22,11 @@ IUSE="examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/geoip-1.4.8"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
+DEPEND="${RDEPEND}"
 
 DOCS=( README.rst ChangeLog.md )
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests nose
 
 python_install_all() {
 	if use examples; then
diff --git a/dev-python/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
index ec7e9e61b11e..4e717fc948eb 100644
--- a/dev-python/gevent-websocket/Manifest
+++ b/dev-python/gevent-websocket/Manifest
@@ -1,3 +1,3 @@
 DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93
-EBUILD gevent-websocket-0.10.1.ebuild 521 BLAKE2B 7e281c3d8e222cf4489356505cdce840daf8d4204406c6c7f43658a181e06193a7eeffc1c3215feaa552d84b04b137e10f8425ab83c4ea9e11d17f1dfe9ca5ff SHA512 9eaedae70d1bd9eb9b9f298af2911629625cf6e02f2293c146e2c82eb90e48fd53fe95a82fc27afa6e7fafe8cae53c1ec7d6dc36e644aacefb5179e77d5f4a9c
+EBUILD gevent-websocket-0.10.1.ebuild 467 BLAKE2B 0a24b8636b75677549463e7a5bfeec266e74cdf94d2cb92f26a10151bc3916a09becbe243a298ea051a47884fc9920dd2d5d7e4e79855050ee556878f9976938 SHA512 a63448bb8301b1e8a6822db5071ca42e916a1f120e9d3e2194e28f90465c0974a1030dcc4a1dba94afdcbd44c2ba614d970f090a603154f1e13ecde617a1e7a0
 MISC metadata.xml 315 BLAKE2B ea8a3869c0cd8379a6e7efc8520697bd4b8a500a25d5611947f54ca895116a6caafe3ba61aeeca6725a79d039acfbf32059a805e164d70f3bdf8d80f849df369 SHA512 0ff9f5357eec2e03d6d5909e09fc66c306e7972124348dd4b61018b83dcdef6342e74aa25806f93e56ef3e2ba84ba88c5d776170842cecb89800c68fee42edc8
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
index 6eb4acab3f01..1a2f54a54eef 100644
--- a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
+++ b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -13,7 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index b333aa45c1ed..26408bc6bb87 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,5 +1,7 @@
 DIST google-api-core-1.25.1.tar.gz 131189 BLAKE2B 3b5ec782b0492a699d146539d95f613c07aab00735a08287eb93f3d458f98bd57b5e46082fde37aa4dd9986c24443ea22707ec18ec8a4dd2f80f5bb937bb4153 SHA512 cd29370b5a3eaca2c9b5076b6df12b114f28132fcbae63e7574dc9380b7caeea4c1ed476bc332ed16845efe85a44775391ba4f6ceb705b7ece49837056cedc25
 DIST google-api-core-1.26.0.tar.gz 132817 BLAKE2B f077e5f7a50de69ef3707d3e9a54f3b4948c458ee1eda058778fda618b202e7fd5fb7a116b9b153bf77bdbda858a91616e2f201d2aac45d8654a44001f52c71f SHA512 2e35f231936d06a6c05dbc4930da881e17c53d10224ed394d7deec9fcc45647ccb3dc72316912c31300bc5d3776467d6aab160660695c9919f28fdf73bfd2ffe
+DIST google-api-core-1.26.1.tar.gz 132880 BLAKE2B f1872c1240b0b40385fce0496c676c2408501600710ec51cdcbfa8c5f0f15858ef62860f33022bd9ceaffbca25ec83cc1879b7ec7c3a3b119e5e3cc4ac043a0f SHA512 138bd10895006885761f34932bf8f4b0776c2f3a2c2038d97d1837d961088b4a19cbd84321a493b81cad4727374949e87c59b7f649507a7cb356e6457a94cb1f
 EBUILD google-api-core-1.25.1.ebuild 1220 BLAKE2B 998bc8b03c3c5e1364def5a34324dcf2a2f83a7e67b93ee39c56660392abd0240833963aed60746807476a24ddfb2abe33a695e7cc1914c339f63946404b2b3d SHA512 a6521e2eba9b86d54f35660429f21a280032ac316bcac7cc835ea7cc6eefdbef08ccdef41f8b380556be21d66f49d95cb4806c14dea5de4f202cd35c9f7e58a3
 EBUILD google-api-core-1.26.0.ebuild 1222 BLAKE2B 042cb59845de1b8618513cd397267fc88c0eb17aefe098fd298158129140e475f4459ae85c71e88bf959b4c368c483490a6473bf15104aad13356e86ef5d40ca SHA512 18c69a18757c1e953340d950eb5587456f8b083183ad9502f7ee953e71268d1e122ee3a15a29ee8d31e82f7c144ca4e3bc4d70e1b256c30af9ed5bebefc70338
+EBUILD google-api-core-1.26.1.ebuild 1222 BLAKE2B 042cb59845de1b8618513cd397267fc88c0eb17aefe098fd298158129140e475f4459ae85c71e88bf959b4c368c483490a6473bf15104aad13356e86ef5d40ca SHA512 18c69a18757c1e953340d950eb5587456f8b083183ad9502f7ee953e71268d1e122ee3a15a29ee8d31e82f7c144ca4e3bc4d70e1b256c30af9ed5bebefc70338
 MISC metadata.xml 452 BLAKE2B 0fcfeaec5750606a31eecf6794110c23bee9e2e56c9aa18201568e9ca8b1b45ef538efb4d0700eef7ddb28729acbc23946daf2c88c1cbe4f4f309d635455080c SHA512 0bb4089469ba140ff630b358150bc7ccb646465da9ae7b83ddbbb980b10347e0d3cb7b7e86cd8d0ab5897aa6a34017f6a921978a8ded784ef7582b00552299ae
diff --git a/dev-python/google-api-core/google-api-core-1.26.1.ebuild b/dev-python/google-api-core/google-api-core-1.26.1.ebuild
new file mode 100644
index 000000000000..452b0c651760
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-1.26.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core
+	https://googleapis.dev/python/google-api-core/latest"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 3cf9df44cd58..6bf12e340830 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,8 @@
 AUX google-api-python-client-1.8.3-tests.patch 1118 BLAKE2B 41900d0b3358128626090b94f8e2a1f767a31dce97efb3c7c5750704a27f9c962cde240caafcc883497b71209c7c8b6733464d1dfee00ad13d2707cb2beee397 SHA512 a14830727ab93bece5c65d303276b6ba85c5fbe8335d97be2f0478a7ab1d37d9be688c859b4ff4ecaf966a9d95f245276c81dd4d7d4e9bb31164a33ecabf32ac
 DIST google-api-python-client-1.8.3.tar.gz 13537177 BLAKE2B 00b1d46f349a8ad66d08a01da31aed224260ad38f0ee2d7a5b68afe29264234475d28b33cd95addf9f7020fa052e9528b01a4c9cdb73e2ca5742134c4f8f86b5 SHA512 7b9138b27bf032cc1b8beb321459ba5935ed31e4965fa783e472b9483cfd0e97c1da6a34e84fb8c939c462fac462d3f0d853266586ab37be8f890a6b873cf4e6
+DIST google-api-python-client-2.0.0.tar.gz 23121166 BLAKE2B 427160b34982438ef7b2ded441623daf49285c5734313f49cc47d1bef5a86a80613ae357a0307b84c145219c44d301b5fb5243bda9f4005c56aa2de97efe112c SHA512 1172e50349d2062e1c79d864c0b9602a1a51823c4453f68f1d6d8644fca330ef7767168cdd45623452271930c0234ff07a94fa694509095bffd8724be3961c2b
+DIST google-api-python-client-2.0.2.tar.gz 23122914 BLAKE2B 0df0b44b2e86088069c5abc1916e733340ccfdb5be7629a2b5f1fcc8e5597183213d2ec149ef64a879bd50710ac804839b7d3be3d912ff6f132473dc6b4050f1 SHA512 9224a1f925ddeedfa0237372b4c5d1dbab913e07a8885398b955ff188decea68ebcde36fdc06394674e31d8ff4dee02aba0e13ebf8f599b1fc19854c21f9ce85
 EBUILD google-api-python-client-1.8.3-r1.ebuild 1396 BLAKE2B fc4b6eb8e14a19a899b780cb8d1191db0ab05bf7d1492a986e6c656410abd791373ca30cf4ad8c0347caefc6a2d4cde687c1c6b9a4c228edaa60787561fd178e SHA512 897f438df59873c4700dcbfe2b4751fd426fa4c0d99fe64ad5eee22b074694e9612809a48631dcb092ee3aa4e98e402318e3c00393ca80ed8b363819fe30527c
-MISC metadata.xml 436 BLAKE2B 1f28873a4be7cbd2e01e8e88faaa316f4a55e25913c86668bad33908a9347b9cbcfd954c6b5c3557c7d01b256ae253d9836435846e79be49253a27a801cf3754 SHA512 ac98060c577e0f37530ac2659233bb7e098884f984236dd74f10d47569818bbfe811bb54f795886d899dc90c848abc0c5811a43173dbe4dc57249f63c40d2918
+EBUILD google-api-python-client-2.0.0.ebuild 1396 BLAKE2B d1bdcc7680318b5206d46c33305c0e5b8dffef90cb9de16d74cfb3a27f0b18e70119a895a8a0998b16c41a495d264b3ba847941bd5c88989aae1d565fe2d725f SHA512 84bf67f885f5651f1bb22c479762a58a19f708a59b555efbd228c9caee0da021c823530c6542b818e2d1900ac3347af7f8dc765271a6e2f9e47a1d7564b7693c
+EBUILD google-api-python-client-2.0.2.ebuild 1396 BLAKE2B d1bdcc7680318b5206d46c33305c0e5b8dffef90cb9de16d74cfb3a27f0b18e70119a895a8a0998b16c41a495d264b3ba847941bd5c88989aae1d565fe2d725f SHA512 84bf67f885f5651f1bb22c479762a58a19f708a59b555efbd228c9caee0da021c823530c6542b818e2d1900ac3347af7f8dc765271a6e2f9e47a1d7564b7693c
+MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.0.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.0.0.ebuild
new file mode 100644
index 000000000000..f2bb3877647b
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+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
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild
new file mode 100644
index 000000000000..f2bb3877647b
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+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
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/google-api-python-client/metadata.xml b/dev-python/google-api-python-client/metadata.xml
index 17035ff1c96a..a27f601ccb82 100644
--- a/dev-python/google-api-python-client/metadata.xml
+++ b/dev-python/google-api-python-client/metadata.xml
@@ -5,6 +5,10 @@
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">googleapis/google-api-python-client</remote-id>
diff --git a/dev-python/google-auth-httplib2/Manifest b/dev-python/google-auth-httplib2/Manifest
index d4f0399c6419..f5fb82fb77e3 100644
--- a/dev-python/google-auth-httplib2/Manifest
+++ b/dev-python/google-auth-httplib2/Manifest
@@ -1,3 +1,5 @@
 DIST google-auth-httplib2-0.0.4.tar.gz 11218 BLAKE2B a6f4b4cf29ba6db81d70dda16eef7c2d378cf1c38d1f3f2f27a38a7d293809a23a4ae38ef0515b8b1ce278bdfc4a15daa291cac0a70f7a84cf7c8f40e36e01c5 SHA512 a33e54d07c610dcb1e01118808792c3a259b7f1a579acbe3f92825ad5100b96a844168bb37327e71f078b870f1594b021d59d0c86c15868384f19ddb569b42cb
+DIST google-auth-library-python-httplib2-0.1.0.tar.gz 25116 BLAKE2B dbb0393bafb1bbe67b99ac0783e687271c42256c7b283422b884b86d4c8a83222392a5514b812aae683ec7f887afa4bf81307079e676f793f02eb87e52a375e5 SHA512 52b0faf70e185cb89420377a06c77e2c45f6b910b85371fc2c42fdfb06a4ebca28b476201f9d179fbaa4a8bf7b6015703d023ddd95d482113e2cdbf79fd376b5
 EBUILD google-auth-httplib2-0.0.4.ebuild 1099 BLAKE2B da4066323d39a2268034a5e924506f1bb3b76bf3bb434e86b89e455d42414bcc55eca144a53b99ac50881f6276b8bfecac7c65ae87822385803aa73bd153c28e SHA512 9157bb5a36b8582fda04061d25e119dafa8b3b30e88fa1c0b87681cf9619c61ec582a2ca1e8d2a1db026023c44c83613903b1f7703272474005ce8d4087b6447
-MISC metadata.xml 446 BLAKE2B 5f1f5cecb1d2313f60aec2264a869d2138965894c64a79a311da512bee4c50f21a5d0ab8976598b42e6560489ac40e3da656ddb4d0dd729384b9f7e940672df6 SHA512 1f0be263133f99a92f2557d69a21c861ad0d5a2146635dccedbcf00b40d162810deb2edc4c888f5b69ef0bb4d293463c1484282ba37d92a04329f3ebc67cd561
+EBUILD google-auth-httplib2-0.1.0.ebuild 873 BLAKE2B 1441933b62cf54850e179ccfa76b9eea432d0733bad77e195d6f9eb77f2911b4c2d412fee5a13e99dea5fa687c87c52c5750ce536cba1bae773b732561e8327e SHA512 af1b1cd2ec120ab041f1dc4d2e17c8887f72d42f21374df05e79ff6caebe8c2871fd1dd59aad5010cfc5cbf9d1a15a3fc014213f60aae0e20107b5e8d6a83e43
+MISC metadata.xml 538 BLAKE2B 45c0fccf3cc323cf4eaa98ec238f5d9b80c6e121664da606b99d23e6039762182ec2abd1a89737f74ff7160cf2dc1b70b4326d2643ef453ff98f9745ceb43763 SHA512 fda227c2252a4f7c6a78a5a8681de6d995da1b4e6fbbe4ef8191e9c09985dd6299fa4f8d24e19ad0462c6525f9b214aa744271b3cb5b9af76e6c3971e7658da6
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0.ebuild
new file mode 100644
index 000000000000..2ac6744b4e6a
--- /dev/null
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_P="google-auth-library-python-httplib2-${PV}"
+DESCRIPTION="httplib2 Transport for Google Auth"
+HOMEPAGE="https://pypi.org/project/google-auth-httplib2/
+	https://github.com/googleapis/google-auth-library-python-httplib2"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-httplib2/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-auth-httplib2/metadata.xml b/dev-python/google-auth-httplib2/metadata.xml
index 0c84d2bfe5f8..a41293ec086c 100644
--- a/dev-python/google-auth-httplib2/metadata.xml
+++ b/dev-python/google-auth-httplib2/metadata.xml
@@ -5,9 +5,13 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">google-auth-httplib2</remote-id>
-		<remote-id type="github">GoogleCloudPlatform/google-auth-library-python-httplib2</remote-id>
+		<remote-id type="github">googleapis/google-auth-library-python-httplib2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index cfdc4f3f496d..d06a6acbfa78 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,3 +1,5 @@
+DIST google-auth-library-python-oauthlib-0.4.3.gh.tar.gz 48020 BLAKE2B bc5e575f3eb7b8b876deb13aaff0d1b900555bcbc609259dc72c9f01f595283feffea6aaaf91acf835b313629fe4c4c76dee8ea877b6ae37c3c01633c63909e4 SHA512 f6fa0e525b0aef6f4359954cb2c8020ee86544862318721d439d153cae3e75527b0e0a312572dc936fab7702da8c6af42ce9242d1e73f48c0a822973e470a4a9
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
 EBUILD google-auth-oauthlib-0.4.1-r1.ebuild 763 BLAKE2B 9831129d76dbb7e468426c9497146d13b2af4b98eb7f18775aaf355b7f478476f60aac5b8daf71003658df719d2068fbc2a2a9c29925d877e6e09b174bdbfca4 SHA512 64f0879d1219a780fdabf99cb7f862eb0466c1a4c0518885d77ad689f23b0d222140867ab41e15fd07f607c1b40a9f3665a8dc3ba043176a216b1a2d5cf6728c
-MISC metadata.xml 541 BLAKE2B bc6bd1d6e0a6106e267cd5c2fbb96c39db6d63fd659ea9e75d1391406976426080754de74df8712d9f8dbe434ec63b53210b66d9a5c87a267a17ccfa7c648281 SHA512 02022500c530d62d03eed95f458ce2a32278028bf41d014835e9d85c82e658f59c148d064a79cddbd58f717a75f5a8727e0fe4628dcb526327ec913dd82ac0a4
+EBUILD google-auth-oauthlib-0.4.3.ebuild 897 BLAKE2B d27f90b749025c63ee0ccd2e986dc021b21ce0280a2e7779dbbd754a3b68a7d779627459e20f485cd2bb5a41970863e24a84b3e108a216d3185d1806e079e4b6 SHA512 af995c0a3cd0d1ea53895af11fff39bdfd9e10c7b3cc430007332a196b823ba092a73afb210130cfe0523e0d3e42d1bb42800f0e12ade6ccc385f8057ee97b6d
+MISC metadata.xml 642 BLAKE2B 546e4e4860b520979da6b022c0ce1f201e160d6eb08e1b18f2d32666024941250260577fd01e39053691780ac714619de0733c030397a15cc628e7338e703699 SHA512 66690d78d094ba83ff090bfc85110cbc48e727eca5d85a5fcd3bda727b356be13950027f74920fd0f11923afdb914427ae58c23b4d16c9134322a880291e2206
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.3.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.3.ebuild
new file mode 100644
index 000000000000..188128c194b9
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://pypi.org/project/google-auth-oauthlib/
+	https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+DOCS=( LICENSE README.rst )
diff --git a/dev-python/google-auth-oauthlib/metadata.xml b/dev-python/google-auth-oauthlib/metadata.xml
index 8b0a33ec2229..c8fa5fd039a0 100644
--- a/dev-python/google-auth-oauthlib/metadata.xml
+++ b/dev-python/google-auth-oauthlib/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">google-auth-oauthlib</remote-id>
 		<remote-id type="github">googleapis/google-auth-library-python-oauthlib</remote-id>
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 5783f1ec5b5b..96d5c639937e 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,8 +2,10 @@ DIST google-auth-1.24.0.tar.gz 120351 BLAKE2B b0a78ad87622bc806cce72847d5dad3844
 DIST google-auth-1.25.0.tar.gz 121940 BLAKE2B 9c7346b134153321fe7116cc77bdcd0d07b2d4a5264d4a982f23a44458ba17c03ef8d204d2c6bd697561c11563bbff1d093ec4563700910ea3bbd9a063006005 SHA512 1c83f18904b646264263c8ba20c13bcc61572b9de397331564b1c2e65083a27e6393dd9435b03789136d2fc2b43750f784d21a3dc670a58cc4bade9de267f195
 DIST google-auth-1.26.1.tar.gz 121927 BLAKE2B a24a9c5bca8de234213e75673ba49ef6b82eb3c165f9c3af276b3c4cd47750c6d8a53e46084ae71c8eadf474ec8f53c6a2469fd91e7bdcc87f61bd46bbf9704d SHA512 632cdada9975311ab079022da79334f69ae703183bef395c3b04fc86192c23032b9925259ade7c115883659b10a403661f2d9a39f3b5262b964d0b9f2947567f
 DIST google-auth-1.27.0.tar.gz 157225 BLAKE2B d3bf40dac2f72d5bafa318c4ec07588a250d4d778b2313c22ef5f43742939b023c864f465f543bf9e8ef6fd0251ba4642f78151df2534e82f2f2a60f5894e63c SHA512 adadea669ddd18a345011602e9fd575fa7783aee0f786d6a42e97278e14a0acf721451d7171765c8aea4bfa5eaa63762f9f826a2d1d5f2c4ea6abbb7d7186ebb
+DIST google-auth-1.27.1.tar.gz 157876 BLAKE2B 0a06451e8a800231972b5b167d45410791b38a1616043912befb5554eff217bd1af70bf34aaf455fe68f9f515ea143cb2446800231006c369005de6981f7f466 SHA512 d640bb5395f956fd3442ea31145af2d72855108bff6b11dfeecfd4b48ad4fa50efba838e423bace310e78bbae74860d6c031d4ee873a7ab6dd522eb49e3fbdab
 EBUILD google-auth-1.24.0.ebuild 1632 BLAKE2B 3a64c4915bfe8626f7c240b27704a77f7cafa3697f85922f6fc74f612390908d34814dad94ffb649e7298b8e93b833e4f71dc8153bd725643d09c6f7ba4b1171 SHA512 c32bd705495a1be9e276e9de185cfc4f498cc186f71f89d5396f10dc7a4b16b8cf139209cd00a4d74f43ba027bf251e58f3ec79744cf8b64290e305889b78cee
 EBUILD google-auth-1.25.0.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
 EBUILD google-auth-1.26.1.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
 EBUILD google-auth-1.27.0.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
-MISC metadata.xml 419 BLAKE2B d8a88d0022eb8d396a504bfc90741d9274cb0e0c7f816444ca70533c6c4c0aef8d74e59a65141515a8db8b6768f43618ebba5e997494670f4e05131c34f7e609 SHA512 222e76f72e487b126c2407764023f7b4861e286015ad1e8204bac13e5c7b036db3a7c71908068061c5536535f354a82e547685c29c614af891100b80a7bcca3e
+EBUILD google-auth-1.27.1.ebuild 1409 BLAKE2B 3122b6bd350caeb99eae9b04c6fafeb47cf557b478415cc44fa9a6f586926bb19abb14f10705614e01fa4ab1e6b473cd7d3090e4bdd393a8e99406721f67075e SHA512 8ad46680c5b3d3b072a7c6386539fe72de6598388a4a8c891bc38b9ad69a556355b85d444e4c99decd0454dabe13e4e332ca6e3afe82ed54d32560f9410c47a8
+MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.27.1.ebuild b/dev-python/google-auth/google-auth-1.27.1.ebuild
new file mode 100644
index 000000000000..400d08da8e38
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.27.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-auth/metadata.xml b/dev-python/google-auth/metadata.xml
index a81e78d4b7cb..de47fac8c7a0 100644
--- a/dev-python/google-auth/metadata.xml
+++ b/dev-python/google-auth/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">google-auth</remote-id>
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index bfcef055c522..30aebb11c86d 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,5 +1,3 @@
-DIST greenlet-0.4.17.tar.gz 61381 BLAKE2B fd5b8ed72acd390f3d5fe3ca1d5894bc47278b1f0e04e4fe5c6015c60dfb3109e766dc6072bf85b96760f673a1af08cd546171906800a1221a216899077a908e SHA512 41afd80a6cd5e9cf9c8149016f24d0944d2651288d50094ef04bb6759202903c436af639872d7aab631ed8fe13aad7d4405beb428415b198a3ba30a96d4bd3de
 DIST greenlet-1.0.0.tar.gz 84525 BLAKE2B b5b7094a3dd7b6426fb93fb147077e98e7313700be7a94c221cda3df3bb12f5322f0cea786b77b7b6500e5e97f71ba19b2c32535ccdbdf8a14c3db049cc2850a SHA512 7b615792c340e0eb8ca61bd09bde48ed15110d97254910bd8598312e15adb7267ba795e9e6b52f0998db27d8413d2e1aa9e977511c0d09cd3a5583b37475f882
-EBUILD greenlet-0.4.17.ebuild 929 BLAKE2B 6eceabb77c0f99fca2f091e6eb5d7d998722924b7148bcf770133aa752b463dbfbfe6d300d8b3288feb0c5d7b1df92609fb4d930122eef717594048fe132ce5f SHA512 48086f6f5e56a2a6f21419bbcdf03b30919ddd02c41c2bc7c850a015c7e5db2c2197d285fd2074f967e50a224d235cd8caaf731d64b9aceb7b4d4ff66baf6dbf
-EBUILD greenlet-1.0.0.ebuild 670 BLAKE2B f7cae622718d30235e6ff130ea2f2231f485d80a0b764b09496d4ba007362deb80c8c1a1a3e5a71af2ae6342e37803132ec1cc28fd762cc44bcccebafde9eb89 SHA512 e8fdcd158a40818e9075ccf076807f6edfee3a145a77f02aaa2b7c1f08d83d94f5d65c479147a9eb65c34f7b860c00915fb8bd27eec1b5ddd9072716dd317470
+EBUILD greenlet-1.0.0.ebuild 668 BLAKE2B d9e22ed4de6a77b839b4b2d0581ad772e554c8bfab634854bdab46818f8badbd5290a323a490646a210ef343946f11ff658e8bfe4be4f426bb827dd992b55fab SHA512 a0396c27ee805fa4ba8bd69cc85268273b3e9e1b1bb8589b0247c52e9358a9eb0db4758657104bc2c1d517f7378f8f4b84c98f5d97ea9441d57203802a329ec9
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.17.ebuild b/dev-python/greenlet/greenlet-0.4.17.ebuild
deleted file mode 100644
index 6a3c5bcad6dc..000000000000
--- a/dev-python/greenlet/greenlet-0.4.17.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# setuptools is used only if one of the fancy commands are used
-DISTUTILS_USE_SETUPTOOLS=no
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.org/project/greenlet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_sphinx doc --no-autodoc
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		append-flags -fno-strict-aliasing
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/greenlet/greenlet-1.0.0.ebuild b/dev-python/greenlet/greenlet-1.0.0.ebuild
index f5301cdd8c4e..a4167c6d08d4 100644
--- a/dev-python/greenlet/greenlet-1.0.0.ebuild
+++ b/dev-python/greenlet/greenlet-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx doc --no-autodoc
 
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index d98311ec72bb..e7965b6144f8 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,3 +1,3 @@
 DIST gst-python-1.16.3.tar.xz 419932 BLAKE2B 3c3d7d8dbde7d77d57e340c68503c436ab03f8768be4dd67561b13712bf88d7f8025118cf6a2ff115fbd41b28dc9a3208f612d1b72bf449fd7b23be4437f837f SHA512 2b038c4fc4891ddcf09e58c9e3e8d8462c150589dbb8a1f8d0a1266cffe49fd83531b2eb97cd57baab0f416a2bb1ba81383b55bb953545f3eedc50b6895986c4
-EBUILD gst-python-1.16.3.ebuild 1557 BLAKE2B f450322c1a7c716e7925f4ee4bb43d18735d67a51c7241f1a405334cf99a546c83ce629ea7be0870252200e5ebb724ba959727be64a43127a929c758153e24b1 SHA512 8650098d45ff16f614430a0588db3a0cb6d3f941723e0aca9709b34f1128386113bfc19bb6dd08407afb223b359b69148ce91fe18a86e61f9b024f5bf349f128
+EBUILD gst-python-1.16.3.ebuild 1556 BLAKE2B 5a5f9dc90cdbc2262f226b00ee166afd8b8df17c64714694ddc73c87c96a06e537dac794a627d94a1f8874ec5adab74be1dc790e494a48b97f41c9e3134f5240 SHA512 d9663bb501c02dc98be963bb6ba6f4dc514154460084de9cb9d079da1af11daebe2b54f575461707024ed2627d6ea44f5897fb981c2463c3c8e07356fcfbd371
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/dev-python/gst-python/gst-python-1.16.3.ebuild b/dev-python/gst-python/gst-python-1.16.3.ebuild
index eeca9ad3564c..1a50e1c044d2 100644
--- a/dev-python/gst-python/gst-python-1.16.3.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/guzzle_sphinx_theme/Manifest b/dev-python/guzzle_sphinx_theme/Manifest
index acba8f21abe7..8e129a5acd26 100644
--- a/dev-python/guzzle_sphinx_theme/Manifest
+++ b/dev-python/guzzle_sphinx_theme/Manifest
@@ -1,3 +1,3 @@
 DIST guzzle_sphinx_theme-0.7.11.tar.gz 2548612 BLAKE2B 797e44806ddf3e5f8dbd131db61e3fda33c5936b69a8672b73ed518557a62fbf35f968237ba508cbf1e447aa558a6cdf06e65d86ea52bb587b7c87a446047f20 SHA512 9aecdd4cf8ae286c9dd59a453790d957e96a57a9c9acd3aa38ff8fe64969cde4619c4154cd7304dd1c5bd0ea58fe71f556701b7a9b12f58fe3f5c1bdd2681da5
-EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 511 BLAKE2B d9e4c1e4e65f5dd38878a827720ff6ac6ec65bf3f575e7a91e4b0d0f8ec83c14a7613f5466271794616017145d1c853acf7e24f0f2075b07974edc07ec1feb85 SHA512 5547e34045a12855e53fe2a1d6ea6137049a1232c35e79ac45f1c1ff8a2c0cc378edd50b592ae9f562f0056ee8397ae097dc0156b4c765ba3d52301d9bfb7020
+EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 455 BLAKE2B 861baff778db773cb1c8019b181fe93815bc8c40e6d0d30a933b8e6e97ebaedfe600016749330cc7a202363da43e1384fea037d00e9f73bba6e625a61274ae0b SHA512 27c391c9bdcbc757b9eac62768ea1175185f90305963fda63400c7431bcbcbf7667778739018cee97674bcb3f7ae54f1ccc3a226566f4d867858311d0ec3eb44
 MISC metadata.xml 339 BLAKE2B b05bc0183201fb2155f2ac06a76f77a1bb0cad3bcfaf0a6419f5de867d710b9ed7a336acb825ff25e685806128f733bdcd0d70825cbf995ca6d17eb57ed1c8c1 SHA512 2a0348e805f633535dc358cac761f51867b0e6dc13724e11d3671523ee13cfe67eceffd811989eb9cf71c697fc3b3f254844746468c5f4e0fff7f5e77346ee52
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
index 7ee1195b6699..72124af3b392 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -13,7 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/sphinx-1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index fc82ea2a8817..5c5210a9845f 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1,3 +1,5 @@
 DIST httmock-1.2.5.tar.gz 5409 BLAKE2B 06ea90b6553b2d97b72944a05587e07c4c6ffa9282a81dd976c8f875ae92fbeded10dde0c060b2c9883bf2827d7233cde337f3d995e30d9057119632a49ee9cd SHA512 1dc3bd506f76f2e57db5268201faeb7038b9a62873f0113590023c7b889903428fc3c796db4accf74f53cae60a258160c3698dd9cef71024183f0c6f05040b80
-EBUILD httmock-1.2.5.ebuild 480 BLAKE2B da28424570152d9ffa1072e0c106b7bd85fb6e294d01e08a771773c3fcfef5137ee6da33f695aa9d22762e39caf6be0b7498113ee41934e48a84b704a9d499a5 SHA512 a73ecd1554587b8c89d5a89f898a75fd7a12abc9780b5cb6ceb45bb8456726530d198c56519b0eda52ad71e3e00213569bd42437ec9e52756178aea183c08f70
-MISC metadata.xml 291 BLAKE2B ccb260617f462ccfb62cc767113bd13d11e76a675e39622be354e4a5fb599a9ba9ebe384c552bbbb2972004e30b38ea864dd272b58ca480cf7de71fdd00b8fd0 SHA512 350ddcb2a5d6c22e80a21ace7216ee6ba1ae0f2a167dd015f6b4461c022e9ac1573a8d4b2fbdd187f1046457617b9a234e49866d70c548797186f5850e01d0cb
+DIST httmock-1.4.0.tar.gz 6439 BLAKE2B 68136f0dd3f1adb7f431893ade8037ce98de3870c5da094ec8a4dfde3eba07667989b71b957673e969548d7d5115455d02af2bcbb1eeb59dc0891e2ffac2c1ff SHA512 49dec760da7dc57a3fb0392c121ddbf9a430fa64c2a6f923ca62da2e697805a61941cde5cf35fc8af30de199227edd72d7f1985745ebd427b1f5d74807e3862c
+EBUILD httmock-1.2.5.ebuild 482 BLAKE2B 70c044c1b7a0cc01450d339c1c5fad718425bc5ff77eff3f8ec7a4f1f177d8cf7c0bffba1ee7cd1a1aca27c53e35ee4c6b05dd6dba49abc38653dc8c9d67751f SHA512 de6bc60814215ca9794b428154eee0c548af7d08f228aa5b0777474d3a6602c5da2a37b2a45bbe7affcc5b21709bb13b8a3be042c319d8d7a29f9e86a30fd572
+EBUILD httmock-1.4.0.ebuild 482 BLAKE2B 70c044c1b7a0cc01450d339c1c5fad718425bc5ff77eff3f8ec7a4f1f177d8cf7c0bffba1ee7cd1a1aca27c53e35ee4c6b05dd6dba49abc38653dc8c9d67751f SHA512 de6bc60814215ca9794b428154eee0c548af7d08f228aa5b0777474d3a6602c5da2a37b2a45bbe7affcc5b21709bb13b8a3be042c319d8d7a29f9e86a30fd572
+MISC metadata.xml 315 BLAKE2B 72d19fbdfd4936491e318de748e0ed3951a2c4e31c3c7834039737da8e61a0cceb1fcaa682a22fefc996216931b877d1d54759cb23563c257273b3582052db43 SHA512 58c99bff32f43f1a2e1a42b0fa05bc6ee37d76e55c3061d09272ef8172f1a1efbf4f9fcf11234c49b2aebfc1a55256aa4e246ca676ecfbe49f167ce820048e15
diff --git a/dev-python/httmock/httmock-1.2.5.ebuild b/dev-python/httmock/httmock-1.2.5.ebuild
index 02abb6a1ee86..58f0ae3fc225 100644
--- a/dev-python/httmock/httmock-1.2.5.ebuild
+++ b/dev-python/httmock/httmock-1.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/httmock/httmock-1.4.0.ebuild b/dev-python/httmock/httmock-1.4.0.ebuild
new file mode 100644
index 000000000000..58f0ae3fc225
--- /dev/null
+++ b/dev-python/httmock/httmock-1.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A mocking library for requests"
+HOMEPAGE="https://github.com/patrys/httmock"
+SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/httmock/metadata.xml b/dev-python/httmock/metadata.xml
index c9f398947158..602e3b483930 100644
--- a/dev-python/httmock/metadata.xml
+++ b/dev-python/httmock/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">patrys/httmock</remote-id>
 		<remote-id type="pypi">httmock</remote-id>
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index ba02443a5a55..36910bba247c 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,3 +1,3 @@
 DIST huawei-lte-api-1.4.17.tar.gz 29441 BLAKE2B 75615092a1d8ee598a99e9ae7a0567e11a72fad21a8304005364bd21e4ecb9bf9efa9a2d5c8de86c6d7442ec12f06079819c20ca9e2e4646255ede961b1a1275 SHA512 bf4a6a43d02b56f0aa799e2936d7fd0afa88da4dc18c152c635b0ccb87a7ca9afcf1fcdee3a37d7ab232d5cd4688e24499ad35a1969d97db405b818cf17d33c4
-EBUILD huawei-lte-api-1.4.17.ebuild 721 BLAKE2B 71bf85aa97eb3af1953fdb211219004b09a397c3f043fc5633c4057d51cf14b3e4498221a13d6ecc2fe89b8c5086d51e082f998adc4f79ebcecc144a4f189f8d SHA512 b32e54eaa152875742ba85195fbd8c7686adc8103d8da0f94bbc967a0057620f7f4dfc24ba7e1a816f059123432323cdd24fe3efe7cd54d1e942fa0bc9548c62
+EBUILD huawei-lte-api-1.4.17.ebuild 727 BLAKE2B 56f9663430fabc5e1b3e4c93c978b4fc976f716e982680472e35bf85dfa7614deb5b7fe88d262b56dbd5b992ad8505847c4658ccc94e529c5f74c07a56301bbb SHA512 6755cc1e5accf3eb383ed4e1a47a26949a238dfb0c1f22382677fd0e7e59d68de6feee4ce0d9a3ae67e22b48b1a3c4ad9913780d874d5dc0d930eca1b98c2748
 MISC metadata.xml 385 BLAKE2B 962737026dd3a7daaced4e561f39defb5abfb76570a6cde7e083699f79d95000f6818bf65466ccfde2407b00db401c27d507b954ee8f546c4f5ec92335ed1088 SHA512 d70d91e85572133e2093376e55daf6a501270339cac68f19b26d563f20650f890177c02fa3b264fe3b6c62e51471a5dc484827d0ae2cdf8a657b95dbbb47691d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.4.17.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.4.17.ebuild
index 0fe85aaad74c..126077b22948 100644
--- a/dev-python/huawei-lte-api/huawei-lte-api-1.4.17.ebuild
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.4.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7ad2754df889..4fc1b2e1f6ea 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,12 @@ DIST hypothesis-python-6.1.1.tar.gz 9107792 BLAKE2B 50d3b284f0ab1b7c1a25fbf1488b
 DIST hypothesis-python-6.2.0.tar.gz 9108590 BLAKE2B 73a6b71c68aec1ec51f791187bbe5be679d5e3b4da9e66745767dafb109d298b0c61bd461ed838a0c75884d155fb408bddebc75d1cf887629da5cf5d6b053e03 SHA512 b249124f90d1d68aa6e106965b0ae78e37f095be0adc1833895f0895357d46c907074e2abe458be566708ba006b6c4375908b40ef89d52300fd41ad63abc2e52
 DIST hypothesis-python-6.3.4.tar.gz 9112374 BLAKE2B 78867f0ff142d6059a20c437c3fab333de06eff5247d93c1e70f75d801e54984c20da01322b7d4d4999cb30f2c59c6e7cf955fe60ecc0e90b452b8ddf6b6f2ff SHA512 7baee8758d86afbb0a8a16e18b2f14d3870ee2f5623857fc691ca1afc7f0c6555b367fbe758ff02c08af492b4569ef2aeb8d61bf3bd91ac458312a43b02d02f6
 DIST hypothesis-python-6.4.0.tar.gz 9112974 BLAKE2B bb2312e1ae838e9a58741709f5d55d9593991c2600330f4917c8e8f86eb8219a0826e87aa810ccfa731e5a14f1d0985cb3342c73ba5b8ad5d8e01419689e180f SHA512 2899557ff872b45347f8865ff9bf07da97e2bfc3f4827ead2d4b0648c664bd9ef7ae3d48e5f5158b4dbb2d5063831ae8a1a7ef0ac97f2ae21318c6198850865d
+DIST hypothesis-python-6.4.2.tar.gz 9113516 BLAKE2B 115f16b4e9a4fdc4b39942cb593dc397066c556862cb79baf3c9d9c0c9d1fa46e1e855b91c73d8f93135e9582f6293d896245fbfa31bca667cb522f1d4955adf SHA512 bcaf876c197f196f27936fd6b5294cfed5d0db2f528ee95b9ebf6ae429a41dccddfd6fd66eebf8e5ad7ac512d8ec20f1878a6ded9d4c10013b732262c9454799
+DIST hypothesis-python-6.4.3.tar.gz 9113616 BLAKE2B f3761a22b574edc0b001a25c836c3a845fb3a1396dbc4afc2caa1f31870793cfca8646e6b9b45386e835fce97b9bc68226018c50675931e48968e9502ad41844 SHA512 010d140538bd6a361326d00bf38a50ffbbe08adc55cc7597cf69563b5d028335493c1925bcb91f618afd87f4d754e8109776be89f229e8b25b91510fbf64d7bd
 EBUILD hypothesis-6.1.1.ebuild 1849 BLAKE2B 9515ada34767c85fad60ece3c12a46243e74e242c579c19b091683f74c69a729c0d3cc564aadbb1f67ac44f8a91e829b036b5960fb3f0c5b6e2eded695e90b52 SHA512 c5eac04dba95a69fd204c9787a02b2ff69dd8f5d20bf622a5f6a774bdf59f3f990894b960fb47428bb751a42ee4651d6c149e4fd6e0b18f61b3d5983625f6a42
 EBUILD hypothesis-6.2.0.ebuild 1857 BLAKE2B 64212b703d2f6226cf86734220a48c883b2b6c18f6e6a14d492079c7dd2374fce60a66d263023abc92117a5293e4c395773ab5f48697f7f2f9b32dd8de7959e8 SHA512 7e43f71209914d65f71250831a0583d92afe56ae1e20d3195d99a261e7d3871aa4295000efebcf0413612de80132beaa7cd2b696b47622a2fdfdafc7bb83c03a
 EBUILD hypothesis-6.3.4.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
 EBUILD hypothesis-6.4.0.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
+EBUILD hypothesis-6.4.2.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
+EBUILD hypothesis-6.4.3.ebuild 1810 BLAKE2B f24b2ef4037fee550337dbb719f727725a0b50ce8187e37708f91afcf80d048f2e3053332aa0d4ac0316259f916cc4345bc28305dc080c64546a9d3e45d29233 SHA512 cb2c9c312783f9e00e24175f4b65d5a8a396c59a9827bd4de63c67ca2556a082cf46f0c9b0700b56617c0e9298b451f2b9375309f2df0b38d39d7dd4a1df441b
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.4.2.ebuild b/dev-python/hypothesis/hypothesis-6.4.2.ebuild
new file mode 100644
index 000000000000..46ee7df74d3c
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.4.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils 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}]
+		' 'python*')
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+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/hypothesis/hypothesis-6.4.3.ebuild b/dev-python/hypothesis/hypothesis-6.4.3.ebuild
new file mode 100644
index 000000000000..46ee7df74d3c
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.4.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils 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}]
+		' 'python*')
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+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/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 5ab91f91be14..7b7d4a499ac1 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,7 @@
 DIST importlib_resources-5.1.0.tar.gz 31435 BLAKE2B f3e39117027a07de6c781e8b9bc3809a8fda4d1d5305bd514f4818a89a15e567c7c3c9533b263d8a2874e8fe0a580a55739e784a7ea2c7190a3eba7a422fab2a SHA512 f8ea8719a038a0b14845678c3ad836a6285b69bd3af45a45bb1e8d3ba401c72b8da00907a03297cde466551b169ba3f02133231e6f8d935d39110681ada35c8e
 DIST importlib_resources-5.1.1.tar.gz 32125 BLAKE2B 3205ca16163ab3e186c4d2bb255c3cc39fde632ed28bbeb3c8a30e771445de9f02020e1a78f9705332ba279ed3bd9b4e1cff787ceb14cbaa7bc1f72eaa9298ba SHA512 2ee6f8a5f9c501647cd0b79f91041cefaa0b2822dd093efd8cc2917ef45e1917b7a9b493a62b28393de65fdb008f726912fefe61cf1a1aabaed312193b801033
+DIST importlib_resources-5.1.2.tar.gz 32177 BLAKE2B 5374cad672f7324cc31ff4709f0fda27dc48435c2469282fe84bb9a453917ce15b1c3529f502a8b42993638768e7ee781a4601665c60ad6da2811748b4866006 SHA512 894bcf55aa4789a8d47d832cc9a20ac0763270e78f03548b7e714d18f64f4b4ebdabdadb4dd1b2bc9513df13a3f328ef5d62e6015878738ea59e6f139e4c195f
 EBUILD importlib_resources-5.1.0.ebuild 825 BLAKE2B 9489f827e07979b15cbb83609d7372cb07e35b1653dcd227bf3883807a8f4572ad85396b6e7d179ac70ce92b939adca7f13954ff0c8bd8ffe410509f93f03723 SHA512 6762e1d8b5a1e86dbc5b139f5afc7a59460c3daac7a4ada849c2fb6df66c62ce12c5ca77dcd62573876ba49f2020dab3a609e6f833c8e52a47c50117990b0a02
 EBUILD importlib_resources-5.1.1.ebuild 830 BLAKE2B 202b6e72a123540ea2ac6241831ac814a648989e411d75e40a63f44cb1d31114ea877bab62b188f64881983a8273b5ce94fb7a647213c41a8b02be1526b7e556 SHA512 8c78ba7c7b2470e0d18b4c720fb756fc7967e26369f94ea509da875a848b2651c4e1c75b29b90917b97b58af964f866668b813c6a51c1e7881665bd414d98ff3
+EBUILD importlib_resources-5.1.2.ebuild 830 BLAKE2B 202b6e72a123540ea2ac6241831ac814a648989e411d75e40a63f44cb1d31114ea877bab62b188f64881983a8273b5ce94fb7a647213c41a8b02be1526b7e556 SHA512 8c78ba7c7b2470e0d18b4c720fb756fc7967e26369f94ea509da875a848b2651c4e1c75b29b90917b97b58af964f866668b813c6a51c1e7881665bd414d98ff3
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild
new file mode 100644
index 000000000000..832a9c131a5d
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+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"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_7)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index 6553c58fb1bd..0ceef9b79398 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,5 +1,5 @@
 DIST ipdb-0.10.3.tar.gz 9356 BLAKE2B 50afece454d55ce3df13251afb625d93e11f7ae8d0e563ca7007e7abe0ad46b59f2e93318578992c5c7d2d25fc815d53ebed8801530d74c4fb30cc150246f415 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3
 DIST ipdb-0.13.5.tar.gz 16145 BLAKE2B e0bae825c2ce6b640e73e8ad8615f5f4e9c18a00e8c081a66ef0adab3429792a07c8434ddc8b236f938b7efd263c51f29bfe3f8d232d8bca20ab0cc2eff8165f SHA512 3ec05dec884a0006435fd7e5eb68bc76c6dacb1b0dd3f68c10c8c2a9dd3991bd6e498dcfb3877e5e534240ead1194787049ae3815fb8579b7bdea2e8c91970c3
 EBUILD ipdb-0.10.3-r1.ebuild 536 BLAKE2B 07e119a2fefe2dd1387c75988a0b4aa9fe73e47d288fa8e1e51fa75b54ab60f06adac72a6bcc2b8e68aa5ecceecccebd392d0c08a32d6514b3370106c54b89ec SHA512 17fce962ef688d754ac4c3f0fd251d5c66bba339b25c7b902e51b67f64280b0e12b47853081305a6c6085165453369014aee6895a94f2ef62b1874dc568437cc
-EBUILD ipdb-0.13.5.ebuild 544 BLAKE2B ac0f63b0cfd9c8ded56e182ea14e89c6cb638b2792c7a85b9d079184623918513ec8b4e87e8294ebdb2b5e1097868b7552585daa7e326ec3f7ac8a7afab22c93 SHA512 f67f553a7da1b85205e56c55103450fbcbdf092093e463d8ce76320af7fbb53ae5efa96f9f1a1fe5ded4bf48cfcf20e311be977f99d1bf5a727851a1d394dfe2
+EBUILD ipdb-0.13.5.ebuild 544 BLAKE2B d686553950302b57bf0276b9467ba1b3f25e032889aae910d2b19060de39a2ea17bf18adaba9e9849e6ec3fca884bfc54c8baa713f39d1e5ab92c37d997f1eef SHA512 222e7ab0556ca424ae24e3d54d11a6a56c5bb84036ed8390e15446a5f7637a526280dd02b04ca900727e9273bcfeec516acac449143b4f3fac032bf3e80cad3e
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.13.5.ebuild b/dev-python/ipdb/ipdb-0.13.5.ebuild
index ed817ad15142..4b895e23400f 100644
--- a/dev-python/ipdb/ipdb-0.13.5.ebuild
+++ b/dev-python/ipdb/ipdb-0.13.5.ebuild
@@ -22,4 +22,4 @@ DEPEND="${RDEPEND}
 
 DOCS=( HISTORY.txt )
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
new file mode 100644
index 000000000000..7f37b3116900
--- /dev/null
+++ b/dev-python/jaraco-path/Manifest
@@ -0,0 +1,3 @@
+DIST jaraco.path-3.3.1.tar.gz 13287 BLAKE2B 8a803269fc02cc85391b4b1e1f2ee2a94c039d433b505aeb4aa0fcbb23731b802f236cd2de80dbb8b9e59297312892a085632f41234d3e1bb7d4bd04f62e00ba SHA512 00dac02fdc6df469f8661d552b16a8ee6150d86a7df9459264377a03e96fd94608f9782ad4cc2b2df67c64a10f8af26ed650b0bac0b1e59607d429abdbe64309
+EBUILD jaraco-path-3.3.1.ebuild 934 BLAKE2B 220ed025f5c99810585e974afb588b91132cf27a0061899feede44dc8a9ebbb16fcc0211bc410ffab0c9c3d8fd50dc296762ba5a8f0b0765c1f0364c439e05c0 SHA512 77f01e7161d28ac47cc9ded14671bb401b7be47f6ad19c616a93ea45fe4bf2471edcca67798c0563ce45e842ac75d1f21493601085403ffede4f4a191469c7d1
+MISC metadata.xml 396 BLAKE2B 3ecf8b1f6392c3d14122458f7b5fc3c08e5693570685a6ad0f29da64e9f38e4e93c83b180fe01803471342343b0420769af6a01086cd71cc3031b2efaaf3b54c SHA512 eb3cdebd2a8d524c88b519d8e4bb6020e63da5cf69cb4f81eb7a7867bc6d880c313afcd8aa7dd6bd82b661e1aabc60c6ea0c4319ad2b2589e1825d8e3ea65de3
diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
new file mode 100644
index 000000000000..d718b3dcdb27
--- /dev/null
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="Miscellaneous path functions"
+HOMEPAGE="https://github.com/jaraco/jaraco.path/"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-8.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+src_prepare() {
+	# use the py3.7+ built-in
+	sed -i -e '/singledispatch/d' setup.cfg || die
+	sed -i -e 's:from singledispatch:from functools:' jaraco/path.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-path/metadata.xml b/dev-python/jaraco-path/metadata.xml
new file mode 100644
index 000000000000..1a2842629b40
--- /dev/null
+++ b/dev-python/jaraco-path/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">jaraco.path</remote-id>
+		<remote-id type="github">jaraco/jaraco.path</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index d362d31ef68f..848f78ab783c 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,5 @@
 DIST josepy-1.6.0.tar.gz 54066 BLAKE2B 18afbcf47d97e9677a3b75be50a4e61dd7748326eca1a7b736c0c9edc3918b2082c1cac8b32481bb631bef106b0e9895b24be054600f22f38bb45401333a28f4 SHA512 d08eb731b1027cd0b57639ac0c3d987d99d78daa54a9fe22d86eca90c9c5ab73bd8193d3fee4f98a4c55392015d1c5ee32fbc6589f511a6951033377cc2e1168
 DIST josepy-1.7.0.tar.gz 57186 BLAKE2B 8bf89ab844b65057838c1b274d15d8cac7ade2af9da04fc5193e9ba99e2062913cf5f819766d16c66951622299a06bf87a6cec41079e350f460661eedff4e924 SHA512 cd3c509acfea58eb92d7e0a8d28d6138569cb42ac85b75b284a48517afa634f6c739f3d62198ee0a17bb60a159af4012cc9ffa77378db680c418d52660d39ab4
 EBUILD josepy-1.6.0.ebuild 800 BLAKE2B b6fc9b6658d2145f247827f66dd4add6093e6efbf8e567028e1e5f12a42f3515d93dbbf54fc550db288ff6578f515d87a61c34c12883bb51adfeb1673c1fc8b5 SHA512 68f2b6dbcdc22012abffdee6a895ef2b04c29ea823100a676d0eba6244dd93ff8f197b3578d2b4afa9856c5f8350402e54b3e5b37cefaa2aeeeb857b449162d4
-EBUILD josepy-1.7.0.ebuild 802 BLAKE2B 2676e1341879fba00f1227dcd4373264a4b36f6a2ae5bc483e28c7922f4466a11420ddd7a291be803dcf105036fab93080bbd70d3bbff49aebe905852a3df163 SHA512 ed0011bd80cb5985bd9516f7c9a15a67757d77ad4db6e2a742dde580bd0db48b33d1c19867dc593e550f1e9cd46e35e79a6950b8b9a38d8649815a925552d12f
+EBUILD josepy-1.7.0.ebuild 800 BLAKE2B b6fc9b6658d2145f247827f66dd4add6093e6efbf8e567028e1e5f12a42f3515d93dbbf54fc550db288ff6578f515d87a61c34c12883bb51adfeb1673c1fc8b5 SHA512 68f2b6dbcdc22012abffdee6a895ef2b04c29ea823100a676d0eba6244dd93ff8f197b3578d2b4afa9856c5f8350402e54b3e5b37cefaa2aeeeb857b449162d4
 MISC metadata.xml 719 BLAKE2B 658dee515235de05c2e9bb0f806feac685ca20ac9950982503eee109cc110ab84c2959542c2425803e38d5925eb95bb04c53daf21f6d8aac478a7f76fdef92fb SHA512 8fd99401c198b6a0a5d440d90daf80e085e16bd7d0872b1794338bdbe23ee31893346486e57d6c6ebbc892c7d9ff4351d9254d54726bec5cecf5510468a6df99
diff --git a/dev-python/josepy/josepy-1.7.0.ebuild b/dev-python/josepy/josepy-1.7.0.ebuild
index 08704af967d5..92a593dfa31d 100644
--- a/dev-python/josepy/josepy-1.7.0.ebuild
+++ b/dev-python/josepy/josepy-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index 68a8aae1127f..57fd31c5acaf 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,3 +1,3 @@
 DIST jsmin-2.2.2.tar.gz 12705 BLAKE2B ff14d28c753443c4a17e19b7205b739d5a177eeb8074e4b16c7ae7e5f816758e1f54e07ceddf90dde70cc2752f9dadee0dc71754b2de3343256f3b1695187bba SHA512 e4fea940d7b5e1c0d7dacad70d90a242a8ba178423c886eb60ed7a36b1fba9ca67b5118f26e9a96058b86d3f612d40a21e62cdccd5858a2012a8f222fad3277d
-EBUILD jsmin-2.2.2.ebuild 471 BLAKE2B 043bbd001ffc92422bcf3e725c2f69ecf6f66e18ed2d2e60c3ecbd0f38e53eca6cef207fdb8ebe72ab004596c05b038b1e1b3c8de4c18a006004db3559df41d2 SHA512 bffc28bc83145e30fd4428e6dcaea3bb776b01ba7f11cb40e02b5d92e4d4b4080feec35d138e9952157f8fc207157f7ae294e107809bb959d2086c45bea0e2f2
+EBUILD jsmin-2.2.2.ebuild 465 BLAKE2B 13b12e8ac763b1ab21d2acc52975ebc167f8826c02a550bdbbbb2d51caceb3efe7adfe084d9e8b9dec73ec7a34d88d882c36399a8c79a752424d343bce7d7aa8 SHA512 614f9d24ee4f6b32fcbfb828e13689f64e801d3332fc742ecaa4c0588402c54882575351583751005eaaa0aebb6771ec915ee4ef795c13728c47f511dcbeb601
 MISC metadata.xml 372 BLAKE2B 1e01737db79c54d3851dd73e3a76c5509e56fdfab6d9e8371f269fd4038935936546df8bd452a430792e7e5ff3fdb4ba163bd0f3a553bfd685cfd2ad991641b9 SHA512 866aa28c2ceee47ddb6960d40782eb1a4fe184a3068bde3f938316aab1070a57b54f5a8df9dec06db4ef4385f49ed9760b689b840b1cc765fe0c4ce9627b7b58
diff --git a/dev-python/jsmin/jsmin-2.2.2.ebuild b/dev-python/jsmin/jsmin-2.2.2.ebuild
index bd37dbf71adf..716997406fe3 100644
--- a/dev-python/jsmin/jsmin-2.2.2.ebuild
+++ b/dev-python/jsmin/jsmin-2.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -12,7 +12,6 @@ HOMEPAGE="https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="amd64 x86"
-IUSE=""
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index b03284282ba7..508af710122e 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,5 +1,7 @@
 DIST jsonpatch-1.28.tar.gz 26829 BLAKE2B 1dee89500be23c49e5d7fdcaacb05da7ea089b691e133c5187c9558d378ae3714ad7fc6f164d0b7eea7b3cf1afefa39b7748a4637b0456051fab086e0e8f15d0 SHA512 2884cb95307cb607c8cd80e688491b4449f953e43e5b232d4d57d7249c590652ecae0856806ade6bf2807a04180e992fd2cdf61590ac058d573d653382bf7a28
 DIST jsonpatch-1.30.tar.gz 27787 BLAKE2B f3294e3382baac604c31c12a790b0836732a66fdf3b6cbfbab58fcee4558140dc84a408af94f2f5861aaa17fcff49ac254f42364e5d0ba1039af0a2fd518da93 SHA512 190507eb6d6b4a81e7e804690672863d5070c140a47090b70df36d8180644618395ffc179dabf6ba24e44268b74f670abdfd260c54dc3251b12ef4b7ad17d093
+DIST jsonpatch-1.31.tar.gz 27910 BLAKE2B dbcadbe3b3937b8a543cbf871516ee047937c1a53897c535c93ee01ab301970048f4f584d1f4e96b5780c95c64a94263ee55f52efd5ba0d0c0147680ee8f9ef7 SHA512 9f08014f311d18b97f0f0cfcc931f2615e0ba5079ff5994e9ba674e079be715c3c8de3ce1c1958235b34dcbe87dee09b103295655880273ce91652d2191704c0
 EBUILD jsonpatch-1.28.ebuild 841 BLAKE2B eda03acc39dba59f02ad14ba31a9817a94791a1b986cbbaf918d88a7bfe466e2585138a0f21cdef26631fcfc2637d463e4d1bb030c7c2d9812fd55e6d4efb24b SHA512 300e06017daab02ba62ef66b386ff2d3a6ccb0f7a9566c8d094e82b6d2a752ff8a015a59f9d8a5be84bd03bc0d8677bf8123e79be9a6e7d2210810c931629cf1
 EBUILD jsonpatch-1.30.ebuild 845 BLAKE2B 8db3277e58f34cfd2f0129682f94ee3ecb6162063f93826316b5509d2fe13399821dd83238a24cfdc6b7bc4c35265197d01c676b60303a0e31ac42fa6d2d696f SHA512 cf9d4f52259a7af8f09a837102a0291329c4ef6d7872593f8993a174f0161db1a8af8a18a3d2f88cd446e81ad1250df3758e44bb1b6f99da23cbe57425c2145c
+EBUILD jsonpatch-1.31.ebuild 845 BLAKE2B 8db3277e58f34cfd2f0129682f94ee3ecb6162063f93826316b5509d2fe13399821dd83238a24cfdc6b7bc4c35265197d01c676b60303a0e31ac42fa6d2d696f SHA512 cf9d4f52259a7af8f09a837102a0291329c4ef6d7872593f8993a174f0161db1a8af8a18a3d2f88cd446e81ad1250df3758e44bb1b6f99da23cbe57425c2145c
 MISC metadata.xml 704 BLAKE2B 774410010ca5fff3237e4864e88e19fc80bf705a166d2d278763a047cc37d2b7cef314e3c96185a42a97d32693ccd27403b990ee59acc2c30be6a8cb22ecae48 SHA512 2e2dcc4a81bae9412ffa008ed17010d1a06505a9f6be59a3c45dbc0e6b9f25f627f25f3c7ec64753e39e10e56c62ad0bb2b28c648e677ce14179678793f036e8
diff --git a/dev-python/jsonpatch/jsonpatch-1.31.ebuild b/dev-python/jsonpatch/jsonpatch-1.31.ebuild
new file mode 100644
index 000000000000..9b885b42ed8d
--- /dev/null
+++ b/dev-python/jsonpatch/jsonpatch-1.31.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
+HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
+SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/python-json-patch-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( ${RDEPEND} )
+"
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
+	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
+}
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index df099a409a5e..86f9bec4e8e2 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1,3 +1,3 @@
 DIST jsonref-0.1.tar.gz 12296 BLAKE2B cab2b4778b8a0184989ed6ff520ed6f12a68e9109a92aa0fd5521b69ea14cd5b6301ce61bf98f0d0d4d44fb016f7d6bd99fc804975bddf1c350bc4b46d62f77f SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b
-EBUILD jsonref-0.1.ebuild 584 BLAKE2B 8a6bcb073ca7a3c8119404a512ad32bd8957f84e27b4900fb0cc595b581d4117edc760c8208d2599b89177541b9fd3967e09a1f44a7d26f510bc13701a6724e1 SHA512 bb8e4ce0c74f7994b93b56a1ff1480602c29ac008346862b22b7c8c0633366ca0a9751d6fa824de70fcfae37f8489b5c9989f6dca6eddaaae3943a4288b42300
-MISC metadata.xml 772 BLAKE2B 48b8cc40f83a1ba2d3a4d7e6eed3fed74188b8a9ac8592009084eb692bc2902896692f125d986ef6418c4b1cf68abcbde0648cb3b0ec7a6609d40387105c0ff5 SHA512 59433a3ba6fbf178eb55dd21ff25e503235065d312a930818a85776079d0cda7d0a06264f83452302fa7897ead09c6414e53e7554547b6dc58d026a93dbe8d29
+EBUILD jsonref-0.1.ebuild 522 BLAKE2B 4e00a308161f5f2965fdca2e6a38f3aefaf2c6188decc62c346ffb62f808c5fccca5bcf1225155fffe1af2cadead7f3565bac8357db688dae300af021a78a00d SHA512 60f57d5bb48ddd3d0277318aa5496cb83d62eef70b2c18b65644badd2461fdfc399c08423aa33b6bd35f2286e7281b57ca9078bda29471cd05d92f48dbe07890
+MISC metadata.xml 796 BLAKE2B 562347d3389a298d73972737f5184498dd85b86c343414e874aa9f25701bcdf28c3dc9e6f91afdefcb3fa0ba1a330044a970e2a3c8b9087149bfeaea8203c0e3 SHA512 cdb03942fc8274d9479545d70dd81b78395fee6c65df33cb13091997bba9bd0aced77952351a5d1381a4e8a14cc2888fe57a2d3e92143242a92abe4def4feba6
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
index 9010d34f9a39..9459df117774 100644
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit eutils distutils-r1
 
@@ -15,10 +15,8 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+distutils_enable_tests pytest
 
 python_test() {
 	pytest -vv tests.py || die
diff --git a/dev-python/jsonref/metadata.xml b/dev-python/jsonref/metadata.xml
index 4e64b54715d2..70364ca0e1b1 100644
--- a/dev-python/jsonref/metadata.xml
+++ b/dev-python/jsonref/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<name>Chase Sterling</name>
diff --git a/dev-python/jsonxs/Manifest b/dev-python/jsonxs/Manifest
index 0b28573b5bf3..edc22611314d 100644
--- a/dev-python/jsonxs/Manifest
+++ b/dev-python/jsonxs/Manifest
@@ -1,3 +1,3 @@
 DIST jsonxs-0.6.tar.gz 4071 BLAKE2B b19e6049be686abfcd0ce4dfd70b15c7367addf80ade80d3cdc3b3521885d15d92a3c5f71e80bb34de5a51fe8effdce3f6caa05ea5f7b60fc2ada536d98d34e4 SHA512 6dd5cb58b3f5ed00166bae175ef8daa4a4c18970c44afcc197bcc502433b164d5e3a6dfbd2f21f944a9339c257aac8af7bf1df8b3f1c2b12cf17777fc99e2272
-EBUILD jsonxs-0.6.ebuild 428 BLAKE2B 5d9b557332b05f78d12094de2d9ce4f804f9f42dc686a0992bcbcab87e4eda73c5445f457aabb3497dd3e638a7bfeba2b6841459dcc6b85df8d54e666f4d0a39 SHA512 8841df3b921a4941092a8bde96f5263b55a72150f0b7c139a0ea493235103819c6af59ed620e505b0f33be0cd2dcc66451fce683e4bf371102cca227b9b0d351
-MISC metadata.xml 364 BLAKE2B fb2eb258477bf4ba6b46d289e3371ae0b5789749c410b091305f0d626509d297c923ac33493662010ffde395d914871dac995e9c66a7dafcb487dceb594ded5f SHA512 64ef116db1ad26b23d117237d4e2a76d9bb05aad9c9a0885e5e22b93aea2eef7187feec1566541b0cec4451de43d24668e6948d3378035e0217ac2baf4c3c849
+EBUILD jsonxs-0.6.ebuild 469 BLAKE2B 35bc7f15d4384203d13b607d8cf91a015a45303570a2eb4900d80523669f65e0582249e2ef90a4c8b51cd6c6fcd7d06eab081817ffb6bd8750ba5f2bfbc6c650 SHA512 1d55e128966614a8363703c520417614d7d340da01b695939bb8a1edc8990a17313d8a81e2820896a9660b44037043a9612b465b6b694ac61cc2daecd5aef055
+MISC metadata.xml 388 BLAKE2B cd509bc386cb2451225e5fac906d88e5720ef865edad4e8ea28b96f3cba1fa79d595746110448cff169944f50fdf30b4ee683a4e3c56007c2d085fbe4a14d51a SHA512 e3735d6d95f247cf0aa0fe681e256388fe77319d45a6f812508e8af5c37176148b766b0db62e6c11ae2421609e483aca84ae4c6395550eff9873c89377c607fb
diff --git a/dev-python/jsonxs/jsonxs-0.6.ebuild b/dev-python/jsonxs/jsonxs-0.6.ebuild
index fc4eca698734..9eb4fa1dc91c 100644
--- a/dev-python/jsonxs/jsonxs-0.6.ebuild
+++ b/dev-python/jsonxs/jsonxs-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -15,4 +15,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+python_test() {
+	"${EPYTHON}" jsonxs/jsonxs.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jsonxs/metadata.xml b/dev-python/jsonxs/metadata.xml
index 8827852912c1..11c75050514a 100644
--- a/dev-python/jsonxs/metadata.xml
+++ b/dev-python/jsonxs/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">fboender/jsonxs</remote-id>
 		<remote-id type="pypi">jsonxs</remote-id>
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 4459d16bf5cc..6f48409e34e1 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
-EBUILD libarchive-c-2.9.ebuild 462 BLAKE2B efdc767c1dfefce8dfd1d1df81bae7e3be2d12b076546ecb00e0162bfa40b5c8a98d691ca524b2f2d3eb9c6e3399b34baa2903ead5dea4560ae061f35d66ced1 SHA512 1605dbb6f51199a788b9e86c33b0c3d3d84df31860a1c48a2c42abb3963443626aec9572defb077c2b4dfc18e1b2328f9ac6e9fd8cb68dd11e4f9edfbbc28c6c
+EBUILD libarchive-c-2.9.ebuild 463 BLAKE2B 27b5db365d378f7d75a97bfe3c3b70c4b4d9ffe944f7fe5dffb7477ccf90d0c9cc18e9e7cc24f760372d74c01aae227c57a0c26a128f6390f7189deba92d7c9c SHA512 6321ddb395fd4c05c8076f5aa6ccaf133883afaff3bff98b0818175e693170eb5cde798cf2ad8c9d7fdb8e990d362dfdb4399b6b4ff001dc202d69bc3b935097
 MISC metadata.xml 561 BLAKE2B 4750bb7abf389d0fe90b4d42ea1d5bb6aa41e0e9a69d45bca90759eb6cecdd8a8100d87e024ea6bbab18b09a4989cd7012a6e221f3859abf997fe3b367589478 SHA512 3aa3b727b62b12512e5b342cdfbebd89aef9c605204ac1869592d48a98b4384f1772234e1a4ca8ee5bb04b254e34e2f68962cc1154e4f7e4207fa3f2a49b5551
diff --git a/dev-python/libarchive-c/libarchive-c-2.9.ebuild b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
index 53823d5e1ba0..836c869f14ab 100644
--- a/dev-python/libarchive-c/libarchive-c-2.9.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 662b81488a23..fc69d69c88c2 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,5 +1,5 @@
 DIST llvmlite-0.34.0.gh.tar.gz 210438 BLAKE2B 832ec28047a51b2874a0de5885445b9d77942a70f86620dfb0b25ff0b17395b6009d31d5e9f27ddf02c19ae97bd5b325fc49227fdc0499a9f5fa3bde44e6b564 SHA512 5540df4ebad835e294c00cc09ab1230a530566f563f751f890752f6e22f7b2a04aedcbb53dbbb8e323198d05c80bc9699b593d919eaf1af60fa6f94ff6f50bb1
 DIST llvmlite-0.35.0.gh.tar.gz 228089 BLAKE2B 5cee01244552cfc1c2ba979709170484ed253f52c5c47a4a254bf7d26c935ff0d2a858b7a7f4ec7719644495383128adab11a1287849cd426b7997da4a59efeb SHA512 345b6321277749a169cd87e152261ef499edbf18d18ef7085017c111f2892eac0241529cfae9c6eaaeb68cdb4d726965ed03b4d5a836501dcbdaa73d3c0796fd
 EBUILD llvmlite-0.34.0.ebuild 1354 BLAKE2B 54b3c4532cb14dc86452f1f4c4feb5f514928b28d65058011bcf6d324ef66c5a406854d780521e3b495ecd38540b3467a525464b7fc7f94cbcc70b18bd1ce647 SHA512 50b07c9575afd16f03810a519fc3646111c6071567cfaaa538690240bf578c5ab076fc80c26fe12a061d283bd681ee709482aee4c8da642621354b22437bfacb
-EBUILD llvmlite-0.35.0.ebuild 1356 BLAKE2B 216c651a453274a77893fde3d16f44d478cb4cd0d512c7a57ce296f1df7f95539a83eddd724309b202e2fec36bbfab9c4de42f5f5dcc25049cb093a5375fe3d2 SHA512 71af483853bff839107b1c93e52fca1cd48c6b70b9b8f9bf9a7cf5ddbfe9e41799e0d8ed108164a6bfe8a667a5b964fd1647f5ece5df3994d1d2666c9bc982d5
+EBUILD llvmlite-0.35.0.ebuild 1355 BLAKE2B ab309fb8dec4f96fd85708aa99b0df199f3d25f5e6a3159f387dd65eb6a7357a8075849d04ac89414eef4f3d9e2e65876c471485a0736b97ff60c1451e65664a SHA512 186ef8e395d2c6b8c3d8e9546701cfd0a03a1135ede981a44c72c762a49dcb6e904163b73051979c0e683cc27f0a2b4ca741e938dfe853266b1cf81c41415aa6
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.35.0.ebuild b/dev-python/llvmlite/llvmlite-0.35.0.ebuild
index c9f050afcbed..f9b2f47f838b 100644
--- a/dev-python/llvmlite/llvmlite-0.35.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.35.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LLVM_MAX_SLOT=10
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 9fcb23f90074..0ee0c03f47fa 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -6,5 +6,5 @@ DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2
 DIST matplotlib-3.3.3.tar.gz 37944403 BLAKE2B 30358d7b7df87b0b15724c4eeb132acdacf31ac900d5c06b22c7ebc7217d6cabcc76b7e29cea6af0b4711b5b1724ce34dd065f63cabcfd40c0fcf9788f94c1fe SHA512 36b482a6c36ee08c47f3c02c160289bbdec8746d4d246084723bd3e1fd632c6383f6db58c950a9773a6993d10f24dacd870a91faafc34864616288cd05b6232c
 DIST matplotlib-3.3.4.tar.gz 37941665 BLAKE2B 77b86dc3ceec3695a0d749197bcec684893d237da1aaf8778d9dc2038da1ba56b757bbce94efcf215ac30f35420b77e0a0e75ebb75b6d2cde5146d8a35ee25e7 SHA512 aadfe3db4edde9940b9e15daf1b6c5f237d3a6f38610956ceee994f919d711fce818ea12be4db18aa2a8638c4e8f434d79541fecaa7233e233bf4c73792bc4c4
 EBUILD matplotlib-3.3.3-r1.ebuild 6912 BLAKE2B 5f809ed5512b7e908b2daede9aac0e1ff5519140cc3553da1a781702e55eb1e8ec7428e2dfc6b2e4170559f8705c747b16e2b0bf3f1e94ac7bf7e55adea9de26 SHA512 ec81df574b7cd100de03b7851c51bda23cf2e3ac8b34ab86db91d5457c92c03aa328f557e5d61fb962ee6bb5222f2997cf25b2017628f70700184d10337cbd94
-EBUILD matplotlib-3.3.4.ebuild 6931 BLAKE2B 04c28da1a5692b7707db60e6687377f26db882a6e4d3f1cece0671c3666a17894331c0cd526c87356d16382c831058be364454e2fa8e49cdda91906028f1dfdf SHA512 f7cde7899fef918d308454ee4aec5aae5784f866a47360972cf1f2753c112b05f65f0376720d627d26cc5afa83c441c279c429451adb6775be07c72d31a7dfd0
+EBUILD matplotlib-3.3.4.ebuild 6930 BLAKE2B f3ab4483dd7158c00119ceac85c0005b72f1d64873e38a8f893b4e481c760914a607a3a878d225ededbf9c37d1e6912881172324c8fa93ca30c3c2175cbb9e78 SHA512 f2854ee2f8a14010f1a86b4c04807800ffe74d48962bd56a406491b7556f091cd7091f58e10504345d1b9400c912b95456aba49eae01951177aee72f953c8f59
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/matplotlib-3.3.4.ebuild b/dev-python/matplotlib/matplotlib-3.3.4.ebuild
index c67ab398e61b..189809ebd78c 100644
--- a/dev-python/matplotlib/matplotlib-3.3.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/matterhook/Manifest b/dev-python/matterhook/Manifest
index 9afe266efd25..f993691658db 100644
--- a/dev-python/matterhook/Manifest
+++ b/dev-python/matterhook/Manifest
@@ -1,3 +1,4 @@
 DIST matterhook-0.2.tar.gz 4458 BLAKE2B 83dae9d38eaa9de3abdca4925378475660ab6f9571565f9275425cb9579397c2f3d106735d4268b7045d6af2572bdb8e1f60aa89030b1fa44c4c5c1b19fcd106 SHA512 aa476a00a5b571c5c8bb21eccc5b1c325e0932da7e4f8095e3ad29356afd4716384abfa9e4927a820e6d1fcf8e62a516943f6372d90cd7a9e76d0292c352c483
+EBUILD matterhook-0.2-r1.ebuild 496 BLAKE2B 6c7e9824237d572201e03f206869f054ef4cbd4d77869293ff18777a0d340c2787a189e6daaba0a7773faf835dedaaa14546e24fcc073bb4111d5aaf26cbd7c8 SHA512 7723196d74c7e7917472896bb54750206281012da76fe5558559c4a5b6c9ac6778c7d9e71357d22b46e209348b74eb8fb6f49659d27af1f1316ec8b52e246ac0
 EBUILD matterhook-0.2.ebuild 492 BLAKE2B 8311e46e1c6e2ad9f0a1e8793bdc0861883e7a57c0fcdcd44b86dda798c53efe93ba2b505cc6014e70a822280aac6aa1d551fb14d7371b32d614d8f5f955e3fd SHA512 200625075601864b99e445ab3e1f1dccb358c189e695667ba25d0666aa69e3e46169117de34cb9c5ece8f3ec2089824cd0eacd8522a8d5b0c58327e9d6081aa5
 MISC metadata.xml 375 BLAKE2B d2d840486a6a20a7ff78b82e2c01f093105087b052a5821e7641f0ad21b323b22ec1b5c6e71f5cec885c8e229f7883eb1857ab2476ae11b990944f432be8054a SHA512 f08667b90c99152dc61387c1307aaf8fde1853202772f75de89f0b696b28ef7b7154d016aa32617c8bac58af0d7b007cc26ec1ec9c87a68aa6d77b8fe7ca94b5
diff --git a/dev-python/matterhook/matterhook-0.2-r1.ebuild b/dev-python/matterhook/matterhook-0.2-r1.ebuild
new file mode 100644
index 000000000000..c892d85008a6
--- /dev/null
+++ b/dev-python/matterhook/matterhook-0.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Interact with Mattermost incoming webhooks easily"
+HOMEPAGE="https://github.com/numberly/matterhook"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index 5fdf7e097bfb..37277b9d709e 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,3 +1,5 @@
 DIST micawber-0.5.2.tar.gz 34541 BLAKE2B d123e67ed859a60d102c4653776d0440e410f084087bf27fa56f4976e6e1d06d4f5a7d91bb67b45c6fb99657d6b3cdf6145d3153bc13553b9f4e7892cc7e6d24 SHA512 2bca326f884e88b31a1e019f22d5002316d200f7b273cf2a80ed6240e3fcafc2816f351e8f992905d4b60223061fb096469e905d75ef7c1c45b941d744a1a217
+DIST micawber-0.5.3.tar.gz 34550 BLAKE2B 045eebd018d8b1f52cca9f043cfbc8de528a409e42ad9f785cfa00bbe223546c98d2d182ed2dca0047b3e73428b318e8db712466813a781154a8a6654d8cb9a4 SHA512 7b5c7e3bb5d92a50a3488229c59c5ae95355410cc0aacd49be2d96372a2d6ab9169aa6ab066d49c72e6a8b80358b3937b358c4bb8027779c5132f0929747dde8
 EBUILD micawber-0.5.2.ebuild 669 BLAKE2B b8a200878dbf7ecdac3a148dc18cc430c62d78d2e9e7f25a055b3144610d126a57ce82fc40a37a9c2b79b63fe457e759a5c7cd710eda8a78a0709020e6f104cb SHA512 751333465fe83cb3c55339bf04f4f176cb3d45069feb983a6abc1b0faddf5e1a59ca0ef941a808c2a348a9f223becd95b5878217bbb810f70106599bebc1ab26
+EBUILD micawber-0.5.3.ebuild 670 BLAKE2B f18c3a7734bae53201fa10f6a33b25df1da2ec3aeced3f8016ac9e8fe326780869c9c491e1c7637fdc8e5d5002d99a3e512e07929c0bbce957ea1c9e88f42377 SHA512 3bd1e69fd60e3bc86cb3c76334a11dc83d56502ffa1a6774231dc6867728977e400456d6ac9e2c5725d2df56cf93993f79245a64505734844f4f5a7d1eed1604
 MISC metadata.xml 392 BLAKE2B e64309d757450287e941aade812040543a73b56dbeb26960bd1fade3bd0e8b45a3bb04be4f4f0c9720c6ea36967d9e9715f793cfd57435c64c7dece1986761ca SHA512 210939afb78c7bab48debb24886a5b482215ba5fbaac0e7d7faacbf6781e6d1766ff97e61d94070048ea13d351996b5bd2e8a56e9395e8fb47e1f63e730f30e1
diff --git a/dev-python/micawber/micawber-0.5.3.ebuild b/dev-python/micawber/micawber-0.5.3.ebuild
new file mode 100644
index 000000000000..b9bd0eae8f9c
--- /dev/null
+++ b/dev-python/micawber/micawber-0.5.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A small library for extracting rich content from urls"
+HOMEPAGE="https://github.com/coleifer/micawber/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
index 36d3265e1d7b..cab1cb95d49e 100644
--- a/dev-python/minimock/Manifest
+++ b/dev-python/minimock/Manifest
@@ -1,3 +1,5 @@
 DIST MiniMock-1.2.8.tar.gz 13217 BLAKE2B 333957307ed6c596bfc20ed18d4e40039208d589c1a9190e388c7dc3be53489994b2f45e8140f54850e4129a5a69c0fc361e3c4cb1d63a3bac579a7b86004856 SHA512 91133251a6e6b1acc11e6ac4f24404807134f8a7fca49d5f7365d7fdfc6bdd1527e7382da8d866669408b1ad30331a176026dd31bcb0c3b7367b7f778fc61ca7
-EBUILD minimock-1.2.8-r1.ebuild 584 BLAKE2B 22d071cefa401f5086f32d5e8034c21869384e4b1359d6c629409b5fb8d8bad771fff9dad9b512e732c5dee8b8661f6e186cc624c32d3cd7a91bdb4098af2bbc SHA512 855cc8697832f0e1c6bd13f58d572316830d634dd5f2104bce664d8edc28dd635ff327c3586d9a8bcb0b84e3bf4cfab22d5de6d497c7fa7ea83807dbe7cd1b9f
-MISC metadata.xml 311 BLAKE2B adc96d0ea729a224f769fc01eb21da4df1e7ba91e03a33554ed6b5452ca95a0408cd367058b026f745a2adbfc74f3e3aaa2553dc5c033041bcdd72688cddd679 SHA512 9df2bf6b3486803c9754bcb3b9142844ca050718f10c00bfcaf4538262cb95c3d7a5e3102ca2005ce407205f6beca7722aca82407e85cc289b35e33139ba6236
+DIST minimock-1.3.0.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
+EBUILD minimock-1.2.8-r1.ebuild 587 BLAKE2B 0dae244613a9fe36645cda49d0b4dc08eb07e5a2b78040961944f3dbd5d515d3ba0c73caeab9fdbf32f46f9bfaf0bf346ff7bc6c51c1f44bfb9f46f124808e02 SHA512 049c19bb13a8b7428538ebfc4d3503f7eb39ea2d5e9913c42764806ec07019e4a8a2f9b9903246694588fbe731f7d81e91eb75489bfb8b0cdd6be2093bc87375
+EBUILD minimock-1.3.0.ebuild 514 BLAKE2B 514e5a9e893dd3fde0e2ce8828336f90c47f6dc99d5800cc465fa27966e53b5316fa187c78fbf3dd38ad2aed0fa54dac82ecb738470e81b480eb1598ba7a4d7a SHA512 852d948617f32f61126d8bce5a3eab1a957427578f83d1a6d291aab4f2ab41d0b877c435e5f382a6d1b7000ae003d97cad0006571190752d41cca29f857ded46
+MISC metadata.xml 389 BLAKE2B 5a2faad0837b39b8b5736820387d577e3c5f97802beae17340221fcc026ef18906f5bf9ed8cb86814fa8989879d84e062a9b542b0b530c9acfbaac80d4158c7e SHA512 907b5500e461c7f3c30d1d006270f06feef7537368c139dcdc791805f266435887162ad6209a7f827a8d9470e7e4d98e41d0027604e36532b90a16abcc60244e
diff --git a/dev-python/minimock/metadata.xml b/dev-python/minimock/metadata.xml
index 986d70145867..9fbb331a08c9 100644
--- a/dev-python/minimock/metadata.xml
+++ b/dev-python/minimock/metadata.xml
@@ -5,7 +5,9 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">lowks/minimock</remote-id>
 		<remote-id type="pypi">MiniMock</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/minimock/minimock-1.2.8-r1.ebuild b/dev-python/minimock/minimock-1.2.8-r1.ebuild
index b49a8ccfe850..5078bec564e3 100644
--- a/dev-python/minimock/minimock-1.2.8-r1.ebuild
+++ b/dev-python/minimock/minimock-1.2.8-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/minimock/minimock-1.3.0.ebuild b/dev-python/minimock/minimock-1.3.0.ebuild
new file mode 100644
index 000000000000..3ca7df2cccc4
--- /dev/null
+++ b/dev-python/minimock/minimock-1.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+MY_PN="MiniMock"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The simplest possible mock library"
+HOMEPAGE="https://pypi.org/project/MiniMock/"
+SRC_URI="https://github.com/lowks/minimock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+DOCS=( CHANGELOG.txt README.rst )
+
+distutils_enable_tests nose
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 03de5e4a7bef..ebbb1db42543 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -4,7 +4,9 @@ AUX moto-1.3.14-tests.patch 2306 BLAKE2B 83bf272204ba9128623ad13bfb4a468d6b2a4e5
 DIST moto-1.3.14.tar.gz 1829165 BLAKE2B 2ec30c4cc571492a9d2c08f66a39ad04cfc0baa7864db8a5be4ea9af24ecb59bad3e85c44fa8a7babc16bf66188cb6bef89484f1f302a11e6eec1f8dbf516492 SHA512 1fe7e9d49dadada82f24d6bef1c21419c414e027c21ed1099bd1eab7c269ac5638ed44a29d1557b37562a44b22a7c7251fc1ca8ba88cde6b82d39dbc620aa6a6
 DIST moto-1.3.16.tar.gz 1761006 BLAKE2B adb48ac770e0753403fd41309ebc2085e5d9cdfad5dc791d9cc1216af10e55038c37526a8549a034a3327d821c56b0f6cdd775a17336285bfc637c09191dd78d SHA512 80a1335fea8d6dd42b4062365da4719d26cd6c18e5c186c950bbb844dce44e91ffe5e5173742f3b60d6ba2cab93d45359b43c2cb0ccf74d16009986457c243a4
 DIST moto-2.0.0.tar.gz 5054551 BLAKE2B be9b18909f90b22fe57d47e2eea50144b4ac8046dde0123249079f53c8f3c2ea70513b29cde1030ad923be7d50c6021351c8aa9c65bc0b95510a4f4de9d4d111 SHA512 285eff39004b291d112c455f44e30fe441d74c08aff614f5c97e7c52a68edb200d7077722f1e7bca38a63694aabf2ff56994cd1229e449b2f1afdf3945735fc7
+DIST moto-2.0.1.tar.gz 1530088 BLAKE2B eb35bcbc8b22044ae86eaa6eb1f71eb24174a8686ef06d475c870ef629d0a525719c4f153cb0a55fa27f3c33568a5796a07ce903800468557dfe275de3da3623 SHA512 d650140c76a2090332fd9f4c8be84379d4e578a63125d473b821d59bff9f93ee8e696268e4784df13f2ee3b8b6967fd10cbd94750f37e63967ed679b4a301682
 EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B de0b07e01a296d89ae22fe0a91c91fc76634f054a148c0cf60101d85df67f0a17cfd9a80cd41e264a0641e79602b5e3cf23b90f2eda98a50af78794ccc9ef0b7 SHA512 c6bef4b6f0899fbc31d97cc101fd14894814edcbf66df837f776fbb51780f86a95bfd94dbf278e274897ba25e4465938eb9bd0410910a95ecddea56962a70f3a
 EBUILD moto-1.3.16-r1.ebuild 3189 BLAKE2B 6c4612eda3bb91d40b7e0ad451568d5c877ef4d3a6563fdf13513d11abbb477702d542109174e91b7c1e580c366d448248453170480b7a15a8b8e9918814624b SHA512 5df5495f98a4929a7e97e257a2bd7b8ee44c915fa008b6d45674d6172ea17fb103b2c579e76a7d14944995019a73217e510c60938b42ea5d2885f92f785d92ad
 EBUILD moto-2.0.0.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
+EBUILD moto-2.0.1.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
 MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/moto-2.0.1.ebuild b/dev-python/moto/moto-2.0.1.ebuild
new file mode 100644
index 000000000000..8984175648d9
--- /dev/null
+++ b/dev-python/moto/moto-2.0.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unping indirect dep on ecdsa that's supposed to workaround pip
+	# bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# network
+		tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names
+	)
+
+	pytest -vv -m 'not network' ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index 72257a31dcef..d711046a561c 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,5 +1,5 @@
 DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7
 DIST nbval-0.9.6.tar.gz 60932 BLAKE2B 77f283279e16e03ec87f250b2012aabd8f580e24b222efcb0b21d9b0dadc381cea3c4a3f96a85df0104da86911de66e6c21bfd3985801fa9c3d8764b2fb26183 SHA512 d4261fc30e197e7350c07504649f0230751b5ed746fe4626b92c5920032dc15abe47ad421c93f4762e93a8b6afcbca440ca006bfd1cdbcba37d131c4e6decaa7
 EBUILD nbval-0.9.1-r1.ebuild 740 BLAKE2B 69c62d981984faae61a0aeb70d4c038f78a791607fdb741495eb896d04e7e0356e8f928471ef51798aec14d3fb75b2aa73ebeab4a79f38813e274a161cb3af08 SHA512 c00a36c40e79a10161fd740f003172d39b07c753bc3e7bed8c267e6bb249f8d49f419337670f0bf06eb8a3cb4c9c6b1a7d915823f5122c389c4dfc6331753389
-EBUILD nbval-0.9.6.ebuild 882 BLAKE2B 174615b9642b9a0586aa844b3b88c90222f06439427d8eb962a2efba72422652185a6a0061f082173de2c56e54749496e847e9565d4ab77a21ccaaab4acbdd8b SHA512 8bcfd1fba1421a3ed90eef12a01502f5beb92b2af0fa957025c15ad25ef95fa46036ca931befb1170a61de534e3ab35e17cddf40dc30352bf0d271847f364fb5
+EBUILD nbval-0.9.6.ebuild 977 BLAKE2B a699ee8f98774865b8e7f190e8b364ea9df156f5500401fd9a5dc3371a1f87f4308f1a572a17560fb7037cce4e962725aa67dcf0ed8e920bbec9f7d9aeaf1346 SHA512 ebd4d4ec9fc1bba8160fd1acda17b8a37ea3a8ef218db45d01fcf02a0c39102bc7f14fbfd54a7397a630ce46860736326f229f8abdb7883a1c0485992a6a58e3
 MISC metadata.xml 983 BLAKE2B deb9c0b7b10480d8d918b61c9c1110cd3168ba51ad49b0f4822761875e5e3aff5d68f502e023a1e5c7a744b2a867aae9606737be79c1593960a7fda4d277448d SHA512 a1901ee74f9260328bb99d3ee37642d94a15a7e9c266a0cfd509e8cff5bf012ebc8185c8a576dbb4e5ac3f887086639a917cd76174398edbab17060d43111665
diff --git a/dev-python/nbval/nbval-0.9.6.ebuild b/dev-python/nbval/nbval-0.9.6.ebuild
index dd0eb843e62f..dd3f21a47ef9 100644
--- a/dev-python/nbval/nbval-0.9.6.ebuild
+++ b/dev-python/nbval/nbval-0.9.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
@@ -20,7 +20,10 @@ RDEPEND="
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
+	dev-python/pytest-cov[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/sympy[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/nose-exclude/Manifest b/dev-python/nose-exclude/Manifest
index 0214cb4f85cc..456e08bfaf21 100644
--- a/dev-python/nose-exclude/Manifest
+++ b/dev-python/nose-exclude/Manifest
@@ -1,3 +1,3 @@
 DIST nose-exclude-0.5.0.tar.gz 7359 BLAKE2B b47087f0af6a41f8a432c2e46b4a8ab3229dc682e11625d99b7d1aaa05d2cb0283acc95d9ce5eef3a071190c47dbcbd3e9d5e3ac7785e48d809a7962c27e4866 SHA512 2795f2f42430f8622fdeb46accf4a75853f8202ce1849852ec4b1a6e26aeb20accb8c2ec4faf3dad0ea174570fccd67d51140587ee9f47c905eed5d8a2963356
-EBUILD nose-exclude-0.5.0-r1.ebuild 570 BLAKE2B bd7a77b08042100b62b87241a5af4495f437f0a93d83d16b0ed363c900cb036028236aaa69333e66f8bb2e7a15f4c2b6e1800bd177653c6aa8257baa6e9456b7 SHA512 b015505dbf8a27c11d0848460db7e2d9d4335fae462cc08c63d5c3b9774f2b0dd0dc3d5fc76c3cf6233d0a80f048d517eb6ce91db68e9f6b3fb5b07b8164f0bf
+EBUILD nose-exclude-0.5.0-r1.ebuild 521 BLAKE2B 49b63192ba842600930d4d9ab1b153572409c76103d8abeac11c5390469cfec695d7d533444b15860c8690f3534492860382480ec7799b4cf5b4cc314027616f SHA512 30b644e84fe092a472203c6052980682b47c260910ed32a6925476d9a6ae8befe8a0418ec1bad0e6108b06deb4a6c69e73f25dc21175c0fca72d33e3739bf25a
 MISC metadata.xml 600 BLAKE2B a1c8deb7fe22b02ce8f542d59af02faa7216b6f461dc995378fd9e10c19559ea5ec7b6c9266d13ca156babb29ea47f044f3b4bae39203685f4f748c80021c9d2 SHA512 6ce849dfed4189aea8b6832400b3dbd9fab82ae7a9c0bf08db77e0386ff7bdaada853a7f2837daef0f2ceb1bf1565605dfe24b33338d78b8d5ca353e3cf34264
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
index 7c1729f4a570..5a82bbe040dc 100644
--- a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -15,9 +15,6 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index e8c30372dc22..73dd0e7cf888 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,3 +1,5 @@
+DIST nose2-0.10.0.tar.gz 156614 BLAKE2B 8e785cd36a781952b4401842288edf7b2551c69a894cee0d56b56c3e74de36b89bf09f849dc7264733d0c906660a5d01f2b74252507ae322073640d8ca0abfaa SHA512 e9522fddb45ab303819a38f6e4de16a2676b824e7027e8137d5e44917c21de91aec8661b28946e0bb1c7c72de907ba5eaa0e8bf76b2b76ae1edfcfe68fdb01dd
 DIST nose2-0.9.2.tar.gz 153381 BLAKE2B 9339a31b664561bd86817a969a64a3d80dacdda3ed25bc0a0b6531812e56c7e2bfaadcad3712d8af1a7ce585e27ff6de54428667e44e7c6b0003db5d52703971 SHA512 9af69f0cc9db2e8ef37d2c4ea4fd2d661a38df73fc984d261a1c7c39fba07e44afdf494f0939362b84a03e80c3d93ee75c9352ef333616bf8ce6e6f019b811fe
+EBUILD nose2-0.10.0.ebuild 876 BLAKE2B fb955035498a0b13f1d14f48f0a0bc62ba6f7bd9f032e365c622ace5d1810fc7c7e8df3a57fac2d2a26dc15413614efea64c4a2c4047a737fcf28df73a569b2e SHA512 c362121cd29f9003f6f4dfde5dbb7ff9917161971f2af945c5b1e61a223684da938bf76dd0fc86fce4d15a7aebe924d52c23038b61c632712bb5e996428353a2
 EBUILD nose2-0.9.2.ebuild 874 BLAKE2B 6a61a1b5c27bae61d13ed89b866a894da05b1fc789ed20f2f4546de6edd5aeb79f0be9348eddd99ceda51e147f06de2cc965316555e6ed9a5f26a1c1e32c925e SHA512 f87a3cc96b067df9cc0d63b187a791dc48b6976cdee2d3189e44df9a5c5bfdd80c5502b59e6b2b331ec66a065921c5f41ce669dabfb5a0cf9ad7cb191b80007d
 MISC metadata.xml 312 BLAKE2B 22f9d7365fc58ec0909ed0d3bd159ea17a7c89c33d982573264be761d1a08ffc8f9aebe95927f81417eff4e72e71b91ab6eca9773471778cacb779e667627f1e SHA512 310e65bf0154dc12b14ec9ec6124f31f1b658c0d2f3beb7f3d01643c0b28ac6efae9536dd8d1e55f8900404b812e71eddbb235e9eaa91e7d8d5945a9420f03c4
diff --git a/dev-python/nose2/nose2-0.10.0.ebuild b/dev-python/nose2/nose2-0.10.0.ebuild
new file mode 100644
index 000000000000..1f4c68ec3af2
--- /dev/null
+++ b/dev-python/nose2/nose2-0.10.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Next generation unittest with plugins"
+HOMEPAGE="https://github.com/nose-devs/nose2"
+SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+# Failures need investigating
+RESTRICT="test"
+
+BDEPEND="
+	doc? ( >=dev-python/sphinx-1.0.5 )
+"
+DEPEND="
+	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nose_fixes/Manifest b/dev-python/nose_fixes/Manifest
index 409aaf5024c8..297fde920e81 100644
--- a/dev-python/nose_fixes/Manifest
+++ b/dev-python/nose_fixes/Manifest
@@ -1,3 +1,3 @@
 DIST nose_fixes-1.3.tar.gz 10033 BLAKE2B d6b7f9bdfb803e59be6eb400004f595ad717da7f8967c38006206f51dd599bd42984dab6a9f5ccaf30a74d119da55ff0282b3bb5c9bed9c2c37360865903f12b SHA512 2e054c04493cf11f06ee8977d4922290dbdd7928a4fe4947a76b6cf300c2d16796b578e48c0ea514f3c5a38e011fa9779e7d308eafa0ec12cc0622e124494d93
-EBUILD nose_fixes-1.3.ebuild 676 BLAKE2B 16de3854135883c6860a1a04744920fd3e73569d4e5ca8776c09d0b5fe68b7ec0ad06fb94acdb1bda506d8675d4bfeb0cb976eb6b5fae7236b3f3fcdeacfef52 SHA512 96cd8dab410133dbb7648ad963e1afa18c2ae7e13256b7f12094aa6fc602d85cd431c041bfb11139da89e64528fb2b5a92281cd699c424dac98332e9b7a7ab1e
-MISC metadata.xml 323 BLAKE2B 940bad81d1f68d7efc154f3f4798633c74ecdad7b897f08da784fd7b79857d7ce690592e2370cf3a62cb213a696d21805a03d65eef15eb634c000543aac47219 SHA512 2795d2ebddc46db61f304647a32627fb1be7370348d66962cd9901dd59e688ab7a230d4903b784eddac317bc9c2a28634fd9c7a90524be580f6979577fbfa95e
+EBUILD nose_fixes-1.3.ebuild 563 BLAKE2B 95f305bc13672bbb3ac689c33ae1150d544a57cdb0fee6508c0d92c69657d32dd73ecfe6120b4c7d158e09532b0d95b472ab51075799194c8e41d4edbe3bce1e SHA512 994077df960d8af710220aff2e860b46503151568cfbf4c9c54b9324aaea6364a5a876400275a570d61e462ba22517b8608f10a29adef1fcf76524b6111670e0
+MISC metadata.xml 348 BLAKE2B f94c361db4260a43cca443b9f3340cedcfcba71874245e5ed1f3037f79181e17db00b095f08711b52b29ce1bcf957290d1c6956474f528f39179132edb3e479f SHA512 6c4202ca30d077c18d7d6ea77f213eb0c194402abfb83d12df2c04a28c13ff415beeb2c83fe2582d302588c56e240b2d2ac9a7716dc45bd1bfeab47e8e28d905
diff --git a/dev-python/nose_fixes/metadata.xml b/dev-python/nose_fixes/metadata.xml
index f1e5ee08afe9..ebc9679e41d6 100644
--- a/dev-python/nose_fixes/metadata.xml
+++ b/dev-python/nose_fixes/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">nose_fixes</remote-id>
   </upstream>
diff --git a/dev-python/nose_fixes/nose_fixes-1.3.ebuild b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
index 75ea4bb0fdbd..599a6bd318a3 100644
--- a/dev-python/nose_fixes/nose_fixes-1.3.ebuild
+++ b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -16,15 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="
-	dev-python/nose[${PYTHON_USEDEP}]"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/pkginfo[${PYTHON_USEDEP}]
-	)"
+RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
 
-distutils_enable_sphinx docs \
-	dev-python/pkginfo
+distutils_enable_sphinx docs dev-python/pkginfo
 distutils_enable_tests nose
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index ada370027fbe..a1d85e780489 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -7,6 +7,6 @@ DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761db
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 EBUILD numpy-1.19.4.ebuild 3722 BLAKE2B 8c4f52962817ab70d1181da8e87978a5a48eafe23afe3d64aac5fa0cf8ef6095178fa877939f4be7cd1bc7f43415587d78aff06001ea787cac8bb83d3513df8d SHA512 623a3d1b3181981ef1702d476589e2659ee11ed45476a74c07365dc6fddea0b215950505c3f9b6c51cb05a1c5960f2c769aa550de6adc94b70c7c318cb69c00d
-EBUILD numpy-1.19.5.ebuild 3722 BLAKE2B 364c8992a970041f70e2cfaeea819bae6d30c570cef70afe87f0a9756f6c6f7975e610d671e97ec3d4aa8f6c4a0a7b0e8ce0770adc57ea1bcf68cba48d20e619 SHA512 e373e576a3f53beb3d0deeb04b849ea68ca5dce490f0a79f478e1f5988632f3f9e8da2560f9f4b59c0bae5be37ff81f8713248aaff9d6ae8c8785d8d243b6a3d
+EBUILD numpy-1.19.5.ebuild 3719 BLAKE2B 89f1510bf7a43e52f697c67912be79c3bef0a1320eb35e26290c7f7556c630ab8555d029c931966a94598e33eb9f8c3b76a5a59ab1284df3d8386c63c843774f SHA512 3f6ca348191de750bcd92c5a1206d92fcf82333e58081f86eee56c3cb5730a9cdea6678973db3049273b7f3d1d6bf3812e154b218d69c144430a092b0779deff
 EBUILD numpy-1.20.1.ebuild 3727 BLAKE2B fafca319c164ac66f10193f4f364829d4a3ea3eb9e1e03b1261c3348b381e58b91700e12f70a7e026515f54acb1e06e93bca86e82d6eb7aa2f21c25e7e75603a SHA512 188b6584b9c3020768311c782920335386c714ecdb5b97fe1b832882c3df155e4b44fb2ff09a1c90ab5083318669e47aa696da42d31c6ca8fcb3953de05e5c88
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.5.ebuild b/dev-python/numpy/numpy-1.19.5.ebuild
index 202cf9422a00..181526f95b2f 100644
--- a/dev-python/numpy/numpy-1.19.5.ebuild
+++ b/dev-python/numpy/numpy-1.19.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/oauth2/Manifest b/dev-python/oauth2/Manifest
index a0a08be11a8a..7fb869bc8a78 100644
--- a/dev-python/oauth2/Manifest
+++ b/dev-python/oauth2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.9.0_p1-exclude-tests.patch 332 BLAKE2B 82d468bd3f94baf4e99ddcc17252bad0b71ff2331aaeda3ec3d7b4117017b5a9ac2ab57f4fcdaeeaae9afec4c39e1ca5481e2463e197eba7bae40c6d27e0af05 SHA512 9b4b45d22076517ac6e79ecd74430ee7e53501aea07f0e2c43bae3c119e572d9357dfc32adb036920f4ff15c1344ea3cde20e79ee4c609508feeb9fac3293c57
 DIST oauth2-1.9.0.post1.tar.gz 21306 BLAKE2B 3e61ba6d46b98c594fa31e828885930490f99390f14e0173bdf719cfc1d5e8ad385e56c9654e139279cd95611a7e35b1fe0276679a2a4849b67125f5e6919788 SHA512 a3b64eef331d4c4f59c275f14efb2dfb48ad60de47a59a88106f60d64428a09b76d8bedf08c98c113493968d83708b1478b4b61b2b5528b5b01fa22777daff4c
-EBUILD oauth2-1.9.0_p1-r1.ebuild 977 BLAKE2B e6f546ef331fb7257893427ad3ad4bd09dedf063d0435563c270753ea1b1570324bdbd03339af8d7cb33be5e4cd0e99dd9176e9452665b597a6116b1ee2f0d2d SHA512 d142b6b1b58147699c49cc0aa1caf7cf499423b7fc5edc9dbde401faeffcac86f02bd2b81f8d485cf96ccc8567264790b872ac84acc6c353f1d8dfcb5b2aac8d
-MISC metadata.xml 371 BLAKE2B 6c43294e3af678e152bc35ab923bca43990db39552673b6dde5206eb5d82199ca46d4162d53fe1f62b09ec15ae9b54b27c5c5c59ca3957ccdb532feaab63147c SHA512 292d51b2e24153b3351aa1a78e5246ecc0d36f21697f0637390ee5869b770bc24a9dcf01fa26e8ab6feeb61902bbc34659f34969537eac0c647445c03cb086da
+EBUILD oauth2-1.9.0_p1-r1.ebuild 893 BLAKE2B 6811542f406060de72af227822d3db384facc7faed8430eb9f7341d46fac9680162b7639a08bfbffc411bed8fd94ea1d4f7ba21675164b402ff18f4e82ff8d5e SHA512 731e50dc553d8d638766a7c89a252b159deb7e479fdee8a5d64b91f60757e61a1f09c2e26a80c450255fbe0e574ad4db8cb88cf84756931a8402b8e91bbe7a44
+MISC metadata.xml 395 BLAKE2B fdb3154d83208eb7708b69af8b8be5fc74e6c6a872e7d916522b64c7169e58d39f64080c96a443b220c5651a84ac6b73a6794c5971a9180573bf47952ff0f078 SHA512 3d775e5d647cb78ab418f0b6ff6ea0365fda706949957b05b79eca64aed221f4c8e457e72937dc50200522146297aff08c400f978bfb4c1782e498fdc837b2c8
diff --git a/dev-python/oauth2/metadata.xml b/dev-python/oauth2/metadata.xml
index 88a621eb46ee..eed4d4cf4330 100644
--- a/dev-python/oauth2/metadata.xml
+++ b/dev-python/oauth2/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oauth2</remote-id>
 		<remote-id type="github">joestump/python-oauth2</remote-id>
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
index 37eb7d636802..4153a69ecea5 100644
--- a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -12,24 +12,24 @@ MY_P="${P/_p/.post}"
 DESCRIPTION="Library for OAuth version 1.0"
 HOMEPAGE="https://pypi.org/project/oauth2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
 # https://github.com/joestump/python-oauth2/pull/212
-PATCHES=( "${FILESDIR}/${PV}-exclude-tests.patch" )
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/${PV}-exclude-tests.patch"
+)
+
+distutils_enable_tests pytest
 
 python_test() {
 	# Skip tests which require network access
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 9206368ef9ab..a926719dd333 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,6 +1,4 @@
 AUX paho-mqtt-1.5.0-strip-test-dependency.patch 801 BLAKE2B ae44e567fea5cb08d116790191a69899c95714db4e76735fc4658174e37595b8a354e8c5fc470c035833fe3b7d27a6e47e7db77db0bab1884306144ca69379ff SHA512 aebc29ede887b5818718a56e933e9ac2342478b528f82b9d72b1132138ddbd2c97b3be2f1e5dadadec38cabf793818c6f55ea16b44336f4a40c8295b9cea0602
-DIST paho-mqtt-1.5.0.tar.gz 126869 BLAKE2B 2dce27c1fcfe7ae422dc6da76fb58e7901de00c0c349b9715c56a3603da26e1f46af9bb8c0bd982043ba54a2070655b483d251a0a847e1c3afb36bcd4cfcdba8 SHA512 7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294
 DIST paho-mqtt-1.5.1.tar.gz 144740 BLAKE2B 1c218f1109476fe9b28c26e1113717448377c53a2b9e01437f93d4a29f77e3b61f59492c263f160825ddcce25f907dbf72d3078954cc378d4846afb435d79bba SHA512 7e686bcc702f70c45ab061aa9833d42c4356d5002d27a035a685ca384a5b7d5e9dfd88ac95183816e08dd131463582707acd1d2e0f6de0f7dbbb6a6d0a615c97
-EBUILD paho-mqtt-1.5.0.ebuild 738 BLAKE2B 1a8736833e3b0da1c55b9988ac8295b23d48c2cd792de7adb7c7e77b5ae07ff60c670c58b611ccef8ab63923989c7a1761caeb6d1f1b5e86238e9d0738e91c4f SHA512 b2b2c14c88343032fa2db85bce618576a64344a8a4d7a8a67b03df92a8d19dea254e4cfc9b6ecb686628ad93c4ae9b576f916a7f6dac54460f9a2ecea1d45ef0
-EBUILD paho-mqtt-1.5.1.ebuild 786 BLAKE2B 36f66f1312114a2fcd2a20ce7b913faee6d114db882fd0a6a8053d975af66075bafae56602a69173e5b10fe331e4a3b75f42af981d136db22dbb9e43425fbccb SHA512 e727045607e66d503eb184508bf14d1a3bc34a3e2f6ed09855958340393f7e0dc00ab6f73740ed755c7314bff3825b86d66c25812ae989aeac0b56efd85810e4
+EBUILD paho-mqtt-1.5.1.ebuild 784 BLAKE2B 1e56d3bd28d38684d35f14a83c816bf61d412c41aefc9e744533eed951348ef7607eae4cda26be0ed2afe9bf79e1fde38b5f43ba26c073083594c5098f0abe81 SHA512 a64b3236fbba8fe5377f704bd5487e7124547b9a67e36c5b909c4972b38632cc2d93db03f860ea56a8d6870a9e0800d8bc5817f392387560d84a8eacffd1e681
 MISC metadata.xml 406 BLAKE2B 3edad370c32eeceedc28a3b879d939248e634b15ca2c011ce701dfd466751d1355f5909b9e58184e94b5903c1ecf1d17db650577fa2e4c5d94e83cf2471dbe15 SHA512 fc13d1eaab56f27293bc287d9cf76321662f8d6d429ccacd58faacc7b6cc1aba69bca105ff84688044212c3fc62a6bab6b55e4a693a0f5000189367dfb6f070d
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
deleted file mode 100644
index 28656f7383aa..000000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for both MQTT v3.1 and v3.1.1"
-HOMEPAGE="https://www.eclipse.org/paho/clients/python/"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	) "
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-strip-test-dependency.patch"
-	default
-}
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
index a8dacd1de62d..3af0332f43d4 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.5.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/paho.mqtt.python-${PV}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 66ba6da3eb26..44f5e42848c5 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,5 +1,7 @@
 DIST peewee-3.14.0.tar.gz 877299 BLAKE2B 25d0027354258c3b2a4db0765f8dac23527816c24afdaf20252e244cfec383a4ae4f10a29ea0f801d5c38406f8c17bcc6fef881b4bce96ed45920a8865868e80 SHA512 083bb24952a6d05cd6c8376e185e050df0ab5b37bc553241128b0ed3b0ebdd322d9626c32943658324d413cff8ab0bb2ddf6c84d99a0fbe057c0e5c8ec93d7f9
 DIST peewee-3.14.1.tar.gz 879443 BLAKE2B f7a1967006e517c56a4a2b10bd9c097e87dca4135038676b096431e6927fa6f0a7e2ad13c036a1a7499a9b3a140a4d4796399f9c1e727e7e8a0770ef3483a3ce SHA512 f8b8bddd1e32e05d75a2f1cc5fcc8b9d98397107e4e4d3b19b444f20f4b8243d740643c858d20fd0ceb8b30de859fe17079fc611ac21cf289c417e1f857f1f0f
+DIST peewee-3.14.2.tar.gz 881173 BLAKE2B d784f133b9119e8c769d4259360f73c801129f1eb498591f716427d54ee518e74d851cec951ebb65605f50e18eccd1cdd9e6b5fbb527679345bb681d2248b30e SHA512 8473cbe8df69c4aeb6d8fe7e13fa5f7e462ad8827d67698e244b44944532289ba7941f4294c21f12ee51378037bc9ba2ed28a9682e61ba1c67a7c04eb72ff6b5
 EBUILD peewee-3.14.0.ebuild 753 BLAKE2B 3bbf8da2196374f36d4947a258e8b09e078d1618f7f2d6ab91bd47b3e0dfe09b04df345a24a8bcad55e758f857838c1c21425ccc775818057f8905234178ac61 SHA512 e8327280be86e1c60a3cc6fd8ab0894b235f3c8388d95b453dd63e61a3bfd6cec32a0cd718e6746c8b43267bbab7d8c008ef5f742d72738e53129855391173b3
 EBUILD peewee-3.14.1.ebuild 755 BLAKE2B dc9d43fe216113450d0a211fb0d74723a24fc3f895fb33353a840d2a0eb8bed5692a04cead776e5f22107c5306e27e30e1b0d05a07698ea53f9e9004b4186559 SHA512 e607644cfc8305bb00bef66436afa638577fab33ecf54857ad5bd06a72837beb357f6ea794061a876379b8910c877951697d6e222b5a1b2283d534ac337e10b6
+EBUILD peewee-3.14.2.ebuild 760 BLAKE2B 78fd7e2744f2550b508c23bd79c0c3c851b86bd5bb5a6042fc41ecd74aaecd7b0dd7d464ba5b7f98d976cd87c2c2a4b633838041affad4c203f373e1b5f99709 SHA512 d5a1b47be6c8781bdfb722c7367f92c2d3ba075e2bd0299769333d04d8e486739fa7a869de0b6467c3a37c9eff2e51ce503349113bd832456669fc61b2605c76
 MISC metadata.xml 364 BLAKE2B a14159b1b72a7138b6df21d06f487b2bf4e0d71297eecdd345343996327713a34fbaff5d69d9dbd4664b3aec116b8bebe98f48f5f672922cd0f029563d28942f SHA512 b60eca92f270da62f8c55a42a6b69d26f1ef888afbe62bb58d489b890e748a6bebb1f6048bc30e4f5c85fd47be4f6d95c6b5fbe125ce1be293ce7e7514691356
diff --git a/dev-python/peewee/peewee-3.14.2.ebuild b/dev-python/peewee/peewee-3.14.2.ebuild
new file mode 100644
index 000000000000..618fc5042135
--- /dev/null
+++ b/dev-python/peewee/peewee-3.14.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index cf52953456fb..b5b0f22f5a26 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,3 +1,5 @@
 DIST pudb-2019.2.tar.gz 59548 BLAKE2B 2df98688948ea79b8bbe125735aef04b3ea5d6db4adba503610c3fc88201cd0ae6da3249371f9ef78d1f4650901a02cc25738201e4891695f7726c919dcdd702 SHA512 231663b404e0e7d35f32235c02d4878b41a043054821c3d39d4a05d45c1e45aff0eaffb0a6d96669676b52538ca99a69de64014f922e3c80405d34198c6d4812
+DIST pudb-2020.1.tar.gz 70838 BLAKE2B c0f9ebf88851ebd859876e3e9b29239c72e308d7a544aee26baeb44a47ec3de75aed031ca10ef67c32d0262ffa690bfc063122524e64afa7d5763afb9a5baccf SHA512 4878c3f375d96130ca9a1afe668227b6f08e876e618bcffb47b1507be6bf7a393d88ab5f65f33c6497c98e645a188d5f3eaabb4f6a1e49d8d09b0f8b6b17ba14
 EBUILD pudb-2019.2.ebuild 583 BLAKE2B 39a1ca4bcc2f2fca9ff7347585aade0e39bcacff62d8226131f34c24e5c85534bcf477e060c70e6c70f61913b939c3b1732221b9a89c7e063b007f20ea925d4e SHA512 6a16afc0893e9069127b56b76a3ad60962a9512f81bcacd767e1be40767ceba362ec8cdafc97e5ee2cd3801a233cc9ff56ad19db206c9163645b413efd536f9e
+EBUILD pudb-2020.1.ebuild 584 BLAKE2B 362e2f5435b769c53672abe24537cecfb53a1d57f96458a7b15a7e78cf91c4d7061d7a425da701053ce9c05240f8fd7de9963d2630745aee15a5127f8a605c8b SHA512 5cf84f1c28f30bb4d004232c70412263484e43677eb481728286bb4acb5cd4c6ed97e1be2e895c09b20e2510f72c4d57cfb0e7ca09003304adc048eb7913b90e
 MISC metadata.xml 414 BLAKE2B 1abe543a64e7bbe606dac8849179cdcfb7320ef31a7af659f0deef09cf34a75ee2c72f208637adc20c41fbfe5103bcb3e917d249db77abc62fb8c0bcb8a168c4 SHA512 a9655f42b68e2268f8e54d6a02bf94206ade7251f30ae35a1d9ed4b466901c3a06fc00178b325f2e8fe26e413c27326b826316b78da62ae6c1c0a256a4a12ff3
diff --git a/dev-python/pudb/pudb-2020.1.ebuild b/dev-python/pudb/pudb-2020.1.ebuild
new file mode 100644
index 000000000000..f3ba56f54e5a
--- /dev/null
+++ b/dev-python/pudb/pudb-2020.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A full-screen, console-based Python debugger"
+HOMEPAGE="https://pypi.org/project/pudb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 6c300285fbd8..12bb67833ca7 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,3 +1,3 @@
 DIST pyatspi-2.36.0.tar.xz 315076 BLAKE2B f3f92dafab68ce003e9d63f8ebf901ef834eafb1fab3ddd2051dcfb308b79d7ce6fc4d9187ed51f3af8bebad5e6ef2296c19215ee209ad37fe717f332af8d8f7 SHA512 709236fd992f570426043e32b201bdfee06bb28faa3d1237778f4069d3548b88b8336e53c0951359f5c7e2914b90f6f682ac58e33c84e32f360bdc32662800af
-EBUILD pyatspi-2.36.0.ebuild 1365 BLAKE2B 9ca66d5e794ddd992a031fdced2b8791ed58658d7f60be670d2459350a041a3008fb952eed7b46490f2f039dae831745afdea0ac702032e601d615002dc54284 SHA512 6130a73afecba792ec2a07b5f94a830a0f77d4aca1e0d647f8f272647f77702e07b81ee21719d34c3eb5971d4909f6d8c8fe817662229c5652eff6e11a2aa8b0
+EBUILD pyatspi-2.36.0.ebuild 1364 BLAKE2B db12843f9d7eba199064a549b35f8af9800e1bab74f59a35873ac5386daded841d7a949f70299bb17d313fbc6795ac07c9eea55d67b585142a3bffd7634017fa SHA512 4ba287e69f8c76087cf4940f55f58c4296e579d0dd4a47e9560d76c3cdd897f8b4f1ee194ba69d53ab864fb2c18227918376fea70b421492f9768f6ed9ee8f54
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.36.0.ebuild b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
index 884399242287..b3bff1257362 100644
--- a/dev-python/pyatspi/pyatspi-2.36.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 0d6cce55b08c..d45e017520dd 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,3 @@
-DIST pyclipper-1.2.0.tar.gz 53504 BLAKE2B 611a86b4173838dc0c77ad765f1ab9d08e73b147936ec60fae63308d5bb0019b40479222b80565f3d3ba5337c1a436fa63306105bb3a698592160eb8b66f3014 SHA512 2b8966a695fd7916786ab7549f8c867aad1d4879f3d20b87d7a4b6e1fff8a36871a440795548e91256ff89e574c04be4390ffbd05bab6b0bb51441c7f8acf674
 DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
-EBUILD pyclipper-1.2.0.ebuild 784 BLAKE2B cfb581cdb79b46647a28a71bda3c0867963a630f48c0610bff9988f3c0743012c2babba84546a54944d521dbf481a887962586fc0c891d74caae05f2fb6d9f5b SHA512 f98399301a4e015aac64be5a603961199c30d92589e0f0e6d92a9c3794872e5f6f673174c259d148f3bc30a92b0c65b87dc83f12d51e30f15795dd3297968762
-EBUILD pyclipper-1.2.1.ebuild 785 BLAKE2B d578ce800f96163ef4911150716e4c470f673d448fa7a08bfd4fb155bb9c1488922556227ca8db2649194ade339a296bd36db72aab0e20a557571382d848e6c2 SHA512 33201396f9d2740a5b3d1a4b691f1c3549ff5102649594f58abc15e4e0c548aab5271b14e056c49d775a39a97d04e90fcef27c429f4be5d639d472002116b5bc
+EBUILD pyclipper-1.2.1.ebuild 784 BLAKE2B 5a715ed6e4d4bb14f288ace9aab40b979f641d8312e0f55507435daa0021c42abfd1063842ccd3a8972d7001710038abbe867cbf4dfef249364180cc1562f093 SHA512 33ac5860b47a74be93deedeb60888ce6f8c9134839afe8a6adb8f9fd8473221ffd0fd10106dd7f86eee182fe43c851ea71f293669378dcc484cd90fa0a749fc2
 MISC metadata.xml 315 BLAKE2B dfea428911659d721c46baf73e32549fd98d51aa056ef26b98f305f447292b75a1ddde062602dbe03cf4b7f4e08d0a32a7e085463df1e650ac40f997cd6c0c9d SHA512 15f70085b3bba01136c37bc97ab84749d0d6f99e785c753929c00c3f9de7cec360804f44001954db05d650eae634038791533a1d02e9e1286e8fcdffda3bf597
diff --git a/dev-python/pyclipper/pyclipper-1.2.0.ebuild b/dev-python/pyclipper/pyclipper-1.2.0.ebuild
deleted file mode 100644
index 0153c395384f..000000000000
--- a/dev-python/pyclipper/pyclipper-1.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
-HOMEPAGE="https://github.com/fonttools/pyclipper"
-SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_p/.post}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
-}
diff --git a/dev-python/pyclipper/pyclipper-1.2.1.ebuild b/dev-python/pyclipper/pyclipper-1.2.1.ebuild
index 6b883c5d2dbe..949db123645f 100644
--- a/dev-python/pyclipper/pyclipper-1.2.1.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.2.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pycson/Manifest b/dev-python/pycson/Manifest
index 9b0b0c5c52ef..71ad60335d6d 100644
--- a/dev-python/pycson/Manifest
+++ b/dev-python/pycson/Manifest
@@ -1,3 +1,4 @@
 DIST pycson-0.8.tar.gz 10448 BLAKE2B 55e2ec4a447761d6764e9f25cdff534d3dcdf2a0e3bfd9255f02b1a5cd9834e4f4323ba47a1659ea973f995c34519622e36c691bef763ba83c8caf87fbc49f58 SHA512 873f1b0d825ad318ca5c62fccbdd12a8738c8b9ff58b4fe27ea611aa47575e24218b5010f6d6b12f5ebda835c2778dd15472ca5c73b634b3004aa08496f45328
+EBUILD pycson-0.8-r1.ebuild 489 BLAKE2B 206791a0d33cb28c598028721d9f8d993df47fac2a7e56bf1681fe7fca2e0ac33c693c20da6cd6fc96e1eef70ff5bc2e91f5d587b8c7ea571fb69d1ef3034f17 SHA512 16b5d34771170c3deff63117cc1be428c323f543d8295f2411f6aa83481e78e52c350020b223f3fcbbab07768a45f7879b31b50dc1b1f9e83c38df5716c359bf
 EBUILD pycson-0.8.ebuild 485 BLAKE2B d3c81964bf86b8f902dca174be63ae823c2b4c54f76fa4258bf2817d28c19c57d7d7b8f1d60f4e047ebde5dd5c3d8bce0506280c4b83953fa28896f6650c1394 SHA512 fbe9f6e091cc57e554a6bbd140c3a4efa2c7089aefe1790e00065d3d10edca6a988c25fd8baeceab4d6f61f759e18c9371732ac87baaa3b30da684a71cbc627b
 MISC metadata.xml 403 BLAKE2B e97a1a22dc755326c7d234aceea3d28fc560de8813aa1560477ea3fb4d2a985d43853e3628812c56111d89483ceba23466c79e00fb86a843870d9e03146c2681 SHA512 37a294a6e853785ffc0f49c99a84639057fe6ef783fc304888bb45207cccfe04279e0883a7c7c302ab7764a66711b609f87f2763e8726df49afc68645e06dd7a
diff --git a/dev-python/pycson/pycson-0.8-r1.ebuild b/dev-python/pycson/pycson-0.8-r1.ebuild
new file mode 100644
index 000000000000..67ca8c30fe15
--- /dev/null
+++ b/dev-python/pycson/pycson-0.8-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+DESCRIPTION="A python parser for the Coffeescript Object Notation (CSON)"
+HOMEPAGE="https://github.com/avakar/pycson/"
+SRC_URI="https://github.com/avakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/speg"
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
index eef3a3b631fb..f75f26edea62 100644
--- a/dev-python/pyfeyn/Manifest
+++ b/dev-python/pyfeyn/Manifest
@@ -1,4 +1,4 @@
 AUX pyfeyn-1.0.0.patch 1012 BLAKE2B d3d8ba8f46c9fe6eac5db4183c18fbbe118ba36bbcc3b9a263a470fac702ac81c17bb77acf7b913c3a3bb51d4f12bda60b07d8152a324b8f4c927f1800b104c2 SHA512 43811f881c479062af0376c9d3dbe440383599d7e6937481ad2ca8dbca3ff404ab8d04adaa4afcdf1c4eb001340ed1870a7f50730fbc3d4c458f5d6a1936cc73
 DIST pyfeyn-1.0.0.tar.gz 27316 BLAKE2B f1ece2e64be35f6e64dbe539406462c1802bb0149577662a92658769c1b347c2d98786cd83998e8887cc609f8ffa5aac3e3c995c253f54badd5bed43050dbf0f SHA512 edecbb61cbc63adb5d218cd53e45568f42aa018875bd57485afe612080300a16dd93d1dd0a1286b040a27aaf727a9e35e210f2a2edccaf9e6e114301a91c839a
-EBUILD pyfeyn-1.0.0-r2.ebuild 555 BLAKE2B d2ae8cf15cd5ab764df5cb2ac5aeefe7261982e5299a33215c9fe59f886c3223d0a716b1ad8476b4379ac05419e1ef42db7dfa57a309023b57792af8675a5471 SHA512 1e68b20d29df50de5d01e5f6e3a6f79300aca8a184b3cefca04e152ea6be984d6a5e333e5a2068a7aff857be3eee80830404ae7e2432c5536963b43cc7b26800
+EBUILD pyfeyn-1.0.0-r2.ebuild 556 BLAKE2B fa2d388d486be83249356df9c766aba9781b1eb5f5d9e524e49e3220ea7f8a5d930f3c082e360b11e2e52d7caca625bef21b60b766f1420653e967e6bdefdf68 SHA512 797d7c8519b3124aa32fe21631e9df7302e1b5e9323f9bf000307969730bd4dd4d2ddf74b90a7201eeba8f09787687354f491beac2647c8a8a509cc96f2d82c1
 MISC metadata.xml 416 BLAKE2B c20c145ce1ca35144a1a016795ecf71be2f34ba56a7738ccc4d2593f66c799a30b83424db34cf9f5f500cd8c2e6d8cfcf1cbebfd1104d574fd0bde7a770ba966 SHA512 5b455766710aac2c5d72df7a9385bb343e0a593ac9895f30d8c128a582d4ed775df2e6859b8886adc7b03c119e11da200da670e019e885d3fcd6fb23a3b38af1
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
index 9d17934d637d..4d4853433857 100644
--- a/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
+++ b/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index ab882ca0c9a6..70e1af693328 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,5 +1,3 @@
-DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
 DIST PyKerberos-1.3.1.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
-EBUILD pykerberos-1.3.0-r1.ebuild 1308 BLAKE2B ec9bf5757fedf8c7953f4e1be765c68bce5134d9eb1b4da4988734aef8f5395e989ccc607cd48a76eb8a6643d7414f671723fa1b3bb3455197010f195468bb4f SHA512 0cb3031e9b410ea0767390ed7fc0980aa6b7377affbf53b3f9899ed962cea2e70ad90ea3c400de3d0a60eb66b5f5dc8b61f6d28fff4ae376e22df9cdcd3086ff
-EBUILD pykerberos-1.3.1.ebuild 1276 BLAKE2B aa03d8f0fa10518d3a3c77d04682af40db4d8e325afd08def94eb658558ff81a2903a77945841d91c08d096b40c2d3b937df48d084cb86a1afeac0ecd5d87926 SHA512 86283625526a31af2a06316e07640e847c334ef20b37cf0e96afcd8fa249f89e395d6fde066431a84d62a15118b3e75bce2a9eec76f613a14ce25eb5da61bcd5
+EBUILD pykerberos-1.3.1.ebuild 1275 BLAKE2B 13c8b244978fa5cdb5b4a1bfa73648d8fdcea96bb53008d5a562a47cb2b6b3d3712bd22b1c141333e16c7ea1a9149b3b2b74f74ffbe82efd6652f1391d6b5425 SHA512 ac296adcb41bc62d622237c5be0250e48f7638c13eeb4c43398283b8397f71b883d51b3e3b6dfa8326e7fa80b9e493ebd0bea05a15036c87d0ea846584251a1b
 MISC metadata.xml 371 BLAKE2B cc0afa6647f1f23014d9c89b3efc9f16916f6d703b2866ceaaba5fb3ad3899f18823e7eff64fb55bc265b3159b31b0fe40c302e92f9ebacedaad597a77686230 SHA512 77d94cdf0eeac0b8cf610e916a59d4b364c0196622515fee47bfae41a226f8acbade3d2dbb760b53696cc71f4b1639ad7de670e633172f6142a48c96969e8f33
diff --git a/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
deleted file mode 100644
index 76cdedcbe24c..000000000000
--- a/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_P=PyKerberos-${PV}
-DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
-HOMEPAGE="
-	https://www.calendarserver.org/PyKerberos.html
-	https://github.com/apple/ccs-pykerberos/
-	https://pypi.org/project/kerberos/"
-SRC_URI="
-	https://github.com/apple/ccs-pykerberos/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/ccs-pykerberos-${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
-# test environment is non-trivial to set up, so just use docker
-# (see python_test below)
-# also for alpha/beta Python releases support:
-# https://github.com/apple/ccs-pykerberos/pull/83/commits/5f1130a1305b5f6e7d7d8b41067c4713f0c8950f
-RESTRICT="test"
-
-RDEPEND="app-crypt/mit-krb5"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	set -- docker run \
-		-v "${PWD}:/app" \
-		-w /app \
-		-e PYENV=$("${EPYTHON}" -c 'import sys; print(sys.version.split()[0])') \
-		-e KERBEROS_USERNAME=administrator \
-		-e KERBEROS_PASSWORD=Password01 \
-		-e KERBEROS_REALM=example.com \
-		-e KERBEROS_PORT=80 \
-		ubuntu:16.04 \
-		/bin/bash .travis.sh
-	echo "${@}" >&2
-	"${@}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pykerberos/pykerberos-1.3.1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
index 2ff767672c2e..ab8724e9dbc7 100644
--- a/dev-python/pykerberos/pykerberos-1.3.1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.3.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/ccs-pykerberos-${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
 # test environment is non-trivial to set up, so just use docker
 # (see python_test below)
 # also for alpha/beta Python releases support:
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index e751e89d5918..408f2c7b4ed4 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,7 +1,4 @@
-AUX pymssql-2.1.3-DBVERSION_80.patch 451 BLAKE2B e9ab70a24db87e2f69eb502c491746ed3b83d5b50c8e87330c5e209c4f0b89d889fbba980721958db0fea2c2e0d944d7fd1692f018089946c8dd7c0d6f46ff58 SHA512 e596231f5d2ba6354b8e942d270079bb6ff65ff362640f99e631407107ec11e1f8c20097f9fb614066fde83dcd89d5c64181dddb9bf8c52f12b355e68f248f28
 AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
-DIST pymssql-2.1.3.tar.gz 897987 BLAKE2B e105dd8d5dbbad5de566b9179f799ad66eb420f60464e8061470b1abb6ecf38f35ad7992ded40f2cd62c76a8e04255eb647e30df5c9bc4059334a1d5d4677e73 SHA512 a659cb8f077ddbe5e8de0b9b118d8bcc0c87128c0be4ff14343983e7029594e63ba6fb8a88992dc1f058df3c1ebbbd69cf371bf95a0918954cd0cec14c1cb5cb
 DIST pymssql-2.1.5.tar.gz 167928 BLAKE2B c94fc29fa9d83627dbee05095a7c0d6e4e2d42ac34b0e6801bbc757d89728aee409c98519d6e8bfe8d5009f06f88bd23a3e62c050f2c964cb7139bdd3185a0b5 SHA512 7cc7336d4c2fcb7c3958fb3127801e3505fd93259d1aaef40a67941ef5aa519e285cdb04fd378c9712f29b0f8a25ce1747a4a8dc21ec57b004c9f0ceb8f5afab
-EBUILD pymssql-2.1.3.ebuild 1075 BLAKE2B 3cb7d762753963a6b66903e36fe11e5d89ae2a61ef294390ec35b281290f0f505bb2159c6262cc9c82dbaa0b09a19fb3a39a0a044c728042515936a1c302f34a SHA512 4aa9677d5e99150e340038b960456a87e897f9ce0f00de235c95540724af58062edc9a0feb77220cb8bcef9ef4d32787d91ec63cf450aacac5963368c7398e16
-EBUILD pymssql-2.1.5.ebuild 840 BLAKE2B 293cb1e599ea56e9d8ad58ddc3d2b2f29aaee701ddc062f2440d58af8e465a3e2f139992be5939586630003010e7636f509fe5f38c9f34b3d427784f0848b788 SHA512 a81171ab86accc58beda2d0ee4c53a197bd3c415875015c87553360239827a775ad181929dc68853be8ba8009fc8ad4590065bbe85ac8575b0cd7255f00015a4
+EBUILD pymssql-2.1.5.ebuild 837 BLAKE2B 56faa9add8ed0774bc3498ff797f3fedf82b64172eadd67db4dce99838f8c9ee82d4ccfbc524583fc34353a47de8a6fd160137b6d6dc329e2950d68eb2b5a9c0 SHA512 7a328313cbc1f703d89d0647a8d1b6091f419e22b7f47217f874e6d7dd48a223668b423d5b799d1ed6b2635f523a5b12287a87081d54ea496c15c6f4671d9f4d
 MISC metadata.xml 362 BLAKE2B 34809feb3df73137c8fdd77f5fcc54520593c3d8f82316981c34971ff0df5774a32e1544fe4dc89acfbbacd7b360881a89f8e18000c91648be1fc471c5ae05f2 SHA512 6d33889c3389c738a35383c7924768ce3439bbd951015cc7799f2153585d4ae44065e91e8ec23194be680e20f1caf82e27b4d5650680334baba109f8a19128e8
diff --git a/dev-python/pymssql/files/pymssql-2.1.3-DBVERSION_80.patch b/dev-python/pymssql/files/pymssql-2.1.3-DBVERSION_80.patch
deleted file mode 100644
index 9d72a9817358..000000000000
--- a/dev-python/pymssql/files/pymssql-2.1.3-DBVERSION_80.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/_mssql.pyx
-+++ b/_mssql.pyx
-@@ -34,6 +34,10 @@ DEF EXCOMM = 9
- # Provide constants missing in FreeTDS 0.82 so that we can build against it
- DEF DBVERSION_71 = 5
- DEF DBVERSION_72 = 6
-+# See /usr/include/sybdb.h - DBVERSION_80 is not defined in FreeTDS 1.00.13
-+# (cf. http://www.freetds.org/userguide/choosingtdsprotocol.htm)
-+# 8.0 was actually 7.1 so set it to the same value
-+DEF DBVERSION_80 = 5
- 
- ROW_FORMAT_TUPLE = 1
- ROW_FORMAT_DICT = 2
diff --git a/dev-python/pymssql/pymssql-2.1.3.ebuild b/dev-python/pymssql/pymssql-2.1.3.ebuild
deleted file mode 100644
index 0e1da52fced0..000000000000
--- a/dev-python/pymssql/pymssql-2.1.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple MSSQL python extension module"
-HOMEPAGE="https://www.pymssql.org/ https://pypi.org/project/pymssql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-
-# tests need a running instance of freetds
-RESTRICT="test"
-
-RDEPEND=">=dev-db/freetds-0.63[mssql]"
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.3-DBVERSION_80.patch
-	"${FILESDIR}"/${PN}-2.1.3-remove-setuptools_git.patch
-)
-
-python_prepare_all() {
-	# delete stale cython .c file
-	# this can cause issues with the patches
-	rm {_mssql,pymssql}.c || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pymssql/pymssql-2.1.5.ebuild b/dev-python/pymssql/pymssql-2.1.5.ebuild
index 309b34a4b20a..0c605034ed92 100644
--- a/dev-python/pymssql/pymssql-2.1.5.ebuild
+++ b/dev-python/pymssql/pymssql-2.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 # tests need a running instance of freetds
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 3c5daaade71a..ffa0834cba7e 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,7 @@
 DIST pypy-exe-7.3.3-1.amd64.xpak 13533778 BLAKE2B de70f6b47e9908757ae73c047f04fc8081bb422f5ba6c0e9a865dde2c9aebfc881858194b107bb3e0110d61de718fb8fe7db2aac0885bb6adca101b12e6e400f SHA512 f98b86ed44567979234460fc9df7b79477729bdcc233ab8dd3ba991f80a5f32c9111f263ef4df5b2703581431d7f92ee468f057ce95613deaf35176634f253e2
 DIST pypy-exe-7.3.3-1.x86.xpak 10258112 BLAKE2B 55744bb2b68dee5b959c8976ad62b0e8e4d633f2b31003fc14d8bae82b4b55e7927ea1296501207ee2377df456b469ce3594a65a5171c84188ef22b88370a051 SHA512 baa895377c3cbd090971660edf3b634ada20390ed940c72ba2e9fadce30d3c88125f4c52b11d17160a1ba1331e648d2bed37d6d533866ea97d786634b5ecc0a7
-EBUILD pypy-exe-bin-7.3.3.ebuild 1079 BLAKE2B a5590d42391e69960c2b2e0bf582c004b4e53ed3de39e0bdd435d40e4eb5faf4be39a803d4f056284b73106bffbe1e8102d50f1a60d426eca22b95ab56a5b4ad SHA512 28095ecbfd174fef41d8862264b186548c3e23e885e50f3311a4b37f2ede88279c61c3806d0473de95f6335cc755f10b33336e46bcc63e950bfea53b30b2e68a
+DIST pypy-exe-7.3.3_p2-1.amd64.xpak 13559131 BLAKE2B 85826ef13cc12ec07143b55cd6821f50db821ba3dad351aae90c2beb98b85f51f39ee26626a04757a63e96ef0da6062ad714f1bf96900ef361d61f2051342787 SHA512 5f5566942f6187d8fdf5b05dc27a3eb7e4bfa958da9b39a85a3531c427de89ca5bea16d080dd5450df906e5a3ab56fdb09010a603795a4763b80d5e4ee4ed96c
+DIST pypy-exe-7.3.3_p2-1.x86.xpak 10215453 BLAKE2B 34bbac2f3fab96eb91d2f3a9514e8f1b7ecb342da7402385f6d44755bf31f9b3d76688dcc7446aac2a9d768b588c545c0557e96b2bcace39ee669ab3ba5f882b SHA512 9cfc4fc080ec67a1a28cad2d1a76ffcff0db3e1d02ca2efe35f9dd4931c6d2e58ea9de1b3bd8098fc891f7c4b2ff703e42c77f19bedc837c1f5c4c7dc141f26f
+EBUILD pypy-exe-bin-7.3.3.ebuild 1083 BLAKE2B 09a71e537f6e5503c1e4f48e546a1106d6284755b1ec437744d9331408a1a3ecd9962d25f6f57c48dd12353d981c58148b737e1738fcc8e8da3b29a73757a957 SHA512 35aca37e67a3dedb282c0b3b0f91e7bba4ff4c3a85b2f5b4c5cab40c4d3441721ff6dbbe266c4d7a53b3706a693b3a2918a5b40f1bccdab449ba40128cfc1fa7
+EBUILD pypy-exe-bin-7.3.3_p2.ebuild 1091 BLAKE2B 0be760cc02b31062222064026a7b9841a28116ce108163891d6ace8af7f76f2a384e6948a861345c51df1c26a7087d35b678d15a9ff401009f6076ab3c9f4acc SHA512 6dcc86170c9fd7e88bfc1e9f7338fe53d49ebe5ab84ebb969b6d8f9fdec7bd5cb376e40755b7e240225742d2543921095067c0b24861cfe45a582e9fd9ac9b18
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
index 5f2d59bc5d26..bec05ec196d6 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
@@ -7,7 +7,7 @@ inherit pax-utils
 
 MY_P=pypy-exe-${PV}-1
 DESCRIPTION="PyPy executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
+HOMEPAGE="https://www.pypy.org/"
 SRC_URI="
 	amd64? (
 		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild
new file mode 100644
index 000000000000..23e8a4ef4993
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3_p2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 94cfc472c5cd..764f91622f74 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,3 +1,5 @@
+DIST pypy2.7-gentoo-patches-7.3.3_p2.tar.xz 11184 BLAKE2B b2b9b94478609372d616c65a87cbb12a07e217928beef9fac26c428f81c662ef390db3fd85bf368ffcc8c6fa3802e506412b7bebd14bdc453009008bc3459d25 SHA512 9ab8ed99b42b36e9c212683ef93f7f1fb99caecf056293ab9a5734f8b52eedec192860702baa121630558530cb5c4652f8542300ecaaaa282377ea6456618b95
 DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
-EBUILD pypy-exe-7.3.3.ebuild 4072 BLAKE2B 135173666875141b839f4e10acf42cc0aea15f8f28180443ac5371a2a3b2695ce9f889408d244e3a07daeb02be61633e2adab9c734661d952e4f995c32231035 SHA512 210db2c626605b6daf7b1a77e0238a27afbb53ee98ce7b28cdc91ab8e073827b4b9848d47201122f0bd3f1ddfaa8734e97700f99507d9a1035be4f19551121bf
+EBUILD pypy-exe-7.3.3.ebuild 4076 BLAKE2B 032c50ac8da2a3fa9ee4d84aa715b7092223f6ff61363f2404e7cb74b08d45f430f6e2020ab654463cfaf3c23ec099500e4062d158545bcf2f54becbee6dd23c SHA512 60b28d5095d68f06350204bb72deb10b5e038a35e5ac599f16b89e7d2ab34be21c32ffdaeeed43e8672aa8f81500ca3ee6df03b0f6b9ed882bed3a98dbf23944
+EBUILD pypy-exe-7.3.3_p2.ebuild 4302 BLAKE2B 1b66c71c7584d3b80d686740727c92fe64a4f81360451da4212e5f6618c8368f93df16488ed50bbc94f9472374fac48b7028054b3266c2e01d5826c642f38239 SHA512 b95a9a2558758835ec6302d02fada4b02f3c711ddc55df8728ec9f6b64cf3846ce63f910df458dd47a6a7a17a22abbc7029bacc7527a12233fecb55b260211f9
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
index d1dbbea4e782..b3798107352b 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
@@ -8,7 +8,7 @@ inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 
 MY_P=pypy2.7-v${PV/_/}
 DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://pypy.org/"
+HOMEPAGE="https://www.pypy.org/"
 SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild
new file mode 100644
index 000000000000..b76695a82c8b
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.3_p2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV}
+PATCHSET="pypy2.7-gentoo-patches-${PV}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PYPY_PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 8bd9416ed36b..07723c9e6616 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,7 +1,9 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
 AUX 7.3.1-gentoo-path.patch 1575 BLAKE2B e374b879aabdb1a9b4d3bb07ba03510e9df7c00e6fba13e117dd718268118ade06fa76f7468855463fa50112fb780fddb9687198f4a24bb0a6cc69b5b79e70d4 SHA512 14e14e4c000166bfe3f1cd10377baecc721b43c2df43c0d5d85e8dc6f220e1a453d7fe30cfbaab547e5483f8f493ddd840620b8de4de6d55abe8f9cddcca2464
 AUX 7.3.3-distutils-cxx.patch 18613 BLAKE2B af9f2a5f0248a865d1a5c7423b35a9a14d7cf8a3d885f5ddeafa68b0c0358a0a9eebf5ba1b687558102c3dd4e2a5b4399db1f4f701628b8fff8f0f4d9795550f SHA512 332396a0a1b8181946ef3b70cd76fad8ef6f06b3fc267229ef70fda5e6d48193981ed5620a5f3577a12e3cfda22a75ee4fdad12351a57c9ade96b3f1796d651c
+DIST pypy2.7-gentoo-patches-7.3.3_p2.tar.xz 11184 BLAKE2B b2b9b94478609372d616c65a87cbb12a07e217928beef9fac26c428f81c662ef390db3fd85bf368ffcc8c6fa3802e506412b7bebd14bdc453009008bc3459d25 SHA512 9ab8ed99b42b36e9c212683ef93f7f1fb99caecf056293ab9a5734f8b52eedec192860702baa121630558530cb5c4652f8542300ecaaaa282377ea6456618b95
 DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
 DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
-EBUILD pypy-7.3.3.ebuild 5588 BLAKE2B b75d0ad8122a0dad40597e98fc11a1a895b9aa2c7f1ac3fba85c1c24139baf497db5dbc87136ce6dc63051f20a7939127698ea1e2583522c1f8056c9e8e9fb19 SHA512 7c25c0e7fdad643c44f348b6b202e245ebad8679b3693af8a697c4f04db8bd7a67bbcc6ebb1574b1ee14c3dc54070f3aee6995490134286451227aaa4b4e6723
+EBUILD pypy-7.3.3.ebuild 5592 BLAKE2B 470f10f9d2ce53951adb8cc108b55a504afaf33598ee9e970b57d42aa8b2b554bc4ae41c1d45c853836c0bad73d70572b683bf95cf9ebe65040ed7e3b9f6a19a SHA512 b5095f9cdfdf68cb9049343f8e888a7da94d5f4c272baacc4e4c8be87adede76b5342a3dfc74fc7f09987e122f98f7b0f4d4e1618f3af62273936ee7e71a3f9d
+EBUILD pypy-7.3.3_p2-r1.ebuild 4882 BLAKE2B 53bf57f5c0420e7c09b1a443410a4728fe0536c6bf54ac191c707bb3fd038f9b9297b157ff0424aad9589c1055cb9ab5874d3a791468dc493baeb65051df99ec SHA512 d3704ed1211a8742b9147890937eb7801c12389e67de262d6b010dc7ab04db73e2a6e9c5e4beae588bcb9cd83db69c41171b43839c0a5583d69775ac58697979
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.3.ebuild b/dev-python/pypy/pypy-7.3.3.ebuild
index b3f7eefab9de..8e48bcb5dc59 100644
--- a/dev-python/pypy/pypy-7.3.3.ebuild
+++ b/dev-python/pypy/pypy-7.3.3.ebuild
@@ -10,7 +10,7 @@ MY_P=pypy2.7-v${PV/_/}
 PATCHSET="python-gentoo-patches-2.7.18-r1"
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://pypy.org/"
+HOMEPAGE="https://www.pypy.org/"
 SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild b/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
new file mode 100644
index 000000000000..d9a8bc29d156
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.3_p2-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV}
+PATCHSET="pypy2.7-gentoo-patches-${PV}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-${PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PV}:${PYPY_PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 51d62e795d9d..518d33526c24 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -2,6 +2,9 @@ DIST pypy3-exe-7.3.3-1.amd64.xpak 11716026 BLAKE2B e57bc5e4420bb3d21f8ca9076f179
 DIST pypy3-exe-7.3.3-1.x86.xpak 9041169 BLAKE2B 47a2352407387d96214b0e297cc82504afe8b64378a528349a32d751ac3acb068bbf720165dae94582816a0372d85a8e9ccd9f8d5bf03c63a9f5d8cbc9463480 SHA512 c3c44c1448be6d861ca788e17ca79a4fd68fa1751f3d1f47d2570e1d924343e35e106fee30f7da5b3e14a679f5d9048d5bc263a8ef49cac420349acad67530ed
 DIST pypy3-exe-7.3.3_p37-1.amd64.xpak 11868037 BLAKE2B d23aa2c9dabbb1032ffce4176926f6996427dae05095c0842db3ac046e2234aef160cfcb84b9f2d146b76ae7315dd7d9c3c5ac974121ee876128f8977306e513 SHA512 7e26342c64a678058030bb38c29f5534c25694619942a66f4f507a615ee2798e2f631d81345ed269d252a3e68a79536e9248444c72563dddc1dc0a293457c76f
 DIST pypy3-exe-7.3.3_p37-1.x86.xpak 9133686 BLAKE2B ae8e82cf1820e93a08c85177ba1e6547afa4e063277617efc5ce658b890526f546e7e4d5accf37f2189cc8d5203625175fb5413482c21aded7006208a57afc19 SHA512 ec5d3a521cb1d784b1083f86c0693db180f31015b56feca85bb85ab35dd3d461fc96d31ad7aaf8031ec8e0488151fbd3049cac83bc0edac5df99b062b49eb481
-EBUILD pypy3-exe-bin-7.3.3.ebuild 1086 BLAKE2B 0362afe36e7eb8a0fdac2ea2471f2963f3ebf44fcba18361c3d956c9a6b5c669eef4889401f25d4cb160da052c2df66d72fd72765f8965048db21d977e437cfe SHA512 e8d61b698637d421143b0951610381a32f00aac16bc7c984161e90684c67cee964cda95f418e2125ff26471a20ed831f447916f2fa5cb126ebde458a6f2e383e
-EBUILD pypy3-exe-bin-7.3.3_p37.ebuild 1117 BLAKE2B bf745cabe2c1ed81a366fd5095c9a273877fa1e58f2978dc52d1ab2323d96345ead7ddf35acd3e6d86a3dc0eb6a7f81f468f9b19f3cc264120a9d75ceabf2ddd SHA512 ec5f2c73118651b2f7465a05c0fb59ad4459199a864830622ec08fb83487ea965ba7ed9215e146bf7f93c3f74a45d8b9986a2885059dfbee52113d0d66d43a4d
+DIST pypy3-exe-7.3.3_p37_p1-1.amd64.xpak 11849780 BLAKE2B 50af990a9f636c6f3fdceaaaa6187d9dbc70b0cffd833bbb143379194515ee7a2c7c8289085cbc979cf9448a08ea12c702116fe021cbc24022298caef88ce98b SHA512 b2ec41db00bbc8cf4b610633a0027ea0825d6695c053081195edbd38634609e9d53e38ae72e76a0d53921e6d0adc337ae8221a7658c04cdae1b0702fcafc6f9f
+DIST pypy3-exe-7.3.3_p37_p1-1.x86.xpak 9097573 BLAKE2B bac15c49691ee264c271a1b9a6fa3fe6bc6c35effd8d21477264e2e8f140f713608bad74746ee796b98e94d4e7dc1ea33d667aa89389786c2e04acf31f264952 SHA512 128e9e570a00b684fb0915917b58166049b6280805915952c11a3793c579233a35e917a42b25aa2b50262dc6a0c99ca9e5283f39128973249d8735c827dfc10e
+EBUILD pypy3-exe-bin-7.3.3.ebuild 1090 BLAKE2B 390617c4896666cd2cec904110f26c93a3f3d91c8ba317f90ea7d99bf9fc5977180ffb88dfb8fd3dbc99bf524ece06ef1cec8de0d0e189a66312805439fcc57c SHA512 7d42b02bd9cd63eab8fa747d4a8ab3158c1203b1f97cd546ea48cdf90692cd533d57cf6228eb1319818a88c439c06731c2e4d2a9d75e8d3a8703c011810dc7c7
+EBUILD pypy3-exe-bin-7.3.3_p37.ebuild 1121 BLAKE2B d4e86f61dd2216fe629c60b4a21459458159a95d4c0b9b297ce3c55863a032a00ecefb5b32b5b3df15ad3773e6e8f67cb4ebfdb2dac0cefed017c57a23a5ae73 SHA512 200977ea0e0958e4361e86296617ce34fe0686e5cb450ba8e2f817d34197f255299922faea945f1ba6e60fad6fc88e4bf674451f45d1f6b561b9659fb61d745a
+EBUILD pypy3-exe-bin-7.3.3_p37_p1.ebuild 1127 BLAKE2B 08da61e98198eed1b7989bacc748ea7030cab222b3c043bdc5932dc0ce31df2b8d4b9c759c3fb9b724fd274f6438140b52aba553bc136e915c77d21a34d643c6 SHA512 8dfbbbc20aa7ee40fd332db0517be883c72fd3c93bf7c2636848339666a9dad15019423caad338ae99ce81b4290417f7cc4ef7f17717814ebc03edf223b3a003
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
index 399e5e974ca6..3c4a20b1749a 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
@@ -7,7 +7,7 @@ inherit pax-utils
 
 MY_P=pypy3-exe-${PV}-1
 DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
+HOMEPAGE="https://www.pypy.org/"
 SRC_URI="
 	amd64? (
 		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37.ebuild
index e8930a159077..7facc0539573 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit pax-utils
 
 MY_P=pypy3-exe-${PV}-1
 DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://pypy.org/"
+HOMEPAGE="https://www.pypy.org/"
 SRC_URI="
 	amd64? (
 		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p1.ebuild
new file mode 100644
index 000000000000..c25ec9fa093a
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3_p37_p1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${SLOT}"
+
+PYPY_PV=${SLOT%_p*}
+QA_PREBUILT="
+	usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index f8b66bdead0d..23e4f3686bc9 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,5 +1,7 @@
 DIST pypy3.6-v7.3.3-src.tar.bz2 22484684 BLAKE2B a252e3070ec1c7cfd708cd694bd461d56241100463bac5ff7bbcf2d2667e01990ec8b4ceb947449ab1f620d0d5a8984bd8af3e2565555e5f73218e3c35ae1ebd SHA512 3bc9d9cc362f500e9e79c2694fc355706ac44d6dd5b8f5fb4d017d0997581472a9fdda08ccbe45469c7b52facdc0512be07843ba54d1d691fdb37f6628065879
+DIST pypy3.7-gentoo-patches-7.3.3_p1.tar.xz 13816 BLAKE2B 135a029e2d881ed5e43869fde391571285454b8612f2857fb5fe7aaf5b126f84d01293bd31e7a7746ad03fce1e14ace6a6f9cc2634269ec431b4aabfe70f9b4c SHA512 acf4938bc171e757196cf138358a298880792367ca5fff6b462d6971c8597e064777f99b687cb25003c6f25762a901ed482eebd791fdb008fa729ca9c9c300e8
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
-EBUILD pypy3-exe-7.3.3.ebuild 3639 BLAKE2B fe0f59c5ddc0ef6e666199d23d0ae07ea1e24fe5bdcd4bc5ed942944bad4174c792a79558fd8b8747b1d63c4965c2ab518318bd06ca3ab5a9bf32cb140636e7f SHA512 672da7049027a32459ecc9868dd6940a57db716c561c289bb6d32bb6f38cf30c264876a11b9f116a6f86bda667cd07ce775a6b3d9c0e80ff29b0348e844351a0
-EBUILD pypy3-exe-7.3.3_p37.ebuild 3680 BLAKE2B 37640296820c961bfb69fd153faafaa03693758be90ec58c5b5bcb586fd12d4af9033e5a39a3bcb671c24f1e51781b793a97769494fdf482c2fb17dd8883513f SHA512 bdb87e56c6577494a6044157b8f065676cd331be132117155a9d2f1838719afb0af84b5f0344e84b16ed7f1e27326de78550da8af642e0de66be150b484fd8fc
+EBUILD pypy3-exe-7.3.3.ebuild 3643 BLAKE2B 5738a151be6dfda7631333ed592d35932057aac63593b054e21005f632c8d79265b248eac5e9955c36b87d66dba1948046aa219d43201abfafce9db1bc541227 SHA512 21417e375877037ca0584cb7f4dae4f9bdd60c0394e36ebe11d5aa0503e6ef712afd27a8123af2d1324cd4e4ecb77ccb3328b60422d57a5dfaf41a8001f57971
+EBUILD pypy3-exe-7.3.3_p37.ebuild 3684 BLAKE2B a7aca5e0bab7853edd21ce1ce94ce98689347e687835adf80f99cd737a5a545cbd39ad031e6f18bd36664dcfbb45a99e636ef682a8b78059b399eda5b8e19be6 SHA512 5c65b0855ada4f1ec8914076dcee97327e024d452d06aafd4a3277e98e1be330d8c3f41c9180ef0a4bb61288dc7b39ac8e83b81f14bbb933407943729654a3cd
+EBUILD pypy3-exe-7.3.3_p37_p1.ebuild 3877 BLAKE2B 8e51c2e911a7ec9aded060d86ef67748a07345dfe179035c52f68ddfc696afbfd40e492830ce92abe92c9de9e0425e6a2e528e23995dba5a7e4942fe8d00119c SHA512 33e4f61c2d68a32ed43a476606df2fb76e431b315963de341d6ebc09352d930b038b54f6d619908d05b6fafe9c58defaa4c0cc3a9a2b229c87139320a0e14563
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
index a5252cdf0580..47842a1b89c8 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
@@ -9,7 +9,7 @@ inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 
 MY_P=pypy3.6-v${PV/_/}
 DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://pypy.org/"
+HOMEPAGE="https://www.pypy.org/"
 SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37.ebuild
index 5992fb3e87ef..e18b6cd2b56f 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 PYPY_PV=${PV%_p37}
 MY_P=pypy3.7-v${PYPY_PV/_/}
 DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://pypy.org/"
+HOMEPAGE="https://www.pypy.org/"
 SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p1.ebuild
new file mode 100644
index 000000000000..27b0473f2566
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p37*}
+MY_P=pypy3.7-v${PYPY_PV/_/}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}"
+
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PV%_p*}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 61917669a73c..ab23a58ec28c 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -5,7 +5,9 @@ AUX 7.3.2-py37-distutils-cxx.patch 14756 BLAKE2B 3524f2fbeef2b23a17c2248fbe07e0b
 AUX 7.3.3_p37-sni-handle.patch 1971 BLAKE2B 953b55283d9aceddf0dd6e6e6b786c3a472b012cb78e2398d58bc7f3be13438fc74aeb2c7d34de45d59546087b78b0f1babca0038c6f097f629273f41bf259be SHA512 6573a966a6a3f1256cdd8a97ac43088b1328fc8d7c3b386b784a2e4ffdfbdafc791f37e5ac3dca0cd0ad0b12e2aa9992e4188fce1a67e57f79c7cdaae7fcc44d
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.3-src.tar.bz2 22484684 BLAKE2B a252e3070ec1c7cfd708cd694bd461d56241100463bac5ff7bbcf2d2667e01990ec8b4ceb947449ab1f620d0d5a8984bd8af3e2565555e5f73218e3c35ae1ebd SHA512 3bc9d9cc362f500e9e79c2694fc355706ac44d6dd5b8f5fb4d017d0997581472a9fdda08ccbe45469c7b52facdc0512be07843ba54d1d691fdb37f6628065879
+DIST pypy3.7-gentoo-patches-7.3.3_p1.tar.xz 13816 BLAKE2B 135a029e2d881ed5e43869fde391571285454b8612f2857fb5fe7aaf5b126f84d01293bd31e7a7746ad03fce1e14ace6a6f9cc2634269ec431b4aabfe70f9b4c SHA512 acf4938bc171e757196cf138358a298880792367ca5fff6b462d6971c8597e064777f99b687cb25003c6f25762a901ed482eebd791fdb008fa729ca9c9c300e8
 DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
-EBUILD pypy3-7.3.3.ebuild 6592 BLAKE2B 6495b67c88ef6ca88f490d55a129b41ca6913d2c9d229d7af88db36efb8b5aec6642d503029dcf774660d6ca512490fbb377563b17343e2f85dd0ecda6ef5643 SHA512 ce4b59bd08bbe62853a166bc010ea5474996da48df396c945bbf1fb3dc413f8e85351fd991433d43155f486f058bab52cffefbf1d1041b369147db37f5c0921b
-EBUILD pypy3-7.3.3_p37-r1.ebuild 5525 BLAKE2B 81f8f24b6d86d769f24fba4549ba2f5566a4a6b6417d8cf39b7b3c46fd7adebc4194ef8c1d9617dd09c0a29f63be21ad4349cb9c14a777d6583232d5498265cc SHA512 f78a86ac32512a4f153189eff473f5f2ea18791a30f446ca44e3127cedeb8219142e6531e83ddf1be88cbfd0b11df65a166623655a604a0946db4256a6fd0b7e
+EBUILD pypy3-7.3.3.ebuild 6596 BLAKE2B f650d562771fc3e668fdf0ab0749ad84ba06f9b2ea6738da21b4f92d0acf65a487ec6d5088b99c9f56f681cc609e89a1b94f1fc53b2d79159cfabe1cb45a2ee8 SHA512 91ebc84c7c10ef44d613a014d9609a25ffdac0556a9f0ce2035f4329489d85deac80857b0f7f4f1c88e6d8d8b0c6ac2a3a8896fa70c9608fce2534a9c9f1ed5c
+EBUILD pypy3-7.3.3_p37-r1.ebuild 5529 BLAKE2B 7b4fa1b5687d4e3c15daafed23b5a1d4e00c0c5b46c50d38dbefa024ca464dfc415e74dea6426a0939690af6da9954f6f61d4f7c929028dd289cb01005976c15 SHA512 0421de6f206a4a111978589c477b173cb85dbc6cface5b8bdf11c0b18bd1a573dab7dbc1725e306fb963947eda5c6ae94ae963ca474004e1f495a236078bc174
+EBUILD pypy3-7.3.3_p37_p1-r1.ebuild 5265 BLAKE2B e31a9266cb254743c93743db0f0a489a33fac8f62ad2c237956223638c6ed891166c61d091838b67b3bfcfa83ba03106d4ca3a15e340ac85926f9d4c54b3f57a SHA512 975aff4e97dddbab316dbf5e86f6823dea0c5a2ddda76b47c1ce8327d309677e3e8f6cb95690daa4ec53dc130956ccb827c956c5d67e9e334d7906bd40b9255d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/pypy3-7.3.3.ebuild b/dev-python/pypy3/pypy3-7.3.3.ebuild
index 6ed44f0de18f..1de8b40bb880 100644
--- a/dev-python/pypy3/pypy3-7.3.3.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3.ebuild
@@ -9,7 +9,7 @@ inherit pax-utils python-any-r1 toolchain-funcs
 MY_P=pypy3.6-v${PV/_/}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="https://pypy.org/"
+HOMEPAGE="https://www.pypy.org/"
 SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
index a5d9d3cf0aa9..235d4e09f2d7 100644
--- a/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3_p37-r1.ebuild
@@ -10,7 +10,7 @@ PYPY_PV=${PV%_p37}
 MY_P=pypy3.7-v${PYPY_PV/_/}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
-HOMEPAGE="https://pypy.org/"
+HOMEPAGE="https://www.pypy.org/"
 SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
new file mode 100644
index 000000000000..f41ba9dd6fd0
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p37*}
+MY_P=pypy3.7-v${PYPY_PV/_/}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy37-pp73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+# pypy3.7 is in alpha state and a lot of tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PV}:${PV%_p*}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PV}:${PV%_p*}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pytest-flake8/Manifest b/dev-python/pytest-flake8/Manifest
index e23f496e941d..9ebbf288ef13 100644
--- a/dev-python/pytest-flake8/Manifest
+++ b/dev-python/pytest-flake8/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-flake8-0.9.1.tar.gz 7959 BLAKE2B d0ef55385dbbf47968abdfc14e69a0420cd52bdf65c0f74ec72abeb1ab28ad27806593dd592f448f3c01dcdf29af4042c1e1c8affde46a1405ba7b4155c174a4 SHA512 eeb4f66022e367d92dee94544ae8fa99b79c1de0579a80e91c22e6f050752010cb7ad6c24094736d23ae753615b186a957b8b0f94c09754005183a971a1e4aa1
 DIST pytest-flake8-1.0.7.tar.gz 9560 BLAKE2B 056066a6693fa6988448662e52856eeed49688e834b344e5f60f31f1c3b3ef89043dba06bddbf958b042ab9e702fec056784b252e96c8b4b46fe350a801535cf SHA512 16e7b437ff9fc9afd3520f6b81d9eafeda840c7cd7925f5287ce0e0d5b20a0fa758183cea7ade369e3fec8606eee976e84c5b3142923e4586f559232012bf3a3
-EBUILD pytest-flake8-0.9.1.ebuild 671 BLAKE2B 602e62bf93e44016f378e1a9e41f232d50d86a9d0589c8f3476ed0b70cca0c85601da4903516bc560e7d6a26eb179743749e1ab89d1866ee0947082c2da63d92 SHA512 d8374b5671a7eacc980b8c98e8dd4979d74387d40dbd62f4a3fefa20a253f2a383c5011bed3ae6cdef8ef0a5ff45d1c04f344541fbd1d8cddba72f3ebfad922d
-EBUILD pytest-flake8-1.0.7.ebuild 570 BLAKE2B d1b24de3f9e48f8988e1a11b0c6f91ce130ca7178119556382473a7ac3259135b62c6f7429a022bfbd002dc1d4406e17e35646fe5fb0d97732474ed594485505 SHA512 b3683925b92bfe44485ef717cf8613a74b80f21fe83418d270b63e792ab11342f0730a27b5aaa57f74a8c636dda84a4b6e0663ffd2e0bfa7e398cd4179c5a413
+EBUILD pytest-flake8-1.0.7.ebuild 568 BLAKE2B 0b2ccbab5a9d196a5b5cd8289ae509953b87db073c98f220dd23858ca7529bbbe9c9a7a02e60bc95688f05a8513e95743da5aa2c95bb919a1b5473872a4727af SHA512 858d4d1f2cfec9d780c180ed075664ea03a7c62648450155ca23aa41dcf357e15478b59cf1752bbb56f274e9ea3c2be6fa7dac6bdf4b690141dbb195f3212260
 MISC metadata.xml 532 BLAKE2B b9c44db2f3d1692ea5d6b7751df933ca36b8d22a6dd9f234be7b7ad388bb382d76fbe0d2222ac1824e8d0c82d07eeb3b0c538566bb40cc4b6cfdfb25927db513 SHA512 007b524192378cb468c161fdd1a3e847f6e0e1388e3d928348732ba02a0fec4894fb5b1f1b744087d3d49ed83d98c2cbf499474f4289331696ce621abd9fe4ef
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
deleted file mode 100644
index ff60840deaa8..000000000000
--- a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for flake8"
-HOMEPAGE="https://github.com/tholo/pytest-flake8 https://pypi.org/project/pytest-flake8"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/flake8-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	pytest -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild b/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild
index 84c861885f25..5c07f0c34d63 100644
--- a/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/flake8-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index 20143a8d3525..3af29bb378a0 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,3 +1,4 @@
+AUX pytest-salt-2020.1.27-r2.patch 744 BLAKE2B 43eadb0fb01406efb9e67388a6b0ca5a021ae6ec622ec5dd5dfb1ab9575489c711dc805ce64e1373e4a0044490d71132ff4eb9584f3e9f2fb043a168d18d8349 SHA512 b0a0d56dc7d5ab43a1970488128c97de5f2c266523889896cab53040cb8eb426bda88cd8d641d706b6d09fbaf1b3f439cbfe947264cc004e766e6cc84350076f
 DIST pytest-salt-2020.1.27.tar.gz 64141 BLAKE2B 2b9261af2de28f8dce1abcd71b586594075916c8a5dbb27a24f15b9d95a575624be118d1c742f02020d3b968ffa4654cf6cd0dabefffe6876b87a4d1d58c3d60 SHA512 b0632e21f1ea5c3b57eb681cd8b270721cafd270321b708fca65427fc89817ed9e9a4216a520f35988c6866b1ed76ed84838009da9052a11cf8782d4dcf118ba
-EBUILD pytest-salt-2020.1.27-r1.ebuild 932 BLAKE2B c91d9cd7550e2851495bd62f23cbdec4a6478ee3e9b9e7fc1bd7a9ad9164434ffb68c61eadb03652f908096042c976bd9c4892a5da5fedf9c34a7fb4006d2f88 SHA512 927ad629be37d60d94490c6ad0a1c9d190f1661464a55884376b047e33d3978e69f1dd6f865605695434c226587f436c923a8acd8260d4191b703c8dfcb651f2
+EBUILD pytest-salt-2020.1.27-r2.ebuild 985 BLAKE2B 481b1562789969656c0f97ffb19bed526af1190e55adcf31ad257de8f27bafc9116da616b44a334e17cd8030e99c4fa9e15474450fc318509f7d876f2384cc1d SHA512 bff1f3f05ad4bdbe1578a34d3c6c6fefbb02bcb02f5f93b86a6fa5461adac2df345db492a6be4f10f37ee572173dafb09ac650621ea52e9b56d7e88feceef0de
 MISC metadata.xml 323 BLAKE2B 2eede80f9d146aa2dc511191d1e1ef7a689786878c2ba77ee62dc181d49ed07475f657886e6f9d662140ff378ddeaf65f979a6e483b92ff97834e934b225b430 SHA512 ca8b7955dc3025e3ed15ef0556b02a80b033dc2003bbb3030b42112e04d1945436a3ff2224bd2149ec34210d50a66fcc0b1577dd1464fc8e1e4ed097286e02a1
diff --git a/dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch b/dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch
new file mode 100644
index 000000000000..35dca262478b
--- /dev/null
+++ b/dev-python/pytest-salt/files/pytest-salt-2020.1.27-r2.patch
@@ -0,0 +1,14 @@
+Fixes a Doctestitem has no attribute 'fixturenames'
+Fix by David Denoncin based on https://github.com/saltstack/pytest-salt/issues/48
+
+--- a/pytestsalt/fixtures/daemons.py  2021-03-02 15:19:40.500254583 +0100
++++ b/pytestsalt/fixtures/daemons.py	2021-03-02 15:20:40.706920871 +0100
+@@ -1658,7 +1658,6 @@
+     Fixtures injection based on markers
+     '''
+     for fixture in ('salt_master', 'salt_minion', 'salt_call', 'salt', 'salt_key', 'salt_run'):
+-        if fixture in item.fixturenames:
+-            after_start_fixture = '{}_after_start'.format(fixture)
++        if fixture in getattr(item, 'fixturenames', ()):
+             if after_start_fixture not in item.fixturenames:
+                 item.fixturenames.append(after_start_fixture)
diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild
index 65b1f4a6405d..f3d2b483cbdb 100644
--- a/dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-2020.1.27-r2.ebuild
@@ -28,6 +28,10 @@ RDEPEND="
 #	test? ( app-admin/salt[${PYTHON_USEDEP}] )
 #"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2020.1.27-r2.patch"
+)
+
 # tests need network access
 RESTRICT="test"
 
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index 0181f67676fb..f3867208ab36 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,5 +1,3 @@
-DIST python-libevdev-0.8.tar.bz2 30375 BLAKE2B b59a705d49a54d5f98bca3bdf97038128df35294d4e62ffe058021c4da846e75a372660a4beef7e83dbf5b16a4d7d9195547f713bd290b14ca28ecd9291ac641 SHA512 c3c35e82b78f8968c930883a99def348a012a05ea122ac24e757441e81079f7c12bd50d96e8cec7b799a2d775d834859f924e8d1dc5841c718c050287fd1beb0
 DIST python-libevdev-0.9.tar.bz2 31496 BLAKE2B 4802f1528c104b0717f3f3a450e6e704232d5045ac285b96eb3eb690f120969ea0f23eae1da6013b260627f18b3e58e55a5017401928149e9cc581d9a84fad70 SHA512 77dcb18c393fd7962887d477292ec359c65404ae126624dc5ab201528e53b9fab565d5c6acfe2908f4a03a29e09fad862220246b91a92cc5f69768a31d1ca808
-EBUILD python-libevdev-0.8.ebuild 585 BLAKE2B 6485769ca5dfbb0f85909092a323fb07fe18bb68abd0730d8a2775faa95b18ef6f90a11897563fceaeb002a188da186d27a8b9bce613e06bbda5548c5b1b1d10 SHA512 2feb9888b86d4281f149e648acc69a0935bc031f8f7b88e1d0c5761b32fec66f36a8cf827618267b7e6bcd56366e31f952ec55803dd16931d535fa2f78d4ad38
-EBUILD python-libevdev-0.9.ebuild 628 BLAKE2B ec419e399b103fcce3d3270bbc20f2df12f55c417cf2f6f72ff1b914ec69978a41c0be5533376d9184da98f53dceecb016821d266ce497594058c7f8a7ffe99e SHA512 7e05657063e442f8b92d330855f9848d44245a13c06bace7ab871e1891cfc397b9e71f683418a44202eb84c69db1145ee40bf5d296df12a06a50dd9024267277
+EBUILD python-libevdev-0.9.ebuild 626 BLAKE2B 638e037bcab43b5f98fccf87135c0b2e586dd34474068bc3ec5010c1fd8b8d8869be32a55e8eb65c73f0120d183427e73dd4a9f391fc89362431c2b517476f5b SHA512 50e3d1b629c01e1ea45895a56850c01005c3f3356706eb94015f3747cbd2075f6d300fb9216c52ae5572a0545024b0f997f16a2055cca523cb7a1d4364e20fe3
 MISC metadata.xml 305 BLAKE2B dfcc352aa29bf0497e41b9ce993e525211a1d673fd3c7ce75712ba1441faae1841a57885fffa358674dd03cb67b0e2c423a90b047c3517524a76f97ca1e9ab0f SHA512 e4f77ae903c4df549c7f730b37110adcab750d694a9d66d4d1c8c02fe327da783836e65edfc91fb131901154cd69c19fa250c9a000103ab631897e358fab0ba5
diff --git a/dev-python/python-libevdev/python-libevdev-0.8.ebuild b/dev-python/python-libevdev/python-libevdev-0.8.ebuild
deleted file mode 100644
index 99a2253e262f..000000000000
--- a/dev-python/python-libevdev/python-libevdev-0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrappers for the libevdev library"
-HOMEPAGE="https://gitlab.freedesktop.org/libevdev/python-libevdev"
-SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-libs/libevdev )
-"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
index d49c4b5ed215..d55a2bc9813d 100644
--- a/dev-python/python-libevdev/python-libevdev-0.9.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 91c0591dca44..7af238df9410 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -2,4 +2,4 @@ DIST PyVirtualDisplay-2.1.tar.gz 40798 BLAKE2B 315bb794b81948357919e98637b6276cc
 DIST pyvirtualdisplay-1.3.2.tar.gz 38532 BLAKE2B 2c0cb3af426abc58dc895667c5fecb40ee9aa870dbb08a51ac32fbd5bd3620b97498b3dfc6e7026362604c82f67b60885370f0704a1349a65668628d9a21e80c SHA512 422e1530bb740fc77cc0b7abb73cb8e7326689c80c5f49b58be70b262e8a2c28274d3b83a0ec7753adfbf78b780047f61cf7b18fb14f935d483a5e3d04953210
 EBUILD pyvirtualdisplay-1.3.2.ebuild 1378 BLAKE2B 251f36c32e53a76604d98d8166e6a32e5a663994c6729cff60d0e759089d3cc52a87d459e41783c4fdcc68df2ed77d1979bf92b4c288c92ce52ed0d7a90cbaa4 SHA512 ed8dfae1439ccaf1c0b5936024f9f91ebafaa0efbf324f0d8070797a3c6c2dd2751b672cdb5b39acc56c79a4faf9de4ce6683513b1faa6de224719e2213840dd
 EBUILD pyvirtualdisplay-2.1.ebuild 950 BLAKE2B e351abd07253bea2a2a16421e96fc3d6e853e6f9a0851969da6d39bc23c1378b8cc9637ae4a8177afffc1b091e6c0ce9a06dfd699bb905d02f4b5e80eacf6d89 SHA512 68d0bb13e235b2515ecc30da4135ca5ea401c2aa9e7148e232b405204a02468f31727caaa6091788e362a9c47bc0adacfb3eb2093046d78d4a1246256d9fd1e9
-MISC metadata.xml 454 BLAKE2B 175cc198884a009e32e480e1d98a7fe9454be85ba6d5760d29e5f211eefadef768c419d04bff83ca7eb217b5ca2654526acd11437494da37df770c34159dc34d SHA512 40c644fd60022874585532c2e822aa7e12047c252415fc3a2b6092a3e359e23ea7a51a9ee371f89e2e5b505794dc3e935cd697ac2e85a66c68867eaaf5ecb3ec
+MISC metadata.xml 555 BLAKE2B 226c0f1bf5691e6e3c2c7e092df25cbf3f52d5aa9138e393228381de08acdcc64e3860a7c8ccda30135ac702ffcc57718a4c4c1ea12846dba20e34812a36b6b7 SHA512 0d29bd64e163061ad69b87bafd41fec8ea618437ddbdc1b7597e2e5182cb516a266d8246e0a6f10d01b6feaab96552c9e35b619afb9ba2cd55d2f5fe23366462
diff --git a/dev-python/pyvirtualdisplay/metadata.xml b/dev-python/pyvirtualdisplay/metadata.xml
index a1cade085938..aac1da403ec7 100644
--- a/dev-python/pyvirtualdisplay/metadata.xml
+++ b/dev-python/pyvirtualdisplay/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">PyVirtualDisplay</remote-id>
 	</upstream>
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 8946b73a13d7..199f7be1d5bb 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,5 +1,5 @@
 AUX pyx-0.14.1-unicode-latex.patch 600 BLAKE2B d7e2b4804731372b8b149b8e50ed6163297e60548c479aad8d796df4630f87e3df7e28379c6e88158e135f1b2e1eddcc712828efdd3fdcae501681bdf5e602f0 SHA512 f2a6af35aeddcd10d936a9ced93f708606bccb9f249bb45c6cf86111744f7efad9c08e9ce9e41d63b04345069e973e2ae69df5a2b004535bb0fac09dbee3dc90
 DIST W3C_SVG_11_TestSuite.tar.gz 14651624 BLAKE2B 680059d8b20775725cebb3aed4444acbc3222fde880ba93ee5186c99fc12afa8df2c790bdacbcd6e5ff4ab00e697d8317a9a6ae3039b8b2f02cf7774a18ca533 SHA512 e28e3996284c3f3e423e2b6957cddea71980bcb781d4180894e08f37a7ecce9c6021917329d6d433dcba792cbabb15c7cd503076e616ba5189193a5c554374ca
 DIST pyx-0.15.gh.tar.gz 875286 BLAKE2B 49d36e1c0df3ee47a895279d7f296194324cf1582bb7db0259bcd01c9b17c4d0903c25fef10c7a22635fac62dc6378ffbece200eac99f75bb3ce81d48a71a0d1 SHA512 a7debff01f8055455855f4cac5a08d00c22d20d7918bd7341d2af83844223ae8bb23bbbe92149403656e18ffb8861e8568dfdcb59cc01c55ec60e63b62a8825a
-EBUILD pyx-0.15.ebuild 2100 BLAKE2B fc55140829d12181f74dde82a848da6adc4c5ca1002224cd801c8e41eb198f439a759baf935f7098869b80aca581e9380c33443b6d471c64b419e239ebc398a7 SHA512 dc98f29e8c2fcf760eeeafae3eefb6ddd2e777655e466951798eb69ad2dc5f3731925337ef2c3184d43901941191eb9ff6d5fc4f832be591bd70f22e949ac91f
+EBUILD pyx-0.15.ebuild 2101 BLAKE2B 96ae821b8ed0b2decdd83d8e161acfd1042eede9ae5b2a6942ce97d4429df932c41614afe454d7f4b12ce21201e5a49d2954e570c846345036b0680bbbf62cd2 SHA512 f83c165ad41c470659b3d60de980cb626d5dee57428e64602ee6c06c55716c4a00082a195b19161e8094023d27022c5a63b93ff34e298a484661a27775ba5532
 MISC metadata.xml 697 BLAKE2B 2d984a09f5eb4d0fe1b89afeacc36caa432f084463edb41765afc76b46408e30b79622d5bc7471c8d32a4e5da2eaf7811b90e01758d3cd33fb92ca74ba244c2b SHA512 e419d66836f1eb654be38beb748dd7f3390204e27e5ea0d832106e1ef0aeec93cdc065f962aadb4425f33bcbd42b3f34e6d739e9bbbf571347e6405843fe613a
diff --git a/dev-python/pyx/pyx-0.15.ebuild b/dev-python/pyx/pyx-0.15.ebuild
index c6f8080843c4..c5277d7a5fda 100644
--- a/dev-python/pyx/pyx-0.15.ebuild
+++ b/dev-python/pyx/pyx-0.15.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 1f4bd8ebdc94..b7b23454f165 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,5 +1,5 @@
 DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
 DIST pyxattr-0.7.2.tar.gz 31550 BLAKE2B 3505300d7a50dc305068740379bb8edbefa29f228c797e2e74467a51f4b0a6b740203f89b8ed461218978214213a6cd778107f58eb07a64d6b45e25d0fb769ea SHA512 fb9b36d5d2fb9ab674daf40d6f5c7dbe50d847dcb6d9955d270ef3aed2d8e3540f8feebd934009f47d63f3c55882846a20f7ed733b0d0c004e7a1984e7106206
 EBUILD pyxattr-0.7.1.ebuild 824 BLAKE2B bf563eaaa4ae394748c7be5f6fa54e306efa1435e73a6e6677e7dbc94a23a57ac073c31dcabcc00fad70dfaeb805b2b6b3ae015b815bbfd91083fab8feb66d5b SHA512 c41ae555d23866dca2ec2c9d7e1185aa3bf676641a3b0a24d882f8e9f83c827f6db4b7142834fd02afaa345b6245c9cac4c84fc3c6aba41e020d947eb9c8a7b9
-EBUILD pyxattr-0.7.2.ebuild 828 BLAKE2B 2659576cc675e1912959801247b842c43e607f9c349885dff803a6f96093e7a4acc2fd12d8bcc1e659a81675a1a6772ba2d0cb10e40243673a9e2cdac583549b SHA512 61f3fae8d21eb2ad014bbf121049e0cfb8a7e8ba14050e3195a04aa575a99f4d377761f4a3ec17c72c61fd47d407bb848d83c7d926762a32badc700acaf31451
+EBUILD pyxattr-0.7.2.ebuild 826 BLAKE2B 40bf37b2f3a1e7300863c22dcb5a98187051b8590e232fe8a65ad00fad262ff101cb77164c0f7f5a3e5397a5640eacd27ecdc8816bf87ce9c4fc8a65475a44f9 SHA512 861b16dfd9561684a951395291e90d01dde2b875d6e008f0448c8273cfa2ba25fd172a7e7a49785b61536db337ba2d22829a66645c449a0437b30d579aa06698
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.7.2.ebuild b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
index ddf522acafa1..16e0011df0e1 100644
--- a/dev-python/pyxattr/pyxattr-0.7.2.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-apps/attr:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 4751e99f5966..acc9337fd2c5 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,5 +1,3 @@
-DIST pyzmq-19.0.2.tar.gz 390927 BLAKE2B d70a2f615782cc5a53ed2ffab4d5549bc5d15cc1e0e63f640a357fe8575ca327a5976a3e8b11d97c236a31ca17025f37fe423d166b684b5c4aafc139a0941492 SHA512 7f077ed3858c226eb1e3f5e51dfb5d4b517ec94357b37cc66d17cfe2543786b86627ce7eb4c12785a2709a499af998d02642d972c119a637df3cec5201e909d1
 DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
-EBUILD pyzmq-19.0.2.ebuild 2963 BLAKE2B cb100a32bac4365afa3e7d0432139aba431d413915864f881f68426dff3753970d27a039e5d985aad76267c4767fe4a5b87ff3bd33dbfe0e551860902569f265 SHA512 8ba857d924fd33e98edd7cfc0f2231dad44c32614b5d1479aa38870f77dff3e489a5ade041c5a51a0af700b223825785ad4d5ab94e1e90dcf8102c6a651619d6
-EBUILD pyzmq-20.0.0.ebuild 2661 BLAKE2B ccfe42c2159633441a81e4be9dddc68b2b62b802ba5a9056e3bff2a2894eb6f528c7aa77f96ce8670e8400c444928843b7a9a39e047838a1c0552331d3530bdd SHA512 836b3dbfab749414a9336aa89d27336f206ee269ac11886d9e211752a039facbdab9369a57141a3e225aa5d239f5597402fc3a11dbd556dbf5ddb2df5447114f
+EBUILD pyzmq-20.0.0.ebuild 2659 BLAKE2B 2f5dee8b07747248ab391f447f558a1036b2fe59042501abf5ddf5d823973384b764816880d204879d39d650dcd1b14db64a7c9dac3a515f906f8618db5ebe4f SHA512 e0344b38a4df8f68ef0461a0d67ea04eb9c73a644b222fe77bfd24329bc7f290c26d23b24426944ad0474593b1ed10d1692da1123949d9de24f7709f2597b97a
 MISC metadata.xml 428 BLAKE2B 36d5533b4bcb9fe9aa69847e05599da6400c634c73f1f00321e0a4492b053fbc9e1fcf0f9a22782162b8bbafadb9a343b19da35e732e7898fb3784473564438a SHA512 af1c8716dbd0846be80b90587ffec0c51e0f56f277a659cce15f1114cc0d3889ebe9fd92fdbcdc62b04a9919f48037b44153f7cb5e66d4719ef649aec933ca12
diff --git a/dev-python/pyzmq/pyzmq-19.0.2.ebuild b/dev-python/pyzmq/pyzmq-19.0.2.ebuild
deleted file mode 100644
index 8e03f123eab8..000000000000
--- a/dev-python/pyzmq/pyzmq-19.0.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit flag-o-matic distutils-r1 toolchain-funcs
-
-EGIT_COMMIT="dd4dac055152d47c829034224cdecf594c7b3f12"
-DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="
-	https://www.zeromq.org/bindings:python
-	https://pypi.org/project/pyzmq/
-	https://github.com/zeromq/pyzmq/"
-SRC_URI="
-	https://github.com/zeromq/pyzmq/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+draft"
-
-DEPEND="
-	>=net-libs/zeromq-4.2.2-r2:=[drafts]
-"
-RDEPEND="${DEPEND}
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/cffi:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	"dev-python/numpydoc"
-
-python_configure_all() {
-	tc-export CC
-	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
-}
-
-python_compile() {
-	esetup.py cython --force
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local deselect=(
-		# lore says it sometimes hangs
-		zmq/tests/test_auth.py::TestThreadAuthentication::test_curve
-
-		# broken tests
-		zmq/tests/test_auth.py::TestThreadAuthentication::test_curve_user_id
-		zmq/tests/test_constants.py::TestConstants::test_draft
-		zmq/tests/test_context.py::TestContext::test_mockable
-		zmq/tests/test_draft.py::TestDraftSockets::test_client_server
-		zmq/tests/test_draft.py::TestDraftSockets::test_radio_dish
-		zmq/tests/test_message.py::TestFrame::test_buffer_numpy
-		zmq/tests/test_message.py::TestFrame::test_bytes
-		zmq/tests/test_message.py::TestFrame::test_frame_more
-		zmq/tests/test_message.py::TestFrame::test_lifecycle1
-		zmq/tests/test_message.py::TestFrame::test_lifecycle2
-		zmq/tests/test_message.py::TestFrame::test_memoryview_shape
-		zmq/tests/test_message.py::TestFrame::test_multi_tracker
-		zmq/tests/test_message.py::TestFrame::test_tracker
-		zmq/tests/test_security.py::TestSecurity::test_curve
-		zmq/tests/test_security.py::TestSecurity::test_plain
-		zmq/tests/test_socket.py::TestSocket::test_large_send
-		zmq/tests/test_socket.py::TestSocket::test_tracker
-		zmq/tests/test_socket.py::TestSocketGreen::test_large_send
-
-		# hanging tests
-		zmq/tests/test_socket.py::TestSocketGreen::test_tracker
-		zmq/tests/asyncio/test_asyncio.py::TestAsyncioAuthentication::test_blacklist
-		zmq/tests/asyncio/test_asyncio.py::TestAsyncioAuthentication::test_curve
-		zmq/tests/asyncio/test_asyncio.py::TestAsyncioAuthentication::test_plain
-	)
-	[[ ${EPYTHON} == python3.9 ]] && deselect+=(
-		# crashes python
-		zmq/tests/test_socket.py::TestSocketGreen
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyzmq/pyzmq-20.0.0.ebuild b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
index 6dbc55973f07..0db0813fc1b5 100644
--- a/dev-python/pyzmq/pyzmq-20.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index f1e52ea08851..7a6e1efe5c29 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,3 +1,5 @@
 DIST rich-9.11.1.tar.gz 14050070 BLAKE2B 7dcae32743bfcbbab0af6896f72e865d2a72ab66545168544d065145cf10a2aab4785454e547f011219a85a8aa762f1ed5ebef2b9fb7f44225a2f776835b643d SHA512 2139cb6602d930e9bf1479456a8e6cee812237fb64073db3f23fd8eab64c1c2b3a83c6292f1f90652791100a93961d8ec8036e5d819f1e23159b6b9a75cd1f6c
+DIST rich-9.12.4.tar.gz 16204429 BLAKE2B b57d7dc7ad4463c85cbc43e0fd8afd9f0c5329cbe81eaac168895af3701091669e4b0b6fd0d2de2f5876405c5aae00ed77e77d1b317dbd20c7dd3e53deddf2ca SHA512 92feb4ceab4e10f33c0f4abec19a4ee5bdcf27139591b603aba98239483874089fbd33998a2f05f2b609799afa59cddbe1ee245a87c391d15f58887b21a138df
 EBUILD rich-9.11.1.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
-MISC metadata.xml 392 BLAKE2B ddb87719a768fbfa9efb493e82b4bf7401fc60782e24a0387e0ed50eacbcd9069beb7f3f75fdff28a906bcbcd597312bc79a2b252fe44487d16289ba81520f6c SHA512 3676c47be47b729d8d794e0359cf1ba7dc8b5c9318520474c323e71962dfc9a013f7a56f69147b9bab9d0c8334c57384fef3ed2adb7177677b8cc9033ebc6418
+EBUILD rich-9.12.4.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
+MISC metadata.xml 493 BLAKE2B 3ba69fa824ec59308ce763ccf317a1cb187586e17727e59e6f59f40a5f9d0a23c78ad20e67009a6ec460b317c471fa8c00d68fd8fc152cb5a87077aaa425af21 SHA512 186ecd75daa3aa481ccc5773ea797bb87afbf6f4017224b6e7d54985838f9beb1cc4a2faafef0ec1e24ce6b881ce95d7665d4f5945285032f19f7a86a5a7eb14
diff --git a/dev-python/rich/metadata.xml b/dev-python/rich/metadata.xml
index ee58016921d5..a92998b503a8 100644
--- a/dev-python/rich/metadata.xml
+++ b/dev-python/rich/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">rich</remote-id>
diff --git a/dev-python/rich/rich-9.12.4.ebuild b/dev-python/rich/rich-9.12.4.ebuild
new file mode 100644
index 000000000000..a62e88778e09
--- /dev/null
+++ b/dev-python/rich/rich-9.12.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index cbff6ae5e5a8..004cb24062c1 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,3 +1,3 @@
 DIST roman-3.3.tar.gz 7577 BLAKE2B 651d30154e01c9bc61326581c5600efb5f717b2c21cb6345d51ba5aa44d79bff00e66492d3962ed4c9682103a9c00af8205ae9d90b30b9a3f13dc2d18e6f1592 SHA512 8d2952640519052ce629a3881cb871448fc7921eb5f45525305c43ef9fb2672062d0ca96ab16d7aaa95f5eebcad028fdcf519f224f3631734fbb6a4a314f3a49
-EBUILD roman-3.3.ebuild 548 BLAKE2B 2a807821166f87319030dee83ad616ede2c4770079e5aa69bfaf9eaf7ea4162f8e5626c7f41abab85d525dbbb595f5de0040110b72ff5d4415191deec8be40e1 SHA512 e0b801791d0733a35f4a9cad9045e779eb5934b8bbec1d9021bb5a3c4d68ca45e5867ed818a22521de63190d0d740613719e6f1e4d638e299d311fc47244bc33
+EBUILD roman-3.3.ebuild 547 BLAKE2B 4c2ad92708cf93348e46b8f2dbe95e5a8da87e25f4bb6b27af7069525bbc8d28680a4c45a189313953107fc8c02bbc2170b34fb130d03b133f66e72f5353508f SHA512 74b2bdbf4d3d44ac680276ef543a2ff54feb7bbd2fb07c02523c246e3b0cdd13fef33fd2f43b7c3f7a204772b90472b209cd015c12bbec2328400df5ecad264b
 MISC metadata.xml 343 BLAKE2B 5a7fb5b044fbc4f5a519e52e23ce4d2b804417071e3bf1377d911e46b60cde1735dc0ed800ed09cb33a3459eb4adfe4787c8051252ee3a2ee1581e3c14355544 SHA512 db34bcb6ab62b2a421117f0cc639ff81c8f8e3f8eabc9e1f4bb3f56234820035600ba62f2eeac3eb3712289be6c53be4236c99e49d6364da5b9af7d932c9dc2e
diff --git a/dev-python/roman/roman-3.3.ebuild b/dev-python/roman/roman-3.3.ebuild
index 4bef23d68510..97c8ad4615f0 100644
--- a/dev-python/roman/roman-3.3.ebuild
+++ b/dev-python/roman/roman-3.3.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
 DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
 
 DESCRIPTION="An Integer to Roman numerals converter"
 HOMEPAGE="https://pypi.org/project/roman/"
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index bd0c33476fbb..3c18b1036c1e 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,5 +1,3 @@
-DIST rpy2-2.9.0.tar.gz 193062 BLAKE2B 92492821856e516f8f620397cba2e0ffb17718156c7c3a0bc8df8e744f0adf1ea6006e5c762ba99aa142fe06d327a240bf5d616175e81a80d28a21265c9771aa SHA512 55be876fb7316a08f507f3a332ed29d71b52f733c1986482f141e694d66d0e01a51a9c3f0260f6fe0086d7bfbc1f58b678cda4570665e4f1ffdb120c793ef1b2
 DIST rpy2-3.4.2.tar.gz 186064 BLAKE2B 5c800f546240cc33e6341973adae813edcdaa88e90ea0274e97075bc4516ced20828ccc6010ae23aead0b227639158240dae9b678790e0d28f974f10e9ac0e5f SHA512 e754d082bf392de582829bc078b512a071d0c0aa79ce3ed3692ad88b3816863b520a4ef9bbeaccbb2a7284685e470f345ba103e3db78a1c95187c0b554565314
-EBUILD rpy-2.9.0.ebuild 1071 BLAKE2B ccc7499a20f427102ac273a1b497f1b971a3d98b3192b8a2a5a479f3639e57c6d820cd1d88c7e1558fd43e22f07cbd9449be23e273dd21a020fbca20d7384bf5 SHA512 aca2aa1cc7fc5d07239729fd5a8d32a467008908489345be73b0de81f10d3dc3d1fd920a62e90a339ce993ac20fc38a91adcad4d1324f817a38865e91413e4d4
-EBUILD rpy-3.4.2.ebuild 1077 BLAKE2B 828384c209e0107b649092377b057616d34ec4b58f41bd01d1185a604d120fee8ea2b6cde8c56934fabaabb7effeb7104d70577068c66506a7e8c821df618503 SHA512 7f66cf831e3515a3650c9a9d598fff989ed4e63f8790ce5a782cb751aa41e4a26e94d618e871d654ce0a58fa0f75745cb86d1a5a079c477849ea693f73def496
+EBUILD rpy-3.4.2.ebuild 1076 BLAKE2B 0946b25878d544a5583c3af3eb1e69fa441a4e84ea5f8dec7354f408e5ac3006760fe20c4630ce3a9f2203319f2081f5eb449398ac4edfa9bef1dea972ffcc0a SHA512 43af0e026d4424773bff1e1c59a41e279f9310ede3cdc743bc758e626a0c7e8a9a5723ec952d9f393d35f2e3d24dba92f507239c00aff45ccd3f73d0f522b9e8
 MISC metadata.xml 700 BLAKE2B 42fce60e594dbff010837724886940504b6d01545afbb9330238139855b4350247180cd05875935e9ce807808e02979733b000eb15558a7dd764b7e444a7b4c1 SHA512 f70b91d3a53220b814460d8836d0d04500b0c9fa62395a8264d81a8d952ec8f2090d20cfa55cd60ccd2698a947b61c6284c036abc298a9c18a7807302c15d8af
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
deleted file mode 100644
index e85f0ecf2573..000000000000
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 flag-o-matic virtualx
-
-MYSLOT=2
-MY_PN=${PN}${MYSLOT}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the R Programming Language"
-HOMEPAGE="https://rpy.sourceforge.net/
-	https://pypi.org/project/rpy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# ggplot2 is a test dep but not in portage
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-lang/R-3.2
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pandas-0.13.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/R-3.2[X,png] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	virtx "${EPYTHON}" -m 'rpy2.tests'
-}
diff --git a/dev-python/rpy/rpy-3.4.2.ebuild b/dev-python/rpy/rpy-3.4.2.ebuild
index e79da72ffd5c..996c66c3e50a 100644
--- a/dev-python/rpy/rpy-3.4.2.ebuild
+++ b/dev-python/rpy/rpy-3.4.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 # ggplot2 is a test dep but not in portage
 RESTRICT="test"
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 7a21149ce53b..2bf5132eca61 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,7 +1,3 @@
-DIST rpyc-4.1.5.tar.gz 1252268 BLAKE2B 3669b10e7b9dc28feec33cb8472e74087fb31801564fcd9d9230f88a44dca8c7100a6134ad5c0e4974b8252e6c2f8d33877550facfe5f6c21d8a388e38c9e9f7 SHA512 27f67c7e7bf6f1e94815b3124f300da5f1317e7b454280953d85eca8c7146afc33937ac66a1bb8ac2344b73532ae232b190a647ef90aa723b8b5173b96877454
-DIST rpyc-5.0.0.tar.gz 1257159 BLAKE2B cc1b9465745b22ba8d21a11c1f1b874e62acda6ee706591d4cf4389e5be36c3b39b24e6790356f8f5c5ad03c9739a3f835abd5e50768403e35731afa78bc608c SHA512 dadacd7bfa5c564843fbad377b7f346f582640e91b8d3ce1625e537625d448f902104b376203d026fcd08b1a89ddc8cfe2259fa035a16f0184d227543fbc465f
 DIST rpyc-5.0.1.tar.gz 1258657 BLAKE2B 84d0bee67004928c26a1765a26267e3e8eb5dc09a8fd53c1d75ca691cf313a7563398626b7e89a8893415294721623206204784da01444708edb56aec8101719 SHA512 57b0d6b2dba33c7f6c9d204b4deae8ab08ed56e5799aa2c7ae4bcb8ab98486055090e3079d8b0d615fcd517111a6e02893dff85607aaca5497ae76429abe3148
-EBUILD rpyc-4.1.5.ebuild 528 BLAKE2B 73d7b359865406966fff65cecd924a63dd00b95e864ba5c3ff1a78dd80bc5723887dd110bda002ee9fb38c949d71e5a55640be2e8d32da08dfd7051ed55e1aec SHA512 a42fde573937a235f6711d1c430d7b841a308c33b58e02647192688dd46bcd8c90ce7ec4d6fa48af7e5bd3054a6319eb9016891cd0a1f13e8123e2e6bb69c928
-EBUILD rpyc-5.0.0.ebuild 603 BLAKE2B 2643a3f991593bd72059828364a29e469c095312b3e2ce9f53a45ef5b6168029ce71c1d4ff8f27bab1bad2eb1c9a1ae461ec66772130cad50bfbe1b571be47f2 SHA512 46d43ab7a75c47a71ce7af54f920263e600bc5d1fe026c43e1691c2106481e985a9fa83ca52e91ed1b91ceea683922d881db2e9f1b761926b46b9de4d6ed6a05
-EBUILD rpyc-5.0.1.ebuild 1643 BLAKE2B a7d1733456f8d392bc918d4923cc344f58e23015d707007d806005d17a4b5367aaa99fe5d1900b1c5d7aa85e667fc687e86720341eeb9f6a0de011d843f3eefd SHA512 27d0c5137ff7804fbd1e82ba81804a98555ef44cb84f2ed5b90c30a40953d684111d978d7f78ef3848398935742b2f7e0ae12a07f3c054bd7930be2dd25d0cc6
+EBUILD rpyc-5.0.1.ebuild 1641 BLAKE2B 47e8397bba1ad5cfa3a673411f279690f495cf45c3b85d728d21b8f437ee533376d58543835ba89398e505b1686e5e9c3826e80722539021a7c0454947b29ff8 SHA512 73b40edd8bc5683efd9a6ff31fa49fda929bb0171ec91d765166317184bf5a4c124716b04030a816b00ba6fe16c000310f94e4e7c75949ebbcf9f05a887e2220
 MISC metadata.xml 754 BLAKE2B 82ff0e7411b48772006257e8b35f042fbe7dcd805872b27480717937e34b2530159add3550e645f30f86c124b9d6ec4bebb7ca5f931af52a85dc8a61165f87f5 SHA512 ba1be445e198db7684a66b4d40eaea109ecdf975570d56e8d054f984df24ba40230cd17b5f3bd74759d0e31222e5fd771d63feb17ed3f2714bdef11f5cd2e15a
diff --git a/dev-python/rpyc/rpyc-4.1.5.ebuild b/dev-python/rpyc/rpyc-4.1.5.ebuild
deleted file mode 100644
index 2dfd18702eb1..000000000000
--- a/dev-python/rpyc/rpyc-4.1.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-5.0.0.ebuild b/dev-python/rpyc/rpyc-5.0.0.ebuild
deleted file mode 100644
index 3be1eef964e2..000000000000
--- a/dev-python/rpyc/rpyc-5.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
-	https://pypi.org/project/rpyc/
-	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-5.0.1.ebuild b/dev-python/rpyc/rpyc-5.0.1.ebuild
index 1a15f8c05d71..2a23003c5e7e 100644
--- a/dev-python/rpyc/rpyc-5.0.1.ebuild
+++ b/dev-python/rpyc/rpyc-5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # USE flags gdb, numpy are used *only* to run tests depending on these packages
 IUSE="test numpy gdb"
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 175f548e51e1..1286b2cb46dd 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -2,8 +2,10 @@ DIST sentry-sdk-0.19.5.tar.gz 206164 BLAKE2B 9d7ce2a64fcb511c659188dc18bc4af1805
 DIST sentry-sdk-0.20.1.tar.gz 210762 BLAKE2B 64ff322667374c914aa00a80ffa5eca2d92ec0965bc6bf7bdc65cf89e75a3cd5f5db32cd7e442caae515348b1f7948209e9810729f4fbc913730337f06444b73 SHA512 cd7871bd3da31340752477058fcf788401910a4e0b4ac38d53beafbedcdfe62b3216d6d2bcf2d1998e8c3e02886da76f6a8aa2809ba1e473421f96257890e75c
 DIST sentry-sdk-0.20.2.tar.gz 210799 BLAKE2B 7a7b4350b664ee6947fcba64aa07a4e9f8ec274de7433d64acce55d490ea91f97a19ab7116e7af3109f806c91261f50127c72627bca1bbf76c43ad4ac89455e2 SHA512 3fb2d4ae960c86582e778afb0fdf12f3ff9103a83fb12a6c920bd6fe1e210842d29d2cfba12c254199a491a5b42288df0c388b37a8709fdabc9e6e9687b178c1
 DIST sentry-sdk-0.20.3.tar.gz 212130 BLAKE2B 48084039c493ca2903f56426913ea8f8f0480b759157270fe6ea4dfae72f9478d8566f8a86f6f863c06adb01379e980d5f873372f401a8d3f255f62f8a149b45 SHA512 0392fcf0e718f7d06200fa44fedf1aac46a2f61d11a8252ca339652d5385a377545128c1c4b9e31e1e1a8c8c9a8c57ded569b829312a748d84ad98696a897944
+DIST sentry-sdk-1.0.0.tar.gz 213707 BLAKE2B 9fa3dfac7d82c9e2c81be6f4edafbc27ab19a2a96876885dabe72d2dbd6cf392b80e453c640affb94d84f35b227b12d56927bec88e01a0ebfdcf8a466470a909 SHA512 e91ede3e5e31c2acba7094bd5c6a95280aa8367b1fcd524fc9b100d2a3a253efec1ed3d9c72465f5b2ef5276c834906d622b84e1650b65d2032f4acaf2fd1ab8
 EBUILD sentry-sdk-0.19.5.ebuild 2791 BLAKE2B bf6037e1865b83df6d926a799773cbf003e1bec23ff601e7e255d75f62e19f9350f5e066fac70fea809d4dd4aaf8d952532124e6edb028a7ade52831a3de7b34 SHA512 75552b6a55fedf3d05e346345aa153b030fdf13cc6f09c0ad433ddf321a1a0d126735fbbaa2665dc6ea5cb11ac85ef7b083ea9159b3c3bfd782c353bf99be792
 EBUILD sentry-sdk-0.20.1.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
 EBUILD sentry-sdk-0.20.2.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
 EBUILD sentry-sdk-0.20.3.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
-MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
+EBUILD sentry-sdk-1.0.0.ebuild 2280 BLAKE2B 1eded6b4d30c3973cbc3c9f1e5811803b5a4a2376f3886ae8bf3331dd8fff3c847bccc787fce03258e1f3200812880d12abb03e3fe1fc6a07ca6654935d35960 SHA512 4fb27231fde3b323312072e2eb6d1ca97165d7b27515f7a349e1b54a4ae92d490fd0971cad2229162f32acf7693c8ac0c62d60c470fe7ee3d3bda2006054af4d
+MISC metadata.xml 509 BLAKE2B 5b68b368764625061ea2eadc0161570e46760904015f6e1e3e97a7a4dacd3604a18b2cbfb665e816981a40f95ec9c4f0c4a0447ecc968cbdf1fd21dcd4149193 SHA512 c42a1f7972313d3369ba392347b0efa700ee9c9b01d3275b3973b8137cf00fca693288a1af57c355b2d87525d9fcb7a320ad571fe8be5531472a8710f9b287d1
diff --git a/dev-python/sentry-sdk/metadata.xml b/dev-python/sentry-sdk/metadata.xml
index 6fbea5d2a147..6212d853800c 100644
--- a/dev-python/sentry-sdk/metadata.xml
+++ b/dev-python/sentry-sdk/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">getsentry/sentry-python</remote-id>
 		<remote-id type="pypi">sentry-sdk</remote-id>
 	</upstream>
 	<stabilize-allarches/>
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.0.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.0.0.ebuild
new file mode 100644
index 000000000000..1c883d192386
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/stdlib/test_httplib.py
+		tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# hangs
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 7e741d216e69..2003cd6f0f4f 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,9 @@
 DIST setuptools-51.3.3.tar.gz 2053035 BLAKE2B 73b33359f10f900233b82e68c91781609665bdecb6b0e2963d7d15a798149c104030cc1e124ee945b23e5fc8db3f573d0b9012cfba7767ff913077af907141e4 SHA512 5a3572466a68c6f650111448ce3343f64c62044650bb8635edbff97e2bc7b216b8bbe3b4e3bccf34e6887f3bedc911b27ca5f9a515201cae49cf44fbacf03345
 DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05aa1f61043482487013bcfed7802ff1b984fe0f72623b092eee7ebfb9debd5f71732223220bc2b73a6ece0a7ec86a2c SHA512 d045198210f09c5f2acbd487d3dd291cd7ce814bebe331f1876c133cd28f56d368717c7bd4a875b439c9cc8c9488dc9a7d3e27ab791cce419f78b87fcfd8fff6
 DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
+DIST setuptools-54.0.0.tar.gz 2052086 BLAKE2B b96b8ac1119a9ece7d6a7e481a8d078f6ea65957be679549381b67e26498a6d403aca38b8ee8ca832c8e1045f960114e037787863ea6247bc87a92c1301c11fb SHA512 b13ad8aa13da63d9504064fb702632d0d17dd81eee8c09b9d38d30a6e4d625a600f0b3e7349e45354b444c25d5caccb5407bdecdd220af2e283f4baccd6f675f
 EBUILD setuptools-51.3.3.ebuild 2125 BLAKE2B 36d22c2a80921dc739c60798293b0c6475f45832ccba934901e1f525109737966dd8e8cec259e123d2168dce2dfaf7acd6e8021ca43762752ab8f3f56911dfbd SHA512 71aee4df07af820f2051bf98ddb7465605b17574b0855a5f56c358048256b8d3b05e886ad163273fe6ec5aee121f7e334af2ed24501667a7f67dc780523e4748
 EBUILD setuptools-53.0.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
 EBUILD setuptools-53.1.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
+EBUILD setuptools-54.0.0.ebuild 2129 BLAKE2B f88eca3d0aeb651f066e25e475e8059c56276c94a9918cb174f8ebf03af7692d8d33ac1233726b1c9fe412c0832e55141b4c66b4a01353f2b56333ae16b0f534 SHA512 03df0dcf752b058e6cd18eec06100e77fc7515ef11f20344f3535d58edb9b976333ddd9de07b5c12d340eb4aa67f1f672dfcfef3c483b66f7df0b009e2e86bf2
 MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
diff --git a/dev-python/setuptools/setuptools-54.0.0.ebuild b/dev-python/setuptools/setuptools-54.0.0.ebuild
new file mode 100644
index 000000000000..9bc11f0ea338
--- /dev/null
+++ b/dev-python/setuptools/setuptools-54.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		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/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}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# this one's unhappy about pytest-xdist but one test is not worth
+		# losing the speed gain
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index a33a9bfe0c75..68af602109a6 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -8,6 +8,6 @@ EBUILD snakeoil-0.8.8.ebuild 894 BLAKE2B 23757057ae12f52670278b905bbc32c5fe93758
 EBUILD snakeoil-0.8.9.ebuild 856 BLAKE2B 42754983e2c4c21405112dd562722fe1065ebce7c16bffa2902eb14d3b00fc534ca566f9a22665463b5ca48532a86f91ad396292b2774e9ed9a4c46022bc7699 SHA512 75db4d4ef4b92d0cde7c42cc9f7bf9bfd0a5aa1d148aff6dfe9b32bd695d121f4738cfe2805d48a1db34e1bf4a7d0766c82dcb51560b27cf0749cffed0c0e6c5
 EBUILD snakeoil-0.9.0.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
 EBUILD snakeoil-0.9.1.ebuild 717 BLAKE2B fe7fc18a2b270b859857d1a2127d48e42fd36ea9a39d6bb60879df026e4074f96811acae535727b7e030a8bb811ec7084fff1422758e8594394c1e53f4d16b60 SHA512 38d9fdab976098e044bba394cd4b3df90d5385bb9f6022c44075fd2d303d7ecf8978a70559a77e637bd9bf28cd24877f1cba52d656721b8365bce126abc8df95
-EBUILD snakeoil-0.9.2-r1.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
+EBUILD snakeoil-0.9.2-r1.ebuild 758 BLAKE2B 25ab838c53e3d25f393ccd39c503f5ef35b05b7432733b85a932ababf358562aae313d9946d7c528643a6f6d420be2558de5545daf7c3a283bd5aa6f9f946545 SHA512 e0336a7d5a825e9098adda54b9e2d78e04f2f65169f52fda33275602890d8b0c4583837930592acd98cf9bd27515e1f5a700567ca11ce76ff28b7299413d9a4e
 EBUILD snakeoil-9999.ebuild 780 BLAKE2B f45e83fc2a91d592ea3a2586a1162345e9d3f4520226ab5ca7cffd372868cea009a6c08844bfd5b417e26a41ebe435d027ca82b3de614b7641a2d330ad66f2b3 SHA512 8c3f35c0136e4866d1443c91d7fa43445f83d2cf86dc4272240322e89778495af1074f61d165b74d301c5a9d5775fe8391cc5e9aeda3e9781465425d3dc30261
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
index c15346749758..b2a9b9feb24a 100644
--- a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/speg/Manifest b/dev-python/speg/Manifest
index e21f15342484..1e772388c755 100644
--- a/dev-python/speg/Manifest
+++ b/dev-python/speg/Manifest
@@ -1,3 +1,4 @@
 DIST speg-0.3.tar.gz 2592 BLAKE2B 1b82d6e122783fbc58f2c711a67e9b8b721d69c08de5ac2815d1ae459ce337552d10bb747cd1e31363f48f4a50bbc967b650d7e6048668d28d4133b5875aed14 SHA512 9faed6af0eb1a6ff0a7dc2e2f5b885a58a5430938b463420ad52277fe2900ae98531057ebbcc21d8cd259d4779bfb0c919125043503635721afe574b4f1f99ce
 EBUILD speg-0.3-r1.ebuild 456 BLAKE2B 40373c137c0343e0a35edd1afb2016f56c38e5224a557bf03e1d399ccaf6beb97f34b41c8ada103cf905b975e0360e1d08374b996b89969d63d2038407896ecb SHA512 3a2506460b69f347c8ee26c0a4e3f3d1d83711c11f9758652aa139dd0867520340b2069e101446f6111affeaf3564bb1dab1a15fac11a84e1c482641484350fd
+EBUILD speg-0.3-r2.ebuild 460 BLAKE2B cacf1bb666489330d71ef277d7abe10d9edaa6f1316a2566480ac8e3785918073e37b25f9fba0dcf92043ccc266ef2029767e672b601008fba50c1740fd752ab SHA512 9252d2ac95f446ae2cf76ec0d97255aa76df9b5f1a63a1d96783f5e1a498245cdf1df6baa3973a33bec5a8bf35e1d723f148a22ca4f4cca56090c9dfb23aa348
 MISC metadata.xml 401 BLAKE2B c5fa200b5f73af48756fd3561d26a14945d834a88d3001a063056637d72e02ce41f504911ed1a978ae55ffb801d876a3481d60a0bb13baed5122fada979fd096 SHA512 af1a6d09b71c28037ceb11aaf845abad8844a27114223adc6a82206881720e52925b294a4dca33e8ab13985c163684b19d08a369fe04bf3253e51a5fda5c40f5
diff --git a/dev-python/speg/speg-0.3-r2.ebuild b/dev-python/speg/speg-0.3-r2.ebuild
new file mode 100644
index 000000000000..50b5e9ec3055
--- /dev/null
+++ b/dev-python/speg/speg-0.3-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+DESCRIPTION="A PEG-based parser interpreter with memoization"
+HOMEPAGE="https://github.com/avakar/speg/"
+SRC_URI="https://github.com/avakar/speg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/sphinx_selective_exclude/Manifest b/dev-python/sphinx_selective_exclude/Manifest
index 32255bcab0e4..1f025bedcd6b 100644
--- a/dev-python/sphinx_selective_exclude/Manifest
+++ b/dev-python/sphinx_selective_exclude/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx_selective_exclude-1.0.3.tar.gz 7227 BLAKE2B 90ba94f81e6dfc00a39bbcaf50d136c01c7b756bcb9366ab111169913fb2a571b7924afc89fd8fffc9cf7c96bc64cd2737441bd5228fe22f9e5a9687b5b4ae52 SHA512 8ceace1502948caa17bf611786132720093b818039b399eb832c12dc47ad86219610495698692c2c25a98a8ede8695a66b02f5e3bb6ea2c7d2410e275cd959f9
-EBUILD sphinx_selective_exclude-1.0.3.ebuild 439 BLAKE2B 038ce6ff8c90433a272d51658c588191c989cbbd87bfdb3f9db98a59f17edf315cf48f2d2275c6f1fc1f9e049446bcd9b77c09bd1e216899fda7df17c6ebb1f5 SHA512 4910c2b9eeaa0cdb870f871f959a1e0c03788114938704b41182b58ad13f3f2881d8e3ec179e1879ba6ac7618834879ca064e2c0f7abe76967820e3ba06f3ac6
+EBUILD sphinx_selective_exclude-1.0.3.ebuild 440 BLAKE2B 64830462743c0e2ef2899fdd9257f14aeba926ec22211f869bffe3eb03e2210ebed64ca0962de7d88a72250d5653e8a8427e7e5121c81fccce5552ff2f395b02 SHA512 ef1c809296d4821d1f02afc725e966135e42c543ee5eb97b8d114fb61a18c9f258e11fed4c68e75c74344847853fa46e7bddce1ff935b908cbad54ee01369699
 MISC metadata.xml 524 BLAKE2B 1b0d00bc1a5eb85690f347d447b3064559ffcc3792e9e3b4316816f34ca889eb39e45442cfc318642753a2d9ea1b6868615bcb0be354bbbc77e914bff28049ae SHA512 bc2ee48ec87fc62d451a6e4642de3d6fa0b1c9b7d7efffcbf225a482caf808838b219fdfbb03749be126b4f38d78e9273d840cde51584093ac5c8d45aa20eb1f
diff --git a/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild b/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
index fb2b976af894..e6668899d411 100644
--- a/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
+++ b/dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 769b134bf55f..f372c6f83451 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -7,6 +7,6 @@ DIST SQLAlchemy-1.3.23.tar.gz 6313652 BLAKE2B e87f67ee7ee70036b94e1708c1a59f58b1
 EBUILD sqlalchemy-1.3.17.ebuild 1427 BLAKE2B 7a068977d5832b08fccd51075f31608e21c6e234be5443e055dc3f0f20f1016e9c72ed321a3fc09bdd791146a20933d6c9f76b41e25a9ac8ce32488d25faaa51 SHA512 0f00ac700d30e1f8e080fd5ddc07be4173bee454e78a68063c3cc98e9bbe9c2e7d572c41d5cd863e0375c3553a5185144bcd30d4059c3b0d5ed6939a40172b9d
 EBUILD sqlalchemy-1.3.20.ebuild 1881 BLAKE2B 62eccd43feada54889f3829308f3b813bfd9f95da3f99270a8ac8a2600486d029705615f4436bd5494b505743818101f188f4e4315aa1555b8ba6a1e0e25bd6f SHA512 07287e4c7c56ae1f12f928857bbb3298be752a534054386316a79e86c6501212030d258dab1643fef7150b9c4a7e462b0f8e60cadacbda2f81b67a398d42d5b3
 EBUILD sqlalchemy-1.3.21.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
-EBUILD sqlalchemy-1.3.22.ebuild 1895 BLAKE2B 09c734bce4e8f97774df0033f51b94e0ad31c29cc3f3b2ec42a546a2b9df02300efdd12633bc79e089c3cba85c1e42a45595e1553ac98c4e4885498779856b17 SHA512 3879901627dfb6733bb1de5ae300319b7e1813badd241862b081e9435b446422fe8d019daa1b03d2e6c2bbe4973afdb0bff71e92f6e8767d633de2a37f93d2bc
+EBUILD sqlalchemy-1.3.22.ebuild 1894 BLAKE2B 21e90139805c2e5e23ae20eec320362e18b8e36f6ee5da7fc76a9e0c4e9fad2fad09cf856c4fe9f642078d1653d67c1c9593b21bb11d76adb5c5695bc0637712 SHA512 36bb9767c975b0b07eda3b3b564b448d6c755d57ad716775fa4814fcfae45f7ee33cffeb2c65f25d2b72bdffd5dddf5ffff6b78e8c64e74c316c1b32878c21d7
 EBUILD sqlalchemy-1.3.23.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
index 1a71141cf235..79cefe7a13e9 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.22.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 # Use pytest-xdist to speed up tests
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index ac532633987b..fbad50619b84 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,3 +1,5 @@
 DIST tenacity-6.2.0.tar.gz 35213 BLAKE2B 830953463ef9d7ee9e99fc0c9d3f55910754f4c2c777110ad8af65b0af186b2aada25ec3d9ae80f266ad9200080db1af70b80bb77f1edc51148001ca49e0bd08 SHA512 3753ab44390810458c559d243bdc5e3c0092a0c2af7eb4e6fa43d5e6e215a58d4bf3ff6e81800db2f517796b501fff038964b424e364ac417ddd3e70b57bc6c8
+DIST tenacity-7.0.0.tar.gz 33874 BLAKE2B 485b35058e246ac7c68a2d92a4bd30ae182d382d4258854afb1e61d0b31cd1674bfd92599b83425f4e9a92ca4c38e4a91b72a17d0de6f918474ebe59e6bd2d66 SHA512 a627112df19b9f6d1c53294daad7fe1b0aeaed15e6ec07054228575fbc76ca5c22f560ddd6fc176c5c22141669423547ba17f1e33c7d0e7e92d0188acad065c4
 EBUILD tenacity-6.2.0.ebuild 704 BLAKE2B ff5d11501625024e51347afa95f35552ae55b3e07dce5cd36a0bb4a795d287e850cf354666005a7872dfec86e5ff68342fcf9f42772afd0273b4b4f03a5838e2 SHA512 6574e583f86e7cd8c283578033211b20a384d086b554401a096ab4000fe04f1ecf9a35a834a07144d3924390aedf7fdb374b7fddbe92b094273606b35a8928f6
-MISC metadata.xml 754 BLAKE2B 7300bb786325e869b59e66b8c88f27019a7f8070054bb1319f5c9ada25302ee1f58e78f1eef727bb5e2b18185e6d9b0b3fd4c30574ef977966ace62bae50e170 SHA512 ad8d24dc0b57cd2ca3df9239fd0e122902b0e0ec2769748672601601aa320c81644e682b9776c21b7672a7b654a190999a159f4122ef868f9eb8d0a2edaeec3d
+EBUILD tenacity-7.0.0.ebuild 796 BLAKE2B 3c5ac096de6e1a1d663da50360ef9f602dd5f2b266744e0363f5c18aead42cf8feeb51352737be47add6421c5c5559b1852eeb29da89ca3213b777e67b8a032d SHA512 031361aa3b66f955144a214917f0d4b1f97782d4042b70f0e9ba932753f54fc3475ae278e8431b3fa80a3b6440020b6fedf048cc57ff884b983a3168362759d6
+MISC metadata.xml 855 BLAKE2B f8202daa921e00bbf7beee306ce1ae06d7a65784945c80417666f6924bad97af08b45fe761e79ea2aac4331552d8d146f45d1e086567791eda1a1bd78f57ce39 SHA512 dcb03bf33c2f0de3e945e0a9aa997c7a8896aa49f1db22c6de4185d16b41fe26e0a28b152b28014c6b4fcf2bef9a143f6d96f8b089d357b6f2b2b128b87cd286
diff --git a/dev-python/tenacity/metadata.xml b/dev-python/tenacity/metadata.xml
index 3d16ac1b7563..c825b59653f9 100644
--- a/dev-python/tenacity/metadata.xml
+++ b/dev-python/tenacity/metadata.xml
@@ -9,6 +9,10 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 	Tenacity is an Apache 2.0 licensed general-purpose retrying library, written in Python, to simplify the task of adding retry behavior to just about anything. It originates from a fork of Retrying.
 	</longdescription>
diff --git a/dev-python/tenacity/tenacity-7.0.0.ebuild b/dev-python/tenacity/tenacity-7.0.0.ebuild
new file mode 100644
index 000000000000..dcd22bfad3dd
--- /dev/null
+++ b/dev-python/tenacity/tenacity-7.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/jd/tenacity"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: package typeguard
+		tenacity/tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/theano-pymc/Manifest b/dev-python/theano-pymc/Manifest
index 3a88a71a34fc..cf908449ff82 100644
--- a/dev-python/theano-pymc/Manifest
+++ b/dev-python/theano-pymc/Manifest
@@ -1,5 +1,5 @@
 DIST Theano-PyMC-rel-1.1.0.tar.gz 12482951 BLAKE2B 3c3cf6bcd396ce01d68575d8272a9b110077ef8c2b4a6c8f0e795dafcf75f862e145d4e9d83289950e8d463098fe0ebbcee8f4d5f0867d9e6c673c77d6fe8b90 SHA512 667c0b3662ee41254d1776060d64d46b58980ac4ae4e7b271d29d7e09321089946e4aa864626b6e8ea1bd2eae330688b675d507e18dce2d92a4a8df5a0116bb6
 DIST Theano-PyMC-rel-1.1.2.tar.gz 12482962 BLAKE2B 427afab5b831f625b0825746d24d68d7c7a2ea853f83d0b543f9c16baf7f120bb26446a438fa69279cd55e7788b3f1aaa6c6ac787231415f49a53e34e6b92584 SHA512 f582e23803d392fc469ed4aa13ee8615b7ce367de0a95d57fb71217f578112bd1611df1fa580f19970e1e3681fc5dc7d80d9bb9c2c40e5956d1eb937a9271431
 EBUILD theano-pymc-1.1.0.ebuild 1712 BLAKE2B 2a34d16d3e5f058c28ec775a7c0c216aca942ff9653f6766762d451971008f322149c44baa240e88e8bfc9e6a4a6074e41fa3f0d3a557c7bbf5cda9855baddab SHA512 c21327fcf0a210c7ba2ac6923360991b9156d24943f9ecd11d7b5a45ec3f1a57e5f3b4a2cb57f83310a1d98197d5500dc5048f373bff0813963891609395caa9
-EBUILD theano-pymc-1.1.2.ebuild 1725 BLAKE2B 76758a0ae576b15401618d7f836c955dcb1595d4e5a2dd51c309e4bf0ecbfabf0bfe2e883d74ece67fe950f6df570cba6f6b8d4b7a4908ed17279e4867e5073a SHA512 3c4197587819fc90830b62b254bf45e5e43f8b75a8292d90c95e187def7e757e375d20e9135ef7bbaaf7a7a7aa9adf82c70d652b22d728692c33cd2307032251
+EBUILD theano-pymc-1.1.2-r1.ebuild 1963 BLAKE2B 5fe652240981f2101f7dad22adde944760d90f42049875b39162deded72dd7b624a6ee1e7f364591c8a69cb56befc8dc2332655809513be4ebfacd00135cb7af SHA512 cb9285ddc9d24c225adb8cac8a4890f4445cb07522661a779a8949644cda8c46cf33ea568a6d9eeac56dcaa38bb03fff38fc5adf86b3ca43a1d7fe85502a7756
 MISC metadata.xml 400 BLAKE2B a9f06ebe35c874d15d1a6608e8398a79480b24cc0ec1b7a45db8c8d18aa24d26817c47a62ad13fba1f32286699749679568b75593c0909dd2ef5785450b379f2 SHA512 530f9e294ab4481624cd9757d67a9e8a67dc2a023002a7f312de619bf05bfd1a06c30ecebd0606f76a1dbe37176697e990867c95de9f411b7631bcc341192e93
diff --git a/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild b/dev-python/theano-pymc/theano-pymc-1.1.2-r1.ebuild
index 993d261ea618..4d6177238299 100644
--- a/dev-python/theano-pymc/theano-pymc-1.1.2.ebuild
+++ b/dev-python/theano-pymc/theano-pymc-1.1.2-r1.ebuild
@@ -17,13 +17,14 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
+	dev-python/scipy[${PYTHON_USEDEP}]
+	!dev-python/theano[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
@@ -55,6 +56,12 @@ python_test() {
 		die "Tests fail with ${EPYTHON}"
 }
 
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
 pkg_postinst() {
 	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
 	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 8d61a5637efd..632205320b67 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,3 +1,3 @@
 DIST Theano-1.0.5.tar.gz 2842778 BLAKE2B ee82e9487a5265a1040750ace70465c450134e70eba4e58752cbaa7d487be5fb3cce31b838429cb52f7bc31d32a20379e158ee289dd5732dd8b86a9ee36b6d89 SHA512 6bb27753957d32392ea793e39ea56eff94baafbb55e27488f9c0bbdb387172a6829e64f461f83dae192486d9764b72d815e3b8dc059b2af116b024fc7228a118
-EBUILD theano-1.0.5.ebuild 1223 BLAKE2B 94b92d3dd3643826d92f2a2fd3fbc6e087f144b90364058ab5421759ff92cd7d0a9e594961d8128f2450a7dc7696da51baf7ac401c7b3039156da9c115dae95f SHA512 ed255e2c7e05b3c9a7cf16862d95cc544baf60727389827ea29dbe2f4730ff1fcb9f90cb313783ef877a603380d0df33953261bbf5528cff1684fc0f15dd8ea7
+EBUILD theano-1.0.5-r1.ebuild 1424 BLAKE2B e2e21991f6392c7286a96ef8bad8bf91a7e0d98db7d90d9aada7d1f7162dfed300880b74fe4cc8120e1949f4f5b50ac598af86e7473ece51a8d748825b22ee3e SHA512 14ef7961ed800f5dde58f0d8d37c59b0bdbb4e008d38cdb43e6533c733bc8e1a17067b330ef63d70c8a27cadc712bc03145015472785d5f7ec4403c23da63020
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5-r1.ebuild
index bf10d34c41e1..aa340176494e 100644
--- a/dev-python/theano/theano-1.0.5.ebuild
+++ b/dev-python/theano/theano-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,12 @@ python_test() {
 	nosetests --verbosity=3 -e test_format_flake8 || die
 }
 
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
 pkg_postinst() {
 	optfeature "Make picture of Theano computation graph" dev-python/pydot-ng
 	optfeature "Required for GPU/CPU code generation" dev-python/pygpu
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 7e4a0b0a9b1b..a165c1dabf12 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,7 +1,9 @@
 DIST tox-3.21.2.tar.gz 301587 BLAKE2B 81d19e45a1d53000a2e9f956ed7b934f0f1926b4270ddced997ddc8b77a1f05388e0907d379dbabaafd5e6fdcd7031d5e87f206fff385759318a89a5f3eebf58 SHA512 beb551f49af1f8661931f241cf73fa77a37a8061ade7d41b415a2fcecd4d5dd1ba7d3e3add248d3bc14627468fa896f3f4f532305bbc36d112d226b1961fd191
 DIST tox-3.21.4.tar.gz 301889 BLAKE2B 166864fe9f44fe01d3b36481ba63738d4290bb609c6ea7e3dde3494ab7ba009c31b12c0801f5be9dfca6f56059f94438cfa31bc45dec862afda5bea763e37be0 SHA512 de12e8ba0f3287be2fced61573b3e2dfdf8513a947724982d0e17ff215489994985067692c94c499047a8b0e2dd843e214e958367199bfa6e0adcde4e09b8106
 DIST tox-3.22.0.tar.gz 302088 BLAKE2B f9ef6feb9fa438b668f6a1b6f8846845f1cfcb0826ffacc04c52dfe0a968a7df2542acc8f4a1e69c634a7866672dbb78ab8f04ba7d6e94f88b40f6c3dd042571 SHA512 d96c31c9faa4d76a6181ce332e70ec9ccfb0a6b96feff45793393f3fd2d08668fc6f14da9164947c4b93f371fab3b9d23c87b38dac89ece18e87494ac3a7caac
+DIST tox-3.23.0.tar.gz 303091 BLAKE2B 609e74ea354ca5daf45c848000961782fcef59da07f815292355d72f3e5dd078e3b5909a65521a4a1032fa2bb9481fdab0e620f4882b33aa377de9764296761c SHA512 fb96cbbdbd36399036d348716f1181285184985922e0dc61b610b36e53ea79e2d8a77190aad893650bcba86ef4c57ff0f2de2813becb2a12fe0d1aa36bb27ad3
 EBUILD tox-3.21.2.ebuild 2422 BLAKE2B 8e63cd0e826190ac010e09469d9c442628089f28fde6eac674e552cdc1a25d815679a79cb6ae253ce95f4747d8e5ef7f6f69de25c1354b639c11ac48ede2d6d6 SHA512 2ff7614ed21a4ed9f81f0a2323cf2095999462d0c629b824cf126bc5767a055b2044a7b947a5944e75510da1430e916a0f419c0126d518680db7b0caf71c7a32
 EBUILD tox-3.21.4.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 EBUILD tox-3.22.0.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
+EBUILD tox-3.23.0.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.23.0.ebuild b/dev-python/tox/tox-3.23.0.ebuild
new file mode 100644
index 000000000000..c21ec8453e95
--- /dev/null
+++ b/dev-python/tox/tox-3.23.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+
+		# broken without tox installed first
+		# TODO: figure out how to make importlib_metadata work
+		tests/unit/test_z_cmdline.py::test_tox_console_script
+		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 2736a62b44a2..fa55b862f3aa 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,6 +1,8 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
 DIST translate-toolkit-3.3.1.tar.gz 5969914 BLAKE2B 2ede440a341be0bd0206400d01bab881e6070820f362c53f47b5f88e192bcb7a18d2bf667a678378110046f70a035d42b67a77e2dc70829da323d69f675d21cc SHA512 1578fb8f96fa83ad97051a20f02d6570f96f2346d99fc86172718c995468c318f318f27f2ef259bd5dc10521bda4ac7da17385f72b726d7ea3c0fe65af8f313e
 DIST translate-toolkit-3.3.2.tar.gz 6123347 BLAKE2B 9bf5f2c84d15043d25744b3bb63526177748c7c38425bd73ad34dcf3b4051c11a3ce28ccaf5c907b6ced27d1fe9ecb06cfde46481a609df64adfedec83b91680 SHA512 53baf7c1203c27335201fbf339e2747d7b22696c219e6911c191b3c89cf6d1c0d84624ffa8c4c687e45fad229d3cb09f52d15d1d80dd914ccc8e2fff34a601be
+DIST translate-toolkit-3.3.3.tar.gz 5903525 BLAKE2B a21c5d89c808615ff2f3f718e732ce5d5591a9d8a997950ae1066655cc3e4382065f75e7a86f8e37bdd0e146283f9bd941ff20479cb1af635f393e0e7f8fc196 SHA512 41964dc26dfbb983b1c2e4cbb0e9d8eb2a035369a94ef872f7703080b5ca0280a9364916a1e1256cd358b263bc72198e767462cc9065b54556fc481d1b85a836
 EBUILD translate-toolkit-3.3.1.ebuild 2865 BLAKE2B 241cd7c4edb1c7ac600d0b426510eea52e85eef01318b3453afa9b9f35cd77e23c79b93e1566e16b2a4fef07a71d1c1d4e68edea50e9a96e8ce817e76cf0cb34 SHA512 33c174b4ed4d7eb7563ff060324971da0e39cea92bd59e35291aa787bfbc8df805ae4f020c44fb6a74d063d715409f44535b10c13b2c2ae2667568192c21d95d
 EBUILD translate-toolkit-3.3.2.ebuild 2493 BLAKE2B 92ad7246f6192f7d33910f9c23e3867ca63cb34df29321b50a6dd167fec4d9ef491619d6440454fe9ecd6ceb21f403f3e1ecf488f4366b74a304278d38cf01eb SHA512 ccf2dd92647343bacbc27a641607c3be94d22836c6ca22066ab13377829914af37093c37f0c40122e28a2a1416c26a05518b5657fd3d27166264792061af830e
+EBUILD translate-toolkit-3.3.3.ebuild 2493 BLAKE2B 92ad7246f6192f7d33910f9c23e3867ca63cb34df29321b50a6dd167fec4d9ef491619d6440454fe9ecd6ceb21f403f3e1ecf488f4366b74a304278d38cf01eb SHA512 ccf2dd92647343bacbc27a641607c3be94d22836c6ca22066ab13377829914af37093c37f0c40122e28a2a1416c26a05518b5657fd3d27166264792061af830e
 MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.3.ebuild
new file mode 100644
index 000000000000..fe65fd0c9450
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="https://github.com/translate/translate"
+SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}
+	!dev-python/pydiff
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
+	>=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+BDEPEND+="
+	test? ( dev-python/phply[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-bootstrap-theme
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
+)
+
+python_test() {
+	local deselect=(
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		--deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+	)
+
+	if ! use ini; then
+		deselect+=(
+			--ignore translate/convert/test_ini2po.py
+			--ignore translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		deselect+=(
+			--ignore translate/storage/test_subtitles.py
+		)
+	fi
+
+	# translate/storage/test_mo.py needs 'pocompile'
+	distutils_install_for_testing --via-root
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+
+	python_optimize
+}
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 9bfb4508b230..b3c4f636bc9b 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -2,6 +2,6 @@ DIST tree_sitter-0.2.0.tar.gz 110387 BLAKE2B 62bd0cac84626738c051a16a6e1d8bf1898
 DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
 DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
 EBUILD tree-sitter-0.2.0.ebuild 499 BLAKE2B 55744148da398f8871c869a4d3e8cae5cae12fc057689d15a6691d5fbc70615496f8b4411181adffe681f4cab32032feb0c94dfa1f3144040a61d4232a852cb8 SHA512 364a37e0857a9698a7b97e73d5757e6e2f6d929d769168d8329cd116827af84837e2e407304838ca44b7a2b82beb5e971f8327c111452a816651f504d9eac453
-EBUILD tree-sitter-0.2.1.ebuild 546 BLAKE2B af033072907fe2df78bc0fd8fd9afd6ad4e4d75d926b077fedd6b1682125be08dcf145bf5f1f800b8f2db9752dbbde7720814d36ecc7d15f6eeef578886e5098 SHA512 e422ab36826600a1081a72358484ff32918c8bab7d1e2430037051c92012b7ddca810b7c33200088d3379c36d08f243acfeca63be4720e8e683d808e259e8d6c
+EBUILD tree-sitter-0.2.1.ebuild 544 BLAKE2B 9ea6fd5fc0bc0a3b27c1ee637b34b15f54b645e8d4baf4bc3cc545ccc76411d22ccb14898dc59a310bf6f78664042bd8c3a926ed3adf46767c9da70920bcfa05 SHA512 b111a5a3903fb846d1e3e0b54c659aac6c87311a590f0613d60c83a67971a7c04671584c527b66dad43f0cb6f5f9d706f9deabee8d8a16a3d06e1b752533e1a4
 EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
 MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
index 948a693cf3a8..329b00cba76a 100644
--- a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 65a091cf090d..deb8a8b56264 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -13,5 +13,5 @@ DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f58
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5777 BLAKE2B 163fac4a0cdc830f9be404a69c43287f8594f2a71dacee4d4b37a56e5fd140c060b1a3e765e63bcd4b1a4fefff0bb30a1df007b6f7ad0f01adb0b6ad8f1687ee SHA512 124513b07e486caf4655534cfa0fd3c34facce3f16fe42977d41f2fcd7fa032e3dfd0ea85cf461941539ca8e0768e015809f33c798e49582aaef657aa02ce499
 EBUILD twisted-20.3.0.ebuild 5611 BLAKE2B 598bfa6c58c1acae83610bf1472d49ddf65ba75689e7c76eb356af50b1c786b5201dfb696afc7ab0ac0439878e2119de9f359250d2ba373de146ebe9edb5b37e SHA512 bbebee3ed4a72f34d346dbc38141f2a461b61c3d3a8ca99be711d16ee10a8759aaefc9f780daa0ee2dca589b4f273fb47c69b6b694c19a437ea3ef94d3ca2d14
-EBUILD twisted-21.2.0.ebuild 4685 BLAKE2B 6bd631d322a8a8a48508578a2e4011cf6b1a9434d43e5c93399bd0cb9526aa416dabce547cb8d4ec4c1f18cbee60a06814bc74ce94d4b67c5f7483e4a5981560 SHA512 4eceb533fcde6b215983005c57cb56d273f3300270396715f913a109f6081765e835d0f069e1c6c9432ac3f94facd9ebe4977c144cbb38f896bea2e8c77b9a10
+EBUILD twisted-21.2.0.ebuild 4690 BLAKE2B 0f2800074f941cb6207ac806a3000fff80eeb22cd51628f4495aa6c0755da571d986528c482ad501244562ccbb0e42573edc4ce9f9bc9752f68edd6914cbfed6 SHA512 3d1ac6a97aecf00a0d10c7e065aa81399654b9d106e1a8e10e6ecdd124f03d62cee92d16d20a42552119319109225518b939c456eab739c3185644756195d0c9
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-21.2.0.ebuild b/dev-python/twisted/twisted-21.2.0.ebuild
index 7e25407c0205..8d9934638c13 100644
--- a/dev-python/twisted/twisted-21.2.0.ebuild
+++ b/dev-python/twisted/twisted-21.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index c37221f134ba..24b669c30e1b 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,5 +1,5 @@
 DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
 DIST typed_ast-1.4.2.tar.gz 208583 BLAKE2B fb94967409c073b3390a133232259605aab0ee893fe53deb0e97a07c814b1c2021815beab4fa680653f75a44b53eb3f02d7c9e330cf51195c2dd668762c9e0be SHA512 9a46f2a4c48bd267445a773463771824be958dfdd1a2df21356d0a763ee2029b51d5b0fddeb16df202f89ba86019640ab45ba520fdad5c550250fe2a135605fe
 EBUILD typed-ast-1.4.1.ebuild 584 BLAKE2B 612d3dd28ebe656f5c8db2db64fd75c6e770be74f11d3d3992d2b0cd9a327fe0349b3258815a4243cd574bc19c9d9f170ddaca606c063856d2386bafba48c921 SHA512 69169841fccdd19dcc35012da4efb4877e77e23bc6291851c4b7224a133594f05cf5519938121a34990f420d1da5cb26da2f5982235baa45b0d45406b7b93c03
-EBUILD typed-ast-1.4.2.ebuild 586 BLAKE2B 95ea09ff800d30f4a40a0493153728a201acc1b8158a887f3fe8019dde35cf42fb25d61597bd7da7e561a0d252af6c25641eeef2a12dd6b851489c854d06837d SHA512 ff831311da690af37d0d654d188eacb2faa65d5798ecbe7aa1e50a3ece7bfffacbdb83f4af1b0d58d4e3c2f6d77c4c5346d8c365c0757ee3dc1aeb6af766bd9b
+EBUILD typed-ast-1.4.2.ebuild 585 BLAKE2B 190fb312f96aaff24d179d5698abf167d729f5df2fa5096d7b42c51a1121dfb589a34704bb4c64e6a790e31697bc395952fd2a990e726cb77550f9456293a8f4 SHA512 d1873b8dc563f4ef8a1d9979fc50b52b2660335eb7625f29385d99c9392d9a3931cf550fe64042d2bff0fca5ab0eb0e29268966209965bf14784e5589f05b4c1
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
diff --git a/dev-python/typed-ast/typed-ast-1.4.2.ebuild b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
index 159f3afdaacf..232974126516 100644
--- a/dev-python/typed-ast/typed-ast-1.4.2.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index 092248ac63a7..16309ad30e02 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -1,5 +1,5 @@
 DIST whisper-1.1.5.tar.gz 38104 BLAKE2B ab36c91c00dd8e8e26b24c0c2967c661f0bd69f3dcb0e52763f6527a233f656a984c738be720c0b5f2d27fff08daa164db87f0ab693d360bd0c087cf6a408340 SHA512 dee42adf1824c876cf15e9e55101d90d08889fd6e267a89c18fdb4a7d4c5a3a0d4f6f24bb0fdeb974fd194046c17e00f71033ddb72c74c4d4ded0a937e82c8a9
 DIST whisper-1.1.7.tar.gz 38289 BLAKE2B 05c5ed972c6dbe8ecc29731d206a44e4db2605aa1270d0eba63c90390062f3cee81a6076a571e6b18cc54f8b1a0ffbc9800c91e9aa7cf3cab862d7e6bb8217c0 SHA512 2dc4f15a91b518495da120af4ad2af4b5f81d04fae6028ca1d7505046b93082a9294452a703c8de87dc89629c35dca0809c4ee7c0df1a7a6bd5ec527f3126df2
-EBUILD whisper-1.1.5.ebuild 750 BLAKE2B de2292d7ddeac8e6af970713a11bfd63ecfc51295fc3c8df213dc5dd9e4384e92014264df949046f33eb644fbeaad04f6d3db252ce3b902da9ad1dbfdaf7fce1 SHA512 757f98fd4884430f5c0cf1ff7254fa8b15c53455f0c778502e991d964115c3d1d9f28106f6903d9c8303a155319b93f17c7ebdde4c0f9b9ff482aa991263b26c
-EBUILD whisper-1.1.7.ebuild 785 BLAKE2B 3a35d8df50e02f7c913e143b6f25157c0c6ff95f233d87eec10b9e19e4daed68b5ea757741bbddead4b2c10acbaefba0a0d5abd03465c18213609c3de7450458 SHA512 049c2621aa74a31208a49fcb82e4b026b38ee9c3ca1a3f6c84323c425649bbcc8b4553c14a37bfb2717c42950fa717074a0a13bb8c28924ea246de90d949b3dc
+EBUILD whisper-1.1.5.ebuild 737 BLAKE2B 08b593ea9a48939ab2771096b6fb36146d1ac8fbc275bd531905dd5686688f2583deb1ae0112090bbc0d191c6ba657dab803b6f90667b80d42e0b196632f9e5d SHA512 ff614261d5af75ba659550633cf6a3a31230158810c9eae3846f82ef25965f0ae7fc164a07561329639fe48d11a3ec1e1073160c8c3022f64475959073ab7331
+EBUILD whisper-1.1.7.ebuild 772 BLAKE2B 2cced135980a423ba74b56a366202f75969501d5b9b59970a854bb79b75b79d04dc1cfa1b628a4321201b6a8887ad0b3b0eeccb2cbfa208af29185b9d35c079b SHA512 d30b4196ce8cb115edaaa934ef7a7aa447eaa292879351e6b313ae4dbd48dd8aaaa8bc429b08d62d1020be1cb7aec8f7bd461340acb289bc47c589d4c2062f97
 MISC metadata.xml 679 BLAKE2B 1e917a1f0626077ec990cef9c4973929fe7c1aeb9501caa4e80a5ab7d7599b03d93a2c91dbe5f4afd81b12f41688a4c6894442a18d3c9f5009cd314f77414367 SHA512 d2374c4f0abc36fb04b714ad6edadcbcd992fa70029f74eb3e568f81a11d3dd279db77901d634a8a80ba64dc6852195e88d2e8347a9c79fdb6d13f2290397186
diff --git a/dev-python/whisper/whisper-1.1.5.ebuild b/dev-python/whisper/whisper-1.1.5.ebuild
index f069fad70b1b..458aeab983c1 100644
--- a/dev-python/whisper/whisper-1.1.5.ebuild
+++ b/dev-python/whisper/whisper-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/graphite-project/whisper"
 SRC_URI="https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/whisper/whisper-1.1.7.ebuild b/dev-python/whisper/whisper-1.1.7.ebuild
index bec14f60743d..ad3271e64c22 100644
--- a/dev-python/whisper/whisper-1.1.7.ebuild
+++ b/dev-python/whisper/whisper-1.1.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/graphite-project/whisper"
 SRC_URI="https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 6a2163ebe872..6c0d06afdd42 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,7 @@
 DIST xmlschema-1.4.2.tar.gz 331747 BLAKE2B 013a74e7d929e46d497a55ad67888f0dd25b60097e390c3ad3b69c9a87d9e5a83bd68873336137805d755a47d0e5cb5b7347403ee38bcb7457e70803c6aca2ff SHA512 a490d1686f3e8cc7fd45bcb51f00ddf8b734e0c928f8690f9988232f8781fa070f7f03be7473ed5e8b3d1ab67bb08e123c79b408c3daaebfd2df0e94c8827888
 DIST xmlschema-1.5.1.tar.gz 349788 BLAKE2B a46aa6619594de4db31158f26def3dc070629cc29112aa02555c2479f57883d7d5afb82cbc65e4193d607b2572049ff7da8cf3cb14850b0a6f3166ae87d86928 SHA512 5e8b3adbf8c5b4ac6a85a2d9b62212870cdc6639634f9adf9d16499d86b9cc73fd1fc6ba496f14d840ecefc60f175c62f077a62bab68bd057150889d5ae0a872
+DIST xmlschema-1.5.2.tar.gz 350754 BLAKE2B e00a25e12ebef613f4d89522e059fcbd41f28920da62bcf8782e6c345b44133072dd578ef547d51e547ed92e5424fc9a885f1c789544f83d5cfe1743fcbe2f30 SHA512 8ab6de10c40aa96f57c4dbb37af2256ec46b28a844f3ad7a44f6184ff38687581c7f038ef87374f49fb204f48053c4693a98fa79059e9074745e0d2a6f353bce
 EBUILD xmlschema-1.4.2.ebuild 772 BLAKE2B 1593c3bfbe810a9e0008274d7448ae5b3f7136acef53029e0e573290356ad4bafefd2609fe9da0574c91f74e5e27b398e91a9abaebbaac470ac61c87635d0ea5 SHA512 4dc128cafdcf184f1d3ca3b8795b61e5d20ef9f3cded82bee83bed46e479c58b814c3158a763d3b6219acb9ab9889536f93cfe526915bca07241b3da0d79692f
 EBUILD xmlschema-1.5.1.ebuild 817 BLAKE2B ea1a253b9a9a0cfffb03c091110eca4aef76d627b039daf153bd8671a70f87b353355a93477c747c4bb415eea076a2d91e4637cc38a25c0e1fd57952ce20e0c1 SHA512 446b08b409e714d2e8f55d9eeb8b1b50d9ef81b33a04bc28c7adc7b482053d0195441742cffefdbe011931192c117fd7d9822340ac2bbe43bd1cd63e9cd6639a
+EBUILD xmlschema-1.5.2.ebuild 817 BLAKE2B ea1a253b9a9a0cfffb03c091110eca4aef76d627b039daf153bd8671a70f87b353355a93477c747c4bb415eea076a2d91e4637cc38a25c0e1fd57952ce20e0c1 SHA512 446b08b409e714d2e8f55d9eeb8b1b50d9ef81b33a04bc28c7adc7b482053d0195441742cffefdbe011931192c117fd7d9822340ac2bbe43bd1cd63e9cd6639a
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.5.2.ebuild b/dev-python/xmlschema/xmlschema-1.5.2.ebuild
new file mode 100644
index 000000000000..bb3a6af5bf3d
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.1.2[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-05 09:25:57 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-05 09:25:57 +0000
commit	6d691ad5b6239929063441bbd14c489e92e7396e (patch)
tree	e294f87b1ce66397fee1273bd6c7131aeb586f51 /dev-python
parent	d99093fb4bb5652015c06274d64083daa2439e4f (diff)