gentoo resync : 14.08.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-08-14 10:30:13 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-08-14 10:30:13 +0100
commit: 616579b5d773c50af31ee56f00105d96ce641ca2 (patch)
tree: 2ad4d3ba1429bd93a36ab99a2f5ec3490412115e /dev-python
parent: 068424b26532f3551a81421a9be67ed206e5c11a (diff)
173 files changed, 1779 insertions, 1885 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c69936857514..4a825b9aede3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index d4e4ffd092c7..4290bc38a835 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,4 +1,4 @@
 AUX PySocks-1.7.1-test_server.patch 1382 BLAKE2B 82bbc57a47b4cc0c6ee3177d997a25ba905b0c43eb5cc9b444d31080d20a365a85f1ab1c954d3edf0b9ef54a70985eb3956dd1533c09b46766d407edce085c07 SHA512 810bcbffd4d61db66459a04f422e6789a89f46d1026afd55c2bb06b13302e087613fc643b2f53df5f17992432df82707e776c60d8d0d69a6eebab862351d9ece
 DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
-EBUILD PySocks-1.7.1-r1.ebuild 1252 BLAKE2B 59697c187c92fc719bfba02259b1ce9ba6b6e413e2a076ab75bd34abfdc5756843a2bacc3022594a29fd0d1deff681d3f1adcd5d10b9e7aa165a8675b1e3f618 SHA512 8557070f8a71b56cd159b5fb19de16e51b100e342ddcf33f53734c5ed6dc2fa6d0f518166a8e970f5ab418f6a419a347bf723a8bfe4c2be226faf69403da2a64
+EBUILD PySocks-1.7.1-r1.ebuild 1312 BLAKE2B db6155b99270a0eac1eef84bbfe7d9fac9614e3c7ec67c0c85ac1045079416ffdc9cb73523dfa1c9b01595db118413bf56227443d462ebc16811b19ce2b99cb8 SHA512 8c06bf140b9062f28e9c7443dc19fdf9bfc22fc6a196ef1db4ec517574134533d8d720432de3914069da122425513124b6c13dac00d5056d6ddd51886dbba1b3
 MISC metadata.xml 524 BLAKE2B 10bf143a946a442804d9c53707b5f38e541f3ee95c21647df87d1c492ef230a455a6b895ee1fdc57cf2e7e3fa59c0dcdab55ed9d4583935def2aedb95cb0c80f SHA512 d1132eca2cb2856c99e00e5de8aea5fd554419499c2c867df513b832ed4d2326762ec460ea648a7a1fc8196f38d1c85a18a0eac2d1bed2b4a6e5c9e007268d6b
diff --git a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
index a3486b012e0d..94694dc95b2d 100644
--- a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index 6898e34bf9f8..f0ac8ab51316 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -5,6 +5,7 @@ DIST apispec-4.6.0.tar.gz 66147 BLAKE2B 98127cb2bf938cc1928e13e1169804eea174351a
 DIST apispec-4.7.0.tar.gz 66274 BLAKE2B dbb14dd831eddeb9f086643b6182ccc3e529e22ad7e31d1d4dd2dce54edf76c6cf01a74438383df5ccec18cf863334d5cdbd45214791c01632d7f7efa63f7aa3 SHA512 53c0a1e6db81439a7c3f8e933cac28003dd84444e65986a29aef8a6ec761999c84417902448288d69c5873d12dded2156e79bedc5bd4bd0fd472ea014e65a6c7
 DIST apispec-4.7.1.tar.gz 66356 BLAKE2B f78ab7f10c7a10f3d62b4d02e5a33cc1972aea0b33af1c485a11c2c415b2913a4d8151a9aa44de9876fa1ec6ebe02d448fb50dcc573e6a4779265ee07bda0329 SHA512 e5ead9a867d9dd18f2fb7509b6ef4afd9ec04cc102f55684a66e8f5ebe1b8e3e4129c62b7fd50f0a337547336375cee612e1bec620fa957f8f90d11968538c8e
 DIST apispec-5.0.0.gh.tar.gz 68795 BLAKE2B 42b4ea7d825fc94c6ca904df56a900b52ecd3fda78b3079103370c6cb362cea6338251d344c970c0ad0380d8b39931f6fc38f3e71dc4c31ace0763c6e9721f73 SHA512 1e3d4c06713081d90d5d8650e7aeedd12248ef9a43ced6681be4e9dbf4563b7390cabf3423ea2c1bfda6900cd193efa4e2cacdac77350fcf2e83cfc30580c98e
+DIST apispec-5.1.0.gh.tar.gz 69990 BLAKE2B 0fc488abae9657c9996775c460b97b66a782b82012bf3c1bb6a1623600b03c71bc80eb556d60720e00b07551a5c3b44b40f709bffbb05b10603485af9122cd6b SHA512 ebcb6ddc71be541c152f18eaf2462f09c5860b689d34581723dc8f70f4da59966c34ea6f1282be2ea38cb4524af224a96bcfe974f5fcc62bf4939c644aa6df48
 EBUILD apispec-4.4.1.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 EBUILD apispec-4.4.2.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 EBUILD apispec-4.5.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
@@ -12,4 +13,5 @@ EBUILD apispec-4.6.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21
 EBUILD apispec-4.7.0.ebuild 996 BLAKE2B f35028913e1ba896a4cd0047275b1c2a639f1c6339b6d44c3ef1584e20b653da5a63de8e8a3b3da7f2d0698f7588cc5092febe49f0273ef4a84a90fca0ca8d25 SHA512 b74e4a525fb9ea2ef1cf55cb180593e837833e8de81e480ba0bd4dddac08798b77d01befdc3abd1d6e8b4471c79c0bc97ff1fb1d1527681b16d72db9d94ec04e
 EBUILD apispec-4.7.1.ebuild 995 BLAKE2B d4317c8d7e04455f0755d2dbc1ec18f92eb708d072b13c34b956102fad5f4c212c29520d9af88503fdbbe344d7ab9529d470f0538b7bd5acc0956815d8ee132f SHA512 28f4b6701769f20a43eab803af1481d06108d3cc25c9e03cbcdef254168cbc39290e28a4ce92d866cc5b8ade49e286f0332db36f5e7bf82095394b7a4bf985b8
 EBUILD apispec-5.0.0.ebuild 1013 BLAKE2B 9428582a7bb9828da380e83a67fc10c16dfa96991bd9a665dc06cc753456794ee2b2d19ba7a09b2162199f430ebe3f466065839c4a4a67317c249a4f7e0cdd56 SHA512 6edc487cad0b66acb56b7eeffe6869a66de26cfb2f8b29512e4cbfc59bb4cbb6f74dec93d35ea5a3de43297faeea200cb70e4653512a849a8f2478c8a4f058bd
+EBUILD apispec-5.1.0.ebuild 1013 BLAKE2B 9428582a7bb9828da380e83a67fc10c16dfa96991bd9a665dc06cc753456794ee2b2d19ba7a09b2162199f430ebe3f466065839c4a4a67317c249a4f7e0cdd56 SHA512 6edc487cad0b66acb56b7eeffe6869a66de26cfb2f8b29512e4cbfc59bb4cbb6f74dec93d35ea5a3de43297faeea200cb70e4653512a849a8f2478c8a4f058bd
 MISC metadata.xml 503 BLAKE2B 2004c77c7f9cf9dc1e3cedc5f2acdfaf7df4c7b7cca45c7cf6644955a042d0a2919560acc6ef838c40568e6cb69bbf5340cbeb1211ce725b005bf652873b396e SHA512 edd05204d0174abc0737f18704d805a701dc4ccc6dd50f7b8da2a8ffb2aff2f4fc993a348e2c549c01d33ae255ec6ad089ff57ba5c3efd608aa6eb2391b2c2a8
diff --git a/dev-python/apispec/apispec-5.1.0.ebuild b/dev-python/apispec/apispec-5.1.0.ebuild
new file mode 100644
index 000000000000..9965d2dcdf04
--- /dev/null
+++ b/dev-python/apispec/apispec-5.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A pluggable API specification generator."
+HOMEPAGE="https://github.com/marshmallow-code/apispec/"
+SRC_URI="
+	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	local deselect=(
+		# requires unpackaged prance
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index baa2781d09a8..a4f89d46b927 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -3,9 +3,11 @@ DIST awxkit-19.1.0.tar.gz 94839 BLAKE2B 751084164581dd772c4f99b14d3e3526effd758b
 DIST awxkit-19.2.0.tar.gz 94870 BLAKE2B becd8819e5d7f495d73a16302389af802db9fc3d9e24e09f93f0e5a730552e676a2f6514a07ea6d90436837c78a32e6a7be9ba541942aae6e8437c30aa4fb2c5 SHA512 3bcae70da26170a8b9cfc49c3ea3391f4fc03c868286499b5d3303da3559927c1fd2c0aeae282831412825e34fb83d8324fe2e58ba11d60598bbbbb26ff661a3
 DIST awxkit-19.2.1.tar.gz 95129 BLAKE2B b68b98da71e835132993395f50b2b2a9dc344dec3534977da8468bd76c9d401bbf1d931878d79e2123e4d9cae1553d08c7132dd3041ed32d6282b778bce65098 SHA512 be46963515877b11f75e63c606de1900e244617480ebe90f4c5057e4b22c9687d6b371581beeb311c9e7bed94173b88d74838256024055b2fd5f1c5be1c4bda3
 DIST awxkit-19.2.2.tar.gz 95096 BLAKE2B dce95f819f2bbbaa60e09a8f25685a0f75b112f9fc27023f8d27acf4230a29477e14020dc838633a9fb20c65928857806c8a672c0666308798a78d2213ff15a0 SHA512 bab28be15011e9be3bd3f0d22ed5d5e67f0c19db08672ee4404ddd49a2686a2d7de790b4d06d8544b30a6b827def3a6974b0ee2960d9959d4c165afef4202995
+DIST awxkit-19.3.0.tar.gz 95520 BLAKE2B f02433b9f82537fb5318ed163c669ae00cb8f2e747368113f9332486d226eb3be7c5110929688cc0492d8cc91bb5800bca04da7d9250015142c6312e4996f4b3 SHA512 133665d3f5fa7cba194f2ef0bf4fd5b52a0a5eacee30041628023b71696efc8a11e76b0731879dde2e703da33e74ec73aa016c1ce486e92655a660e5ad778b09
 EBUILD awxkit-19.0.0-r1.ebuild 797 BLAKE2B 7ecff34a0436d846d71815c52fe7dc0bc5b02c05e92f7fa0cb726453cd43294d140c3c7bbff1bcf3101fab5adde5b838f091fea9e172dec98cff058de820c6c4 SHA512 a5ab9bf2f37931d183c6f2adb4cdd1a75c573a4cba25ff7b12f2c6df1163c0ada217174ce52da3678f8a8b7cf72954ae3e43f342a90bbf61a61e2a2dc0802ac9
 EBUILD awxkit-19.1.0.ebuild 749 BLAKE2B 385da85decfa2a652ae75f3baaa625d9199266d197586cebbcf8a816657faa07bfdb762934f643f520456eb60acbcde877a75ca61f47e0e622f869a76da70b8e SHA512 d28aff6d2b17fb87efe6b5a4f48a2a8ad54c5153b3c045f2e72d1163fa460aa2167a3857258fcb996ed1f4da0222b9423eccedcdf02f63e4729be662dbc49e8b
 EBUILD awxkit-19.2.0.ebuild 750 BLAKE2B 30b63a533818c0f81ee41a5d3e9b8c11bca3b948e7d5c3293ca33b930efd634b1079a6e722379471b77175ae38e578c27c2e085a6552358f6b277cd3949cb7a7 SHA512 8ae9e13bb0a4fd0cb2834cde5930824b9d2ddac7d2019dc02eb6303b1a01db2b3269cd72efe9efb0edf7f4260ed91290475bc0b38a072c2615c32652eb2ba614
 EBUILD awxkit-19.2.1.ebuild 750 BLAKE2B 13f965813d6e58a28298b278f8e64cd9013f034a1f93c3adec684af42072b6d42cd688f4165d9aea296556945c669b276dde54dd4adc03500a4567155d0394e7 SHA512 1d6eb343227b6c6c289aa67f7b1e6437195c0a304b8308fbca6340f13a2bec6fead8d1f445b855d3e08f28cc2dbd399fd7e662a1b88a9ecb0c2d91b4c3dad611
 EBUILD awxkit-19.2.2.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
+EBUILD awxkit-19.3.0.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
 MISC metadata.xml 511 BLAKE2B 79a6dd412f75b174ebd0d6dc1e13ec1d95538aae8572c80f0e354c7f2398d9ed3664ad69c9d07ce85572d9f65b994d91c0b345b41170466ba4d7d057b94bc6fb SHA512 05a14ab528d02615e61ee64a79aabb56c34b93b68c13f8ff0c807c6b046dc5b49aa45c793f9122220fd2ba62bc12e3001321801e4b3723f0ba0e52c3686f3128
diff --git a/dev-python/awxkit/awxkit-19.3.0.ebuild b/dev-python/awxkit/awxkit-19.3.0.ebuild
new file mode 100644
index 000000000000..6a4107d47a51
--- /dev/null
+++ b/dev-python/awxkit/awxkit-19.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 4260e2ad779e..983927f80841 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,42 +1,16 @@
-DIST boto3-1.17.104.tar.gz 387800 BLAKE2B 928824ab0a0c091fec430c5d86b0c5663f2a98042a76311588463f36f48a6bd9641fd25e07b63ad50afcb3ea9bfea0b5f3304e3c2689a2187198aac04549346c SHA512 477033e623476fa1e2e49cdb788f204ac49230088788cbae3f079de4561e7bbe56bb3b170480592a0ce056fcd2ea0cb3f14b4f5091279f46346465853a191829
 DIST boto3-1.17.112.tar.gz 391748 BLAKE2B 071eddfe134face48b86985ccd0171e0d8994fc65cd75e26945dfcab29566f42aa965c82b736cc7dd821a920e6903e4c45917af1759214606c2448b46c528cff SHA512 dcee3f4e2dfaf8feeeecc82ca938a72d654ced7a44f32e3dab43a225d8dcf0b3d20f0699770cfcd8ede840f792d37e124597d096322b88ce54c2e27e109da6e7
-DIST boto3-1.18.0.tar.gz 392345 BLAKE2B 8d464e038892cd77d7b171c27f41eee31c630ebcadce6677f76ccc270f3f8471d7a8443d174ce1b6ea5cdcfe98973faa42ddda4123ec21d225464515bdcd862d SHA512 ba5af17ae6705bfdea4a9d6bccb18d3f1593980d594be4dbb3049123089ba7d8ecaaed685d8a3181ae50e95b537e7a50fed3be694b4f61d3ba250693ae249f4d
-DIST boto3-1.18.1.tar.gz 392759 BLAKE2B bfa0bcfba9a413fbb13b2698f3ef2461cac99a9fddea0fe16d790a0ddab60fcd46b13ac4026536b9f89fb65ff703d61a4f01499423aa54289f17fc0f035ea2d6 SHA512 1aca424ff105fe2049c94aeaff306a683dd4eb9ac9b88303ff4857f53ddb4d3f267ef69119f8cbdb8463ab12331b2d89149fd0b10ccd23c4fde9485e63ba0005
-DIST boto3-1.18.10.tar.gz 398199 BLAKE2B 950b40afd867a8df9f8154e35572f3302c03c686d3299aac100ffd18a82c9e9a6657a4910f89f385dfb742c32e315110fc61bf00d2dc14892c4051eef5c642c8 SHA512 0391faf993faf8f4cc28e309f3267acc1beb38229f633f4c409820d45e968b1a93a7c74798ee84aebcd29b4547c9f301decd451e89b65a34297f796e1f839826
-DIST boto3-1.18.11.tar.gz 398542 BLAKE2B cecccf462510a6deb55308ea4156ae081d2357480e5d8c160797032c62554ac708f37b38e1cbe26a18e2087a268b392a145d0733400a86e4fca19a5416700ad8 SHA512 63cbea62fcd71fee1c53219f6016fe38bd08afdef0c27d918bd078d04803d14ddd4782c0182e304542314df4bcf081d802d1f581b25ccae3327c4df80e40dabe
-DIST boto3-1.18.12.tar.gz 398935 BLAKE2B 87f8627459908e4ff4bfde7ca7d325a355635c8e7c77cee515d30a443bfaba8474e3637e8facd8fd77778c2faab272e6526df92e96c59db4901bd3be44fce24d SHA512 bef678df9f073bb56152e8e56b4341e40aa98120ded26d1794d3e91382a994929150a06eee543d5397f065e66a9dad192b1a30e89f9d430f8a305a6d1e5a99b9
-DIST boto3-1.18.13.tar.gz 399893 BLAKE2B 3c3e79e2a8ea41a6bf88a2e73926d6e61c9844fe0d373126611e3023d98d9e6a64cf7b537726260ae70fd78fea32f19127d59ddac5d48489be231bfb2a51b693 SHA512 14987a472d5dd7eb254fa4fd4e931b43f36afc57b40676c0c2c2400bb24d7a31892d317b2da6d618311b5df91ee4a5c6cd4974ecf90971540c41b4d9632533ff
-DIST boto3-1.18.14.tar.gz 400263 BLAKE2B 827cf91c151ec03c6bca44967b8b94a5a4f93510ddae67b74dfe17fa800d02d2b139f3a0ecf6958ce24350345dd1f6da3c8dd69d7a5b504fbe79a9e8b587a3c2 SHA512 c3c338868ce50976deea02b308d8f9afecfbeac725319b4379391af1f85a6665de2cb59b2cb19a05520f1ff09d5c31bdc06525bd05e5bd2fa499641c4308b240
 DIST boto3-1.18.15.tar.gz 400374 BLAKE2B 2170319480578b9ac7b6c0da9e9a2f256ce907b8e53bc626bf26fd65f3336ec1974d6dd1917f601fe139e859f144fafd198b2578ffb9097508f09dd40cf82313 SHA512 f330d8249c9f5749770ba5809f3a4fb524f23fc0545b24182023a3b74f815608bdb9986b434d972a017aa7786b1319705e8702b041174275f84a0266bdb7b857
-DIST boto3-1.18.16.tar.gz 400837 BLAKE2B fd3f8118adb4bf83484d084e3d1d5fd3b593dce2a394e6bea35196823cb31e4ecb8649840a2c214aabf245db60cd9974cdb85ab2e79fd103a576d7a9e39f5a8b SHA512 3c967e0d2ccc47e83d47fa84c3ef88f9672d57f9a5d314ec8b7047887ca1bec17a8960ddf3e2ac4db38f947e7432449027cfc4dce3441617b4f18c92734d7b70
-DIST boto3-1.18.17.tar.gz 401136 BLAKE2B 5b14b44c525ac01be511c41ad3e4d49a0cf89229e5212789e2f6e3d8d61add7ae60df391a64c1ae69cda8e8065b80d405be586655b053d6e860a5ba28e951c0d SHA512 cd3659ec5484a7340c351838932786e2befab6f3be203db94fe3af195a50c757564aad966e37888f8bce14a58151c24fee114881cd9cad44567da95e9b574e8c
-DIST boto3-1.18.2.tar.gz 393528 BLAKE2B 20424f9a8ff013d1d9724f741ad6754747de504fb961688f433eba74ce1d6df7e95d68c45be1e87df1532f99b2fa4d7e8b00671a8ae9a378a4df74764924cdaa SHA512 287a1f24f62fa83fd944632799540257b2f8d6cf3b5d6add57be60e4f49dafd685bb4fcceef37fe907edba00a7f2285d92bd8d381b03e45ac794b22fdcfe8783
-DIST boto3-1.18.3.tar.gz 393645 BLAKE2B 4967ac751e9ff5a86f6f571961df31d82f6012ade28aa19a038399077bf5a1b968dfa1172995423890b79a2ede54e2c6f6c1937e8ccf21010f17a4d96928df62 SHA512 f9c42257f0925fffaeb1a36e4731dc54fee1836c249617444292991d043dbb9b58472f73a806981c9763b569cc7402b378f6e1e0102fe0f995a7754807f19b38
-DIST boto3-1.18.4.tar.gz 394442 BLAKE2B e82726143b353b843e915ea78ea2e033077ee495b1d416866f5c231f8bd864372496736d266b2b848ed8afd3134bd865c507291fd2fbdd5cae00a92ce3c5e76d SHA512 b3ba1328476a1c642c6b813afc3879e904bc14da69e062156df0405b3da6d2a15a4a40602f24d0a067a83cc441ce5a5e353dacb84869b0fe24e9984c0dec719f
-DIST boto3-1.18.5.tar.gz 394930 BLAKE2B a7f58699a4a27c85f00f47eb34d861509446d159434db8d492edb8d93f3d872757dde5adb358b89af80d9fb3f489fb424a4de6f8c62ac14220b22588bfb1ff0e SHA512 9292241055684dfdda22ec2243b0d64b00b3fa3ec73b3209db8eb8d90c14aa5aa2d7a77cdd0670350227ed6b923b9142842ed5bc8a4fecbaa4705a90af546022
-DIST boto3-1.18.6.tar.gz 394941 BLAKE2B c7ef6f85fea5a12c248afd03cbe5cca2475c32de0d5b90e8390837e4e1980390e07bc99b6dd1e1831c34135503fe5859e0a837e0aff88f7af2bd8ddcad804a1d SHA512 01cdc6e71b8cd04da7e6f2bf9268625824c12b53fc7322343ae635d5fdd6ed30170fb698d7c4a788b4095fbfc186ef72a11fb6f785a1006fe7861d2db6108da9
+DIST boto3-1.18.18.tar.gz 401335 BLAKE2B c5bdccfe065444d726a7115042de4bb4294905da589fe31e7576f99ad53e4c4eea5940909ee39adf2f2dc4457dc049ef5905d2b2523300009cf00fc772506b0f SHA512 201c97c8c7d5fb7d4dffe050d7dba38a5b9188729be8ca3094f266e42ef3568dec198df24525bf26ea19560657100d63a32fd914917ec55ade6da42f1973bf5d
+DIST boto3-1.18.19.tar.gz 401907 BLAKE2B 6b333fad48a06c6c047bf415bf30620f81846a1c7862af47767588c6f5cf34f8f3342131ca511ffadb6d16a899c9fa499273a17e8db226c7314b69645a90ef2c SHA512 055d0d2d6f0ae51d311df8a9af742c82ae4224a1f5adaa873bf8e688ffa98310553630c147622fbdda304ef8a271c188c187d9e7851ea009cbf0c1bc2d5947d0
+DIST boto3-1.18.20.tar.gz 402208 BLAKE2B 6bf4ccdb388590bbc182c76204b3a82f91cd31332cd8c386872ed8be504931592cef01ae24786d8f8e7d2128f427570eba39a365c0f23dacaac4ddfd2eb9df13 SHA512 b91f1f38fa4832b8f9a3da6aef180f910cd676ef82b029735b984158115ad69fe4d87a86d8a915aebeda56d8cd0c3158a6a93ca37876bfeaafadb2f0364a3032
+DIST boto3-1.18.21.tar.gz 402611 BLAKE2B 39974c66ed5ad0697be6df04dbb141ce28e9a09863349f7adfcf756666d58ed02232453a9d86d46e62380c0b7f197a52b6869469309dff0c532e50a6bfc88403 SHA512 9920891b7be9d98c3a3d2f3065183532624e78fd2ff7a94d26594d2499cd5d17db0ac4ba6adf27f0e0f67fa836020dfac648babc144e4339a3dd717a1bd56ef7
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
-DIST boto3-1.18.8.tar.gz 397295 BLAKE2B 34e4e9dbaf53d7e9917b26f62385a012663147bcebe3a3989f3e306ed1bad8fc90c47ecd0901e127ad024f67d6891e3eb2b2f59e179ca45fe88b5cca6968bbef SHA512 59ea0cb50058fde12f748b394b9ba7053755c642d6124343a6fe00d8c7918f123b508441006c5a9ebc6319d4318f7f95c481cca47d692349c4591958c38d53c7
-DIST boto3-1.18.9.tar.gz 397452 BLAKE2B 1a600eb067baebb59141f1e8cb15442d7fa338430534099df84b8b71f6fd90a56aa5ead0c38ba317018897861f996ce38cf995233778ad57e3be82e82870173b SHA512 12d2b8a1baa9993be322b770a13a8895718bd25c6d4a51bdef39413368c9ba62fdc93e4f517d3556e5d6a26e860b21f1bdd1ee6b0f49c83082973ee716d3017c
-EBUILD boto3-1.17.104.ebuild 1336 BLAKE2B cd492f68d066b954200ac23e330958382b0ed6d5dd6389b24824282197579442a7ea9b70db065259f436aebabb898fe9e9556f5be525fb7bf47960fd61903782 SHA512 32ecfbc280efd39c19295d6d38f3df12ef199263e741b13c35a0a927a609d90b250ba2a5a1324f045c493db7249d5889627d772767cf5de74946a35e5d17e9bc
-EBUILD boto3-1.17.112.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
-EBUILD boto3-1.18.0.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.1.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.10.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.11.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.12.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.13.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.14.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.17.112.ebuild 1336 BLAKE2B cd492f68d066b954200ac23e330958382b0ed6d5dd6389b24824282197579442a7ea9b70db065259f436aebabb898fe9e9556f5be525fb7bf47960fd61903782 SHA512 32ecfbc280efd39c19295d6d38f3df12ef199263e741b13c35a0a927a609d90b250ba2a5a1324f045c493db7249d5889627d772767cf5de74946a35e5d17e9bc
 EBUILD boto3-1.18.15.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.16.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.17.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.2.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.3.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.4.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.5.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.6.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.18.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.19.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.20.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.21.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.7.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.8.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
-EBUILD boto3-1.18.9.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.17.104.ebuild b/dev-python/boto3/boto3-1.17.104.ebuild
deleted file mode 100644
index 1e9c1265b2e7..000000000000
--- a/dev-python/boto3/boto3-1.17.104.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.17.112.ebuild b/dev-python/boto3/boto3-1.17.112.ebuild
index 75afb4bcf865..1e9c1265b2e7 100644
--- a/dev-python/boto3/boto3-1.17.112.ebuild
+++ b/dev-python/boto3/boto3-1.17.112.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	BOTOCORE_PV=${PV}
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/boto3/boto3-1.18.12.ebuild b/dev-python/boto3/boto3-1.18.12.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.12.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.13.ebuild b/dev-python/boto3/boto3-1.18.13.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.14.ebuild b/dev-python/boto3/boto3-1.18.14.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.14.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.16.ebuild b/dev-python/boto3/boto3-1.18.16.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.16.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.17.ebuild b/dev-python/boto3/boto3-1.18.17.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.17.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.0.ebuild b/dev-python/boto3/boto3-1.18.18.ebuild
index 819e73691110..819e73691110 100644
--- a/dev-python/boto3/boto3-1.18.0.ebuild
+++ b/dev-python/boto3/boto3-1.18.18.ebuild
diff --git a/dev-python/boto3/boto3-1.18.1.ebuild b/dev-python/boto3/boto3-1.18.19.ebuild
index 819e73691110..819e73691110 100644
--- a/dev-python/boto3/boto3-1.18.1.ebuild
+++ b/dev-python/boto3/boto3-1.18.19.ebuild
diff --git a/dev-python/boto3/boto3-1.18.2.ebuild b/dev-python/boto3/boto3-1.18.2.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.10.ebuild b/dev-python/boto3/boto3-1.18.20.ebuild
index 819e73691110..819e73691110 100644
--- a/dev-python/boto3/boto3-1.18.10.ebuild
+++ b/dev-python/boto3/boto3-1.18.20.ebuild
diff --git a/dev-python/boto3/boto3-1.18.11.ebuild b/dev-python/boto3/boto3-1.18.21.ebuild
index 819e73691110..819e73691110 100644
--- a/dev-python/boto3/boto3-1.18.11.ebuild
+++ b/dev-python/boto3/boto3-1.18.21.ebuild
diff --git a/dev-python/boto3/boto3-1.18.3.ebuild b/dev-python/boto3/boto3-1.18.3.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.4.ebuild b/dev-python/boto3/boto3-1.18.4.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.5.ebuild b/dev-python/boto3/boto3-1.18.5.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.6.ebuild b/dev-python/boto3/boto3-1.18.6.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.8.ebuild b/dev-python/boto3/boto3-1.18.8.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/boto3/boto3-1.18.9.ebuild b/dev-python/boto3/boto3-1.18.9.ebuild
deleted file mode 100644
index 819e73691110..000000000000
--- a/dev-python/boto3/boto3-1.18.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# prevent an infinite loop
-	rm tests/functional/docs/test_smoke.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ ||
-		die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index f48204508581..04b8817564b9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,43 +1,17 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-DIST botocore-1.20.104.tar.gz 7883624 BLAKE2B 4fb4c6abff5a2c3d3e19b11576e723f15a442b2d49e461a2a4c2bd613e26095ceb87f4b7ceb672f338ea04ad918060bed118f7bc4c184c46cce1d6a9f98d4239 SHA512 2201d87ce2e1c8979548698d6a46eb03c0a2026360b178fea895ad6a244efad534d9970d3c6343d50639d25b3b8643db6744658fec14e0fa29fd7c4b45c8e0d8
 DIST botocore-1.20.112.tar.gz 7917776 BLAKE2B 6a5ebf3d32c505ec2c1fc4cd3d97aa94c76b6206dda6ba28a946dfdc9973073019389c05d1cf09a0eced701fe86a9b8a292835415c0b1ceea75959a3186f65c6 SHA512 4b36367ffdd011aeb7654fd5c52c38e95bae4c55e5af85e38b0764140539ad1f8b9d75b0c7fd1009fda8d005ef4b17673b06f85a76b52fcebf05925297b6bbbf
-DIST botocore-1.21.0.tar.gz 7955550 BLAKE2B 7e68375d07d858dc2071538c2382d8693df23fea5326938491c492abe55c060d0cdf98698cef9b06dac996a59c907ed780e5baadabbb7c10d5e41efa84c4750c SHA512 e56eea7f3c4f39f51ef1d53dfb42fd5d601167cca7c868b1cf2f291732a8cf90aaa874760f262085439df5726c6b610369a325e863533b593aa708fd901398a1
-DIST botocore-1.21.1.tar.gz 7954248 BLAKE2B d6e7a71d6dd90ed0fcf0dbab3182dcdfa4072e65a1f344d44ac30abc829ac6c546a0ebcdee51f61ae65008550acf65052b49530ae3b3a62d81af222e6e8a0929 SHA512 86d4b4159a96426e7ab853b06564604fd9729011199ba691f6204a7e5f52d9927b93511b73cfc03b65bce706563c6d50b577d85d0de0e50fb5d877472d8326dc
-DIST botocore-1.21.10.tar.gz 8001298 BLAKE2B bbc762302462d9eb5e223245c8dd2430e6f190b643502d3a124e3831f531f014e49bb54bde768fc2dc7313e5b6ca7c78076a74511d724396370d1f699366ab44 SHA512 8e3c90d24ce5c6ae76376649c1ec191bdca162adfa8ab1b33903cffa9ccf2d7b306efe36b9d81f53f579170516c91c7c3f47a00d3033f5b691f2495b0ac97b88
-DIST botocore-1.21.11.tar.gz 8003282 BLAKE2B a7ada604bef2d5130169b0905acfb1ed51fbbafbb9df29d2ed3e3cbf89b44ded59b0de1baffe46b27b10e854b190517d95a26022cc22145fbeb42c46cdb780ae SHA512 45f66cdbbc66dc74c5aac003eb67569533088486fbd3443077be7d6ecb4fe9b8ba9a9de04b94b44fe02167f7261fc9675b7cfb8973de95510d4401a237416713
-DIST botocore-1.21.12.tar.gz 8003489 BLAKE2B 39249b2ccbca9cc11b8acaef59064de3f6533a399949eac6c7168feab987f98914e213cfa4e39067c431e65ec04929b68787f971cd3847229668f12c723f8194 SHA512 7332026e1fab6bc36627f5d9de21367d99ec307e8ff4591671713e81ad44b0549ce7d4fc04f992fc120ba55c54ebc8b5095ef5e4888bca19e0d2aeea25dbbc0a
-DIST botocore-1.21.13.tar.gz 8006167 BLAKE2B 7f876b608fa0d24717f010426a553f54aa3c5a661d923b2a11b685f81d14cbf35fb6cef3518992eb00a520b79d79499af39f4fd03086f6caa6c20d256723fc10 SHA512 e2a2a51e74c5cc98ebc28a58a6865030ebc810f8fd56ae1e0baac23f815b65f9f1fdde6d9e0771a847d383796213d453463f89382286eb0c762c11e0c682ffc9
-DIST botocore-1.21.14.tar.gz 8014362 BLAKE2B c201724fd1eae1a9f84e81ff9d23b27eaf7f38d2a2db1bbf3f1ad7aca37183b56ea752478e78825f5eb5762e649b533be49671acfbbc058cae96bc14121bb336 SHA512 eff147209d9526e2b90fae2dfdaf1536ab29714277d8e4ab2e0244cbf1ab3c98aca72e04c5c7659a98464d52a016bcd5601428f860c67737b080e562c36ebb6f
 DIST botocore-1.21.15.tar.gz 8012673 BLAKE2B cdd2b4128e67c85879e85f61265b10c1e5765eebf65333059af56a6a5b1d650a7612c4b569afde2396704015294e74b717c35d49c3e08396b2c603b7d47c632b SHA512 a5916ffa64568b2040d6f76571d9d716d50339fdaaed61f4ff7be92a5dac2c3f967280330fcbd3d6c2e1c1faf7bd6012ce75dd66ff26fde9d830d334a9d7c45a
-DIST botocore-1.21.16.tar.gz 8029528 BLAKE2B 2253072ebd31cf879fdd329bda82a6fe9698d7aeaf63be23f8c606f4082c09eeae091e7e2b4c62d8663a15bf8958140fcd9afdd4c40f7dece98d05ba8fe8a3c3 SHA512 a5f05204b7a3879689549d88ea964d0405516e285910d668451209cc81c72b850c7e65c1359f5df8bbddd094bed6ff22edcf1bb1927866cfa267114366f8bd69
-DIST botocore-1.21.17.tar.gz 8036012 BLAKE2B 9670d59ba0a9f73d031d31abd90c7c9d1e723a83f2016e59b028576fc9a5679bfb65aa7ef4c7d19cff3b5e21202597b146bfdcb6e51f822dac8c94518e330121 SHA512 e88ba8ef38ec781f402c7ff58ffa3b7348b8072d74a1c11ee777139233b0637e07923becf5e8790c38056983ea095b4214dcb4254c53944bea13079ada319504
-DIST botocore-1.21.2.tar.gz 7960118 BLAKE2B 11d2845e1846c03591625a95b21ff6fe1acb1448414a5f09de1d427614e927d974fafe5dd5d4f195aeb2f3b86d60822a8c73f1bc532bb45c85be8421f92eedc3 SHA512 501f059518026bef10fe933d20a3348b4140cff9ef1af38e17552aea8698179135f5271604e988f53c215e3a13158d7784a49a6b56c0d4db591f99dac9c57ca8
-DIST botocore-1.21.3.tar.gz 7959023 BLAKE2B aab15319b9f36c25ee88f2bf0b2efcb6bbffeac1b4e38dcbdfde3a947f702016e77b66c4b125ca2b63614223109fd793da68f9ce1b1d14476cdd6a3fcb10dfce SHA512 5a8ce8f612fd0e1c68a75223dda95673f72159b02a040d1a71920b7e75b3aa9d14589c33a52970182970a353308954e8cd6d5f97d374e0e2ee2cd40e0dce786e
-DIST botocore-1.21.4.tar.gz 7964960 BLAKE2B 71d55b47633aa658a9dc921375c77230a6ebb89460d9de5a9982d730e03247972476400dbcf292da0a885789860117c1abc9bf803c79547049b242feb8755d15 SHA512 4a36e5870d9996973e2258f2e6afeb7381ac94d14075eaa9885f6f89afb87fa5b4461b02ab234b4ecc8e24630434dbb839e8ad30f622de6ffa5402f872f84a97
-DIST botocore-1.21.5.tar.gz 7968981 BLAKE2B cea2c648e5f8d6f99bd1f11f430511abdc413bb3a2e36b2ca149f4edb0b8b750cba1149474351ab52a04e08018de81fab93607eb65e19b452a80a249cefb5871 SHA512 ad84b3f75883279452ba9922492e1a63b9f951ed54767feb573000d077335eb50685727ae1924d02f23d5342bcd8f96d2a56b06efedcded4b718e8ec68f6d636
-DIST botocore-1.21.6.tar.gz 7974218 BLAKE2B f3391b620a21d04712e1254c4e8ffc090956bc1e0a41278be2c0e02a659ada639af2cc4e94bf607492164a8425988c16e8b899726fe645871b1cf6d1f98ef04d SHA512 1a74f2450a1c57a61c704550c0f08fd518b8d4fc463acdd8622ca8bf7fa51293c52c54999e1a1d563815cb0fd35585072753d623739a6738367b0bae94f655b7
+DIST botocore-1.21.18.tar.gz 8034404 BLAKE2B f28cd392a0ca34bc5baa6316bcc9b040ab7cf429c6b16b1c9cb832d310640a75df21ac22634a565d91eeefcb1476f50487e2e80b52cfbfca1cdb9683e76d801f SHA512 485e3d293684659731061592082582678035ad657fe47cacd9f7608cf09d801bfd73951a3c0de77c65a79e6070638f0b3dddfa357d7f0ddbb773c70334b214b8
+DIST botocore-1.21.19.tar.gz 8042956 BLAKE2B 69f1ac5ad0282308998374fb4625c3a4e1203dc338c4f945b75f8c18c02754b02fdf88e65e9333876ea6495d7d2ee45e2b6592f6602676ace57f65b5f3fe6fd0 SHA512 2fcb1e8879ef963c54100e81923a05bef2830238c67f44f0627003be65335a019153c4537d375a54e5f180ac37cf99f30bef3b4f41edd350259128de48d1ea74
+DIST botocore-1.21.20.tar.gz 8041821 BLAKE2B 3691f5bf248c3d9d63e0ae46ce460e9d72662c1b6c526048cd2cf5ee4868892a2e86b41b37abd9fa8e9f90be92a1a171bc260a4de97de110aa3aea35f0170120 SHA512 b142fc293242f7364dfb29837436f84371c44289547668446a31180eae3615b31da6cc3a0634bca6d8cbebc990524009fd059b492979fb76250338d952fc99e1
+DIST botocore-1.21.21.tar.gz 8042971 BLAKE2B 888abb929e1d66c293bff9d3d25682590e0fce3173ca6e121b969d1ef92dd4bb3fd010f72ab4bed664ed6e2df94fd61a9211a3aad72742eb1d4ee2b192cb4f7d SHA512 f8f47c2a2ed07f90263fd5eefe593bf14e8bb2a8df599660f2c84c504a16eb1c370ff8edea0b809be34f1fe9c7e8a3d604b74689b9e16c0686e6ff7c640534a4
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
-DIST botocore-1.21.8.tar.gz 7996323 BLAKE2B a0c21ec64fd97f011d2e986806b0a47f5f5941f13b7a17fe84f4886a98e91629c641b9e39c2040105ebe4102d8a9c84ebaffbb6a0bf9ef8c48be80804863d441 SHA512 178914d04d1abfaed5fc7e5225e3da54706608d8075298e3b1d7ca4ef09fdef11ee4eb4b7e2f5eb60ab1527b2dcd0c46bbd6b987903be8959ea16e775ca9b548
-DIST botocore-1.21.9.tar.gz 7999524 BLAKE2B 23852915e20610691bc95a24023b2a06002215bfec1a74bdddaf11f0490ef58dccaad70428126c19928e437b1694a0146145257a6aa500ab690e10490a6e857e SHA512 2053d208e9b41139781fb4a8296c169ddea525998480a2dc524a615d9f7119909ad640acbd2d14ce02e2e3218d3faa954b3b92985f34a6fcb46ad6cdba787277
-EBUILD botocore-1.20.104.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
-EBUILD botocore-1.20.112.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.0.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.1.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.10.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.11.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.12.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.13.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.14.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.20.112.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
 EBUILD botocore-1.21.15.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.16.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.17.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.2.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.3.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.4.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.5.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.6.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.18.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.19.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.20.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.21.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.7.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.8.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
-EBUILD botocore-1.21.9.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.20.104.ebuild b/dev-python/botocore/botocore-1.20.104.ebuild
deleted file mode 100644
index 6b848259897b..000000000000
--- a/dev-python/botocore/botocore-1.20.104.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.20.112.ebuild b/dev-python/botocore/botocore-1.20.112.ebuild
index 30e0988848ad..6b848259897b 100644
--- a/dev-python/botocore/botocore-1.20.112.ebuild
+++ b/dev-python/botocore/botocore-1.20.112.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.21.12.ebuild b/dev-python/botocore/botocore-1.21.12.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.12.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.13.ebuild b/dev-python/botocore/botocore-1.21.13.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.13.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.14.ebuild b/dev-python/botocore/botocore-1.21.14.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.14.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.16.ebuild b/dev-python/botocore/botocore-1.21.16.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.16.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.17.ebuild b/dev-python/botocore/botocore-1.21.17.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.17.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.0.ebuild b/dev-python/botocore/botocore-1.21.18.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.21.0.ebuild
+++ b/dev-python/botocore/botocore-1.21.18.ebuild
diff --git a/dev-python/botocore/botocore-1.21.1.ebuild b/dev-python/botocore/botocore-1.21.19.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.21.1.ebuild
+++ b/dev-python/botocore/botocore-1.21.19.ebuild
diff --git a/dev-python/botocore/botocore-1.21.2.ebuild b/dev-python/botocore/botocore-1.21.2.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.10.ebuild b/dev-python/botocore/botocore-1.21.20.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.21.10.ebuild
+++ b/dev-python/botocore/botocore-1.21.20.ebuild
diff --git a/dev-python/botocore/botocore-1.21.11.ebuild b/dev-python/botocore/botocore-1.21.21.ebuild
index 30e0988848ad..30e0988848ad 100644
--- a/dev-python/botocore/botocore-1.21.11.ebuild
+++ b/dev-python/botocore/botocore-1.21.21.ebuild
diff --git a/dev-python/botocore/botocore-1.21.3.ebuild b/dev-python/botocore/botocore-1.21.3.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.4.ebuild b/dev-python/botocore/botocore-1.21.4.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.5.ebuild b/dev-python/botocore/botocore-1.21.5.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.6.ebuild b/dev-python/botocore/botocore-1.21.6.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.8.ebuild b/dev-python/botocore/botocore-1.21.8.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/botocore/botocore-1.21.9.ebuild b/dev-python/botocore/botocore-1.21.9.ebuild
deleted file mode 100644
index 30e0988848ad..000000000000
--- a/dev-python/botocore/botocore-1.21.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests nose
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-	# very unstable
-	sed -i -e 's:test_stress_test_token_bucket:_&:' \
-		tests/functional/retries/test_bucket.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# note: suites need to be run separately as one of the unit tests
-	# seems to be leaking mocks and breaking a few functional tests
-	nosetests -v tests/unit ||
-		die "unit tests failed under ${EPYTHON}"
-	nosetests -v tests/functional ||
-		die "functional tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index 9f469af0bf96..e28a306b115d 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,4 +1,4 @@
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlicffi-1.0.9.2.gh.tar.gz 22714 BLAKE2B 463cff7aed04718d1c77e6b3477dbbdb40cf61f0e045a7759bf1e8656e3b07e7b9f3ff5c5356069e752d750774a6ab203588a4094d27ad7ab9ae80f091c6ea3a SHA512 3d200f606c9851f0049835b53dd1f117727786505b5887e246934f41a978d375e1fa5a078e0811f130c009931e41c51575bd9d55b602ee7b6daebe9759ed15d5
-EBUILD brotlicffi-1.0.9.2.ebuild 1381 BLAKE2B 2efe21923806c2494916e1ed0b109f7c12d276a3b1906d794a0e3b0d4f11c537cd8e4c5e7cfaa53a357da5859cdeb1f213348fa3b93b17ac52dc4446c1c3c975 SHA512 3abcb1374d82a39d43496d4976511fb16b046a8e586a58da90b4e1f0702c165a09020180d42b03a28958d115a6ccb0d675fc566c1ce1613a5ee745b5f2b0c624
+EBUILD brotlicffi-1.0.9.2.ebuild 1441 BLAKE2B 02003737d880b07b3c94e9e21c3ffd48f26d5911b28a9eacb52d8aeaf6cff64e46403dcc84503f7c336e43fa5c07dd427fbbcd0868e63c450cf18fc895338266 SHA512 f878acf8968d6d9f473305e9b77940b96d5f51203d59c33d686ca17be8563e3a7b538ae7e8510dc74ada436bfb9245f8701c9c4ad7cc29129dd2a80e0d4a8ee4
 MISC metadata.xml 376 BLAKE2B 7044a00a2d66d5f983cc9485bc9a3124d24162cb72fb65c716653f1b4bddf7c6a1d3e7a407726098650167f74d5c10bab2582cabbb533cbf966ac0b8292cbe70 SHA512 51fee847f41d497493f69a12962df09d1229357502538b00c1941025230745bda4595619dca1277e6c01840c788e677ec0d1033d897350373e84ca6e9222ddd4
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
index 47fe74a20617..11b4bff3f1cf 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index 793493091ac6..790ea870c8c5 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,5 +1,7 @@
 DIST cachelib-0.1.1.tar.gz 10192 BLAKE2B ce1ac03498e331c0df405e99b26f24cf38f21243c60d90ca3b0fab599abce5ac8c59ba8c566216d761fea170d64934c63fd74f9733c50aa3ebe382c54b80bcfa SHA512 865dba727427907227b021ecc5962738c85fb74f898acfe1612e48247ada9eda3eddb72c3c29c700fe4275ed699accc5af9526afbaf0dfbfb3a1a1a6370cc3d6
 DIST cachelib-0.2.0.tar.gz 17735 BLAKE2B 737c5083b719b6330df4eab3e256fa64b9bd2292d46a1c0b82c72c6f69f4f2fae6623fd4bc167533101e0ff01b5273a1042f5c1bdf35080a5241358de642cba3 SHA512 4011d9ead4fe27a54508355eba46e91a924ce30ef3d7cdc5a2049f7e0e48f924b64d65f203aebcf9a8729f956b6edde4160cdb7edfa7e63293e2853b94bd6601
+DIST cachelib-0.3.0.tar.gz 18340 BLAKE2B e7f8aef925320c23691721f2f4ee7cfa66ab0ae8bf1e414d7344fc5799fbe66187791ffb9544f27b16dbf56ba8d2ec27a6ed080ccdf154a9b1a8582aa86c0127 SHA512 f9184cf9702c2df77e09d28d6feb8e6f0bc22f17c110a2371e76c4b78163950803e4f013c3746e21b9ac5771f72238ecd8bb041c5a7f44eab6bcb4de6e2ea377
 EBUILD cachelib-0.1.1.ebuild 514 BLAKE2B a3d34faaaaa1a3d7d254093f81f7a65382ce0d39849df1459deaa3cf4b97d9e4f120fb1e3ae7aa73b8c79b78a338052ee614cab160e02bfc8584f228aac1f9b5 SHA512 2b2d4a1adcd50421722d41170dade21d406213479de203912023434ac6c2c8a75bdbf57c9e273ec99ed40930b615bc9ebb32f32401d1ffd34bbb05eedbc0291e
 EBUILD cachelib-0.2.0.ebuild 711 BLAKE2B d99fcbb4f6350f3c8ee6c3d6f9a1a51489217e723c518f05011409aac0d10045eb5955dcfd84a39fcceadaf0230e4266cb1c6aa24749b2821f0fb6cfec2da91b SHA512 a3084f3dfac675bb36bd1e5fe811809e5a2d7702c8c0c0ab75b349fca86ce8d8a2fcff127018f9587626bbeb279a92bc54fe1e69dc7858ee2523a473a6bdefa3
+EBUILD cachelib-0.3.0.ebuild 712 BLAKE2B ccbe220e674a264b8402fe8ad6963079ec4232a5bce1a5f86aa0e0c67c2a4131f83ecbc97d91216ac890472f28a76386a7908a3be0708fc8211001f84123747f SHA512 9de72ad0c74186a30899e9cbde117bd2907f5e49c4cbfbd0ecf42b230c30fb46c2c26ccc2ad0cedd67b7ce2809067411f8d76958e480c092658b2f460d1bea7d
 MISC metadata.xml 473 BLAKE2B fc55238dc8f1e3bbdf2afd875e27bccd93084c0497826cae167ebcc7ae36529628bc6cd4d28fd0b6ce5e09d09ea9895e808f090ebc14d70db00bbe80e3c59db5 SHA512 ea41f45ce1423d8db2a46c098704516964f35086417377c9c24ed726d33229575dcf6563121c74f04584233a2744d11c699e454832082070a3f6b4738ad4d21e
diff --git a/dev-python/cachelib/cachelib-0.3.0.ebuild b/dev-python/cachelib/cachelib-0.3.0.ebuild
new file mode 100644
index 000000000000..3ec6572206d0
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 4b1b0603a691..9e04a350b9c5 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,3 +1,3 @@
 DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
-EBUILD certifi-10001-r1.ebuild 911 BLAKE2B b981028a7e4ea0d5cd6aa7561bae0114fde3ab550731b797502afd5a3caa8b1355964be3d6148b739a4ea93301d20b28a45e73138c9eded91f0ec8dfa74166ad SHA512 0de9f77556ce2130c8c90ee062ada09dfaae1476b3bbb8086e5a326d7c5d14e6cebe34bc6b776ad75f84b9beaac7574f4e7f8ecfb0a0e1867609832f7fa1ca6d
+EBUILD certifi-10001-r1.ebuild 971 BLAKE2B 297d433fc7b348639780a87c563a23dd2687450f9e1c6a141b9fa60d6859d21e1be0e25cbd28a6e7f97158dc9924d91e7c2434ece7311f46536957ea646c427e SHA512 e26246ca128eb9720e14a907102a8c847b06da8567af7fbc3786663a60a7a6ae2d0905f670795f32bff93af367c0cf94b8b6d4cd537e69248981e1eefdcce481
 MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9
diff --git a/dev-python/certifi/certifi-10001-r1.ebuild b/dev-python/certifi/certifi-10001-r1.ebuild
index 383139c1d2ea..e810f32cf935 100644
--- a/dev-python/certifi/certifi-10001-r1.ebuild
+++ b/dev-python/certifi/certifi-10001-r1.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index ab2cf40915e9..ea283421b704 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,5 +2,5 @@ AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534d
 DIST cffi-1.14.5.tar.gz 475055 BLAKE2B d8a1f83aace8329216f5d36b2e8a27f62803fe9ad12c2d29aa1b3f730d1beb8bad0f50e17102c8673471a7bef57b0755157c4e1bf1a50779ed20b1cfcbb2043a SHA512 7428b3f6e4ee9f3b91011e43304dd63e5cc48479120ae58298c646c1ec1f5c24525d5f08655a7fed70c5fad7ae0c2e0539e512b5fa49d2bc57669c4ab703cc2a
 DIST cffi-1.14.6.tar.gz 475744 BLAKE2B 46e3f1f61746f659c066d83fdb07b83c289eda68056c6f9e364ea6f30cd56c190e4fdb35586c064b2402483704a7c1e9399d7f30cb49a78eec21797146da36f2 SHA512 30a8b25b74921a90a1fa96d05de1f25437d0fbbf73b7de0bb9ce22dfcaccbd78376b605525fe970212221d3e598357a9b1da420bfbd1a3e513263ed2b789e813
 EBUILD cffi-1.14.5.ebuild 1458 BLAKE2B 5e05f0c65d7f71b5d81897f4f84288902fb31a0e798a0f9ad12fdc1de8ec3da198fc2c6916a4d4f1d7a6162e90d8efe3e6aecc1052002664aeb5fddbf8cb00f1 SHA512 d4ae155adb6715b2dc303cc54b7ab97319b9ff79c48607778fba4a2e7548cde8b88f4e8990e4bd649ef49843eca84aab2a3811bf524993a9ae66f2e7dfb788a4
-EBUILD cffi-1.14.6.ebuild 1409 BLAKE2B 2faaea5cdfc1cfb724be00ab3fc717a7e2fed8098026a006d9bc920b8709316ccccb359db379b62550f0f524ab7ff248cbe6e71d37d65b702354c39d8dea4bd4 SHA512 e516f157ec3c3a161dedc6d8b0b66230825664ac3e6dbb7479e2bc860a23aa2beb3f5dc471894aac19ef9dea40794d9a3444b1fc4f22498278bf9023c74a2110
+EBUILD cffi-1.14.6.ebuild 1469 BLAKE2B 7bb9f44cea5bca72340ce7d749500c59c1e41b89bbf9b8e3a6b3ddfd28ea33bf3c5088b16e97c90fcbca1e207dad62b269775a16db39792a5d1184ce122b0fe1 SHA512 37adedd6910a12f0790291dc74418faf169aee32c22374923bb37b380121e4aed5029fdbd0aa9b2f4fb9db8a09cee29ce0ac0edf5f7d06b1806bd82d38eff2a2
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.14.6.ebuild b/dev-python/cffi/cffi-1.14.6.ebuild
index 52e37d7afcc5..d2ca15df50f9 100644
--- a/dev-python/cffi/cffi-1.14.6.ebuild
+++ b/dev-python/cffi/cffi-1.14.6.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index fa91ec789571..fe4fa78c39a4 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,3 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
-EBUILD charset_normalizer-2.0.3.ebuild 650 BLAKE2B da8234be681ce4d1d548c84038a700259e8c7b13a076a5ac450ab0cae819ff2313426c0f66c14a63f7e5c3111d5b6329877724f731e12da4dc3ff67e92911580 SHA512 b98413849a0aac1bdaf0b95e2759faf1a46b2cdf59fa842f9a3c031dd8fac8e30e3ead4ca9ea5bed008dff02cf141ee08e4fec42ad739329def2bba8990f9a80
+EBUILD charset_normalizer-2.0.3.ebuild 710 BLAKE2B 19d9dfe49c4fc71b3acf10183cc1644b4b349beb5e31c590569b69a39f13480887afa0c97ab2c5b10c4321f4bbcb854e51f8aa3d7a05d0c92e7ebb7dea8a89a1 SHA512 48cbe0bca1c62305ffde8daf2f195cb767fc3336ed1f52315b92030b082e41b196d611481b2fc4600731dd0c52e6f193d8bfc9e7b3c3556c3f7acf259bc842cc
 MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
index f26239f68a02..68c3ead3e5a5 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index d5e6ff414609..811583558a71 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,3 +1,5 @@
 DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
+DIST cython-test-exception-raiser-1.0.2.gh.tar.gz 4579 BLAKE2B da09ce49817ae40054ab996aa3fcfa45769736fb56cbc91ed183f73413b3298859ab0dbd6e6ddfae835411891c02c67a01194531cc4269663656af1529e81f0e SHA512 ad245eb87fe2d4d93d244b125d80f17fe6deeac86ae9a9129d211d9ff1738da39dc30d49a80f33d50a6fa52029403018c87a8637db9c21098ef8b0e3afe20ea7
 EBUILD cython-test-exception-raiser-1.0.0.ebuild 627 BLAKE2B 49c9ebab82db4fa3b37addc9188b960e4bf4ac883b052e59922266d13f3c299baf7657a7893b0a0ff0f94a93b1eb2580ad6bc16877e8b3bfbf7c0fb710cbe888 SHA512 edea9eebca886422f75f7c3f2f639cf9845190f626cf6401bbbb012391601cf7172b1d337a86ceb0581fa76bfce4901ab88e61636fe37a14232ae7b1727d50a2
+EBUILD cython-test-exception-raiser-1.0.2.ebuild 635 BLAKE2B 251529191a0aed2b74164c18075fa3f12eb52c29c598ba819f0f8301d8990f12023cf6e5eb4fb81627adc6c73d25e56ec625d0bed574fba58faf55751edf5b58 SHA512 bb135a054951bc7e494e939d80e901793bb607df3c922e5488ff2585fc079e8caa64cf8a1ee349a530f855e24ff183c9be57fe572af638028faabcea2e2a5f95
 MISC metadata.xml 385 BLAKE2B a99aacc4e3a21f41dd413b185fec8ac393e1c1c2f3897fd7173d717a72b056acb8362a0b5c9b6028021365678f828549fc0b711e9697620f50f9d66ff83952d9 SHA512 1b978c0d50c3b60bdcba9bf93d6da041d83cc9614d4fc6b9837ce9797b0c251d2ed08777f7bc0877d98a9c76b8f8ec744f7f171cbb663aa36e55e2e6a7429fd2
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
new file mode 100644
index 000000000000..ba44a82f8fd0
--- /dev/null
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="A trivial extension that just raises an exception (for testing)"
+HOMEPAGE="
+	https://pypi.org/project/cython-test-exception-raiser/
+	https://github.com/twisted/cython-test-exception-raiser/"
+SRC_URI="
+	https://github.com/twisted/cython-test-exception-raiser/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 1798375125f1..8effdf3e5d42 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -2,8 +2,10 @@ DIST dask-2021.6.2.tar.gz 3725731 BLAKE2B 957cf70c328462c87eb52bb2fe3d471705ab6b
 DIST dask-2021.7.0.tar.gz 3730549 BLAKE2B 8f76648614adbef8ca1feb01f5b39d4ad217eb5178c4b7ace72d3764062b172d83b74e9fad5eeff0a745025e0cb2bf47bdb14beb03b1520130332ece00c3e318 SHA512 3dbeefe08af6536f19a03ead69372dfa7a26eff66d768fa8e238341822136a2314fca0291694ad22bdfe3618a4ed6785d836ceb5cc4231f361d97f0cbba0edbf
 DIST dask-2021.7.1.tar.gz 3734645 BLAKE2B 4dfd98c72a54712dc4bee97305811bf411bceb5e5ad60d6a82e94b785be51ea8e2ea6ae853b85f45a9765f0220f4c35b526582f1587932178d53884df1d697d7 SHA512 0b5ab5e08503468ca26ee2b0e195979055c9fa439e62f1c47e73521856f7ddb2fa608457cd1e4a0edcd3162254d404ae4995319b73b142bf6bd804c6b63b3f22
 DIST dask-2021.7.2.tar.gz 3739041 BLAKE2B e32389a5d6a47a9c0f741a33d2f9aeb8887c951d4a53ad7e2bdc5d7007e2e7b8db9b639b95725bb70cfdf1f3568aa2541c7f46c5c87cbb50b5433866b7f0e870 SHA512 029832ea2db342cc63dcfc4e5a563e6e92f5d26298ca19d7815548acceb8098e94b53acb5df1a6923172e7014b6235ddb34921f2855701921556db83a9411afa
+DIST dask-2021.8.0.tar.gz 3742254 BLAKE2B a4f086181dc5dd36561d365ac929c0399d05fbb9d39e025ad06a609477cd4e257abb93760244032285812409c413a110f213ad2918ec1042e1526f847da1056f SHA512 b205c05965aec419650b9125193d96383ad9ffa96e8aef92ac15da339e0ba9d1c40ba6bc176e56aca0ef6f84d7a523d7157aba90e146317aef58fe34dc07e2bc
 EBUILD dask-2021.6.2.ebuild 1128 BLAKE2B 2302fd9867ee06d58d1707bcb06658a23e633041974b604563859c5a67b084514e6fba886182dd3f721991f33d9ac9010a2b114b90e7f91fa192af88507fbeed SHA512 b378c693d991fc814d31d2c93541513d18bd79fb7220acbad444e6aea44295962e33f4249d84f7db25b66bb22a6b554abc76428a20e8680fbe87ae84f3c272f6
 EBUILD dask-2021.7.0.ebuild 1199 BLAKE2B 52cfc495d9df0fb9d3c6477baac98f8e8eddda366c79d1f83cf0c3c828418e436bd10b1aacb449d9a76f329b63b8ae882840105fb65e3429e3e6f0ef41657bc7 SHA512 0e9047e376151ddf90bcc6de0d46863d703472f67889e50c6869795be40fd163e7b728d24c870ca4d466e0e7a6dcda65beb6f7cb07caca88f951683a55896594
 EBUILD dask-2021.7.1.ebuild 1246 BLAKE2B 98fdc9b9785d6fe9c0348c9cdfb1235e7981e0711c105da79e2a073cb393c8ed84847ec3ad9d0524ccdd9d841499e1f36867e3c6b08bb0c729653d1484b8f206 SHA512 c9e1b73ce128af0f63faaeb04ea8b74e9b6000713ce977aa4ae6f3eaf55342f1a986d2d01e6ba413b1dc47762b601aaf8422b318866709aed75e06f1f4820422
 EBUILD dask-2021.7.2.ebuild 1246 BLAKE2B 98fdc9b9785d6fe9c0348c9cdfb1235e7981e0711c105da79e2a073cb393c8ed84847ec3ad9d0524ccdd9d841499e1f36867e3c6b08bb0c729653d1484b8f206 SHA512 c9e1b73ce128af0f63faaeb04ea8b74e9b6000713ce977aa4ae6f3eaf55342f1a986d2d01e6ba413b1dc47762b601aaf8422b318866709aed75e06f1f4820422
+EBUILD dask-2021.8.0.ebuild 1246 BLAKE2B 98fdc9b9785d6fe9c0348c9cdfb1235e7981e0711c105da79e2a073cb393c8ed84847ec3ad9d0524ccdd9d841499e1f36867e3c6b08bb0c729653d1484b8f206 SHA512 c9e1b73ce128af0f63faaeb04ea8b74e9b6000713ce977aa4ae6f3eaf55342f1a986d2d01e6ba413b1dc47762b601aaf8422b318866709aed75e06f1f4820422
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.8.0.ebuild b/dev-python/dask/dask-2021.8.0.ebuild
new file mode 100644
index 000000000000..a7f474643d23
--- /dev/null
+++ b/dev-python/dask/dask-2021.8.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require old sqlalchemy
+		dask/dataframe/io/tests/test_sql.py
+	)
+
+	epytest -p no:flaky -m "not network" ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 2790d71d9940..f86a3af52dba 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,3 +1,5 @@
 DIST defcon-0.8.1.tar.gz 424712 BLAKE2B f2f2e3e811eeb163a875686dc6658376dfd9c09a8a9e3de2e6fdf512f25e93d5f6d8ac9ad3c31c70ecdcdd2c30b0e6a3d9b7a222bcd7065feba0b2e805e8eead SHA512 40606bd861fc7100d955e23ad6efb3879572179c81b730404afe41cef1e45ae5f54efb716af61866ac226ae057c6d85a123f4790442c085c054ff3cb5ec84108
+DIST defcon-0.9.0.tar.gz 426109 BLAKE2B ac9e7292a444843f675168120ddb1aee636e3f7569ba9d90660906665b109054c245398ba2de93faf255a412dd9e65569fb0cf68d845636ca1780190b6cdcd21 SHA512 29f0fde5bf9809ef9601497844fed3d537aa02de4404e191f8504808271ad263e3a11ea82f04c78a0fa3e673e511ea6600c707f956f06b3186e87a3ce4d84c13
 EBUILD defcon-0.8.1.ebuild 684 BLAKE2B 3aa2b1f734a196d8555027915adc9370f828928842d055035be8f2558686536cbbd438b84fcfded1d00eae93e46c4022ef7985439cdbf88209915fa6ba2a549f SHA512 0b2d0b1a5ac93c2046515e99fa15edec603c36ea185ef092b8b974fddb5340ba345c0c4704eb3147a9c0d706ccc1cd012047e71c1c4d8b457a896e1d443d76e6
+EBUILD defcon-0.9.0.ebuild 688 BLAKE2B fef6b8d3240df92fdb7c92f024639a9e2e160b507df33111e12f4a07dde83343fc21abe3b1085bbe739352384d997d1fceed59f4811ac7b5ca292882bec0f0b1 SHA512 b5647268ef421f384bfc16dabd94ef521ad560089b3b6625fe400880ac6ddfbcb023498b3dec81ff6fad136c3349eb09b61d1ccfe97e634be73a72d9042992c0
 MISC metadata.xml 392 BLAKE2B a4d2092bcba7205623f44d3f461f3c9f869c9a9e7521b491232f9ade8c3f457c0e60c435b7f0751721279441e493ab0ece6b6da0f6d89a594fc34a18c4d37088 SHA512 70bb099659e2c90b33ecb2ecb2bc3b54bfb0bc148ef872a564df8470ece1ba0b7bf07340a5c6ccfa4f0a9ca574dfb652117dcc88df33ac2bf11a5652c66e0aa6
diff --git a/dev-python/defcon/defcon-0.9.0.ebuild b/dev-python/defcon/defcon-0.9.0.ebuild
new file mode 100644
index 000000000000..7b058b3bee53
--- /dev/null
+++ b/dev-python/defcon/defcon-0.9.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/robotools/defcon"
+SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 5c7be33d49fe..e019cb430850 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,3 +1,3 @@
 DIST dns-lexicon-3.3.4.tar.gz 147008 BLAKE2B 14e0bbba48b8340ecb274c122363aef6490de539ea2c1ce7a4ba4ef19eaa69271ea22e28afd700dba0a1060b01211f8ac9a1081e21973f07abb9ca057638241c SHA512 274a1a4ffd1d767623723b6e9aee1e9f07022f3985cbc15f75cc410f477e1dcb7a674fa847119bdccab7332d058f77ef85771bd7bcdadbe2dd9483415a365a6d
 EBUILD dns-lexicon-3.3.4.ebuild 625 BLAKE2B 723c37b38fad26079e87f13fc99833f2f33af22682eb8b25b3f9e4d83c40c8aa1fd312f133e11b15f9c8921c125b599dcbe6bb397e90fa932934c8939d93e2e9 SHA512 0cd5aeff362c83f2ef711ac72dfaed3ffa6ac0488d31e9ec8a4dad8d725d24b4706dee9f1306832174d10266557ec2f873e99b90cbdf620cb609535cbfa3439c
-MISC metadata.xml 321 BLAKE2B 9a4d10338c252149b986ddec309089607f2a1d3ea0ebaeb20860a14d3207260f34c14d8deb2eae973c01a4645802e2669d547378c3fdf58254bb26cc127974b3 SHA512 16c6b64132fd43d6c3e2767e94f9c24e91d73aa82be948483a63cef3be3835ba2135dace06cc816449677385856c1376218ef60c0d96af9c2766279dd3c6c51c
+MISC metadata.xml 439 BLAKE2B 83c88e8efae9eed766a6f061446036bbf9ca1d3143257d6b23dfd4424b3c468d3a6e38727915eec05d33f070d4cec06b81948a629db542ca89b9e165dbc09f4f SHA512 4f2842cc32c0b560c6304fb2d3611cc87069c4408b095bfa6ff1ded387cfe51ac69681d6be561bd6006525116b0dcdbb9df3eea85c1fe4ef5cec25367f2eb199
diff --git a/dev-python/dns-lexicon/metadata.xml b/dev-python/dns-lexicon/metadata.xml
index 1f03a671c07d..cbda10550fbb 100644
--- a/dev-python/dns-lexicon/metadata.xml
+++ b/dev-python/dns-lexicon/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">dns-lexicon</remote-id>
+		<remote-id type="github">AnalogJ/lexicon</remote-id>
+		<bugs-to>https://github.com/AnalogJ/lexicon/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index 28889dee327f..6f0939b92658 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,7 @@
 DIST hcloud-python-1.12.0.tar.gz 88905 BLAKE2B 1e24cfa208f02a1068b0016ac8948358a3709eb4a2c1f73d75d8e3ee85bee7265b0da6f5cfc58afefee664a024becc57dfa3389f36c4e7ae0c0ae623944e51a3 SHA512 fc431041d2bbae749d5335dda0c8ccf6abcb3fdd8e3a467b50a2ff45e70f9b7a8378bc2b72c00be7c65cc8cf84e01fde7965c6bb731b7252d7da377648bc01eb
 DIST hcloud-python-1.13.0.tar.gz 89714 BLAKE2B 0d39d25c867e2433cec235b1ce101b3df8c5946cb4ccc7ffe658cb8a721eea5502f8fb2816491ac687a411a696c60ba4b1c602668385480d7a3645eb2a652c62 SHA512 4283b7b9be6add5ee6321645efc95b4bb77110417bff34327a533c416ee916c19511c35ef614fddbff184ee515fcf31bce740cdb6ad5c18ea7dd8e66c9760fc5
+DIST hcloud-python-1.14.1.tar.gz 89865 BLAKE2B 962c24488681ed31d91d2f94b589de2c6192f3397831b482e3f0939224705344671467708266f1ce9ddf2ba767a0eaccaf4ac7516e1a9e27b5a5331fb009ab5c SHA512 bc4fdae97daf41ec8b84bf4069c07d75674b5bab8e74861a28e124343135e6c90fbdef232c6950d612778ffb9ba194bc9bd1a432df2336664e9fef87e28f9210
 EBUILD hcloud-python-1.12.0.ebuild 992 BLAKE2B b9dbea60ab939354671d428ceb8851d8195f9268a6f380fb542f9710b6ffebbaa5b345f9bdead549f828ff1207534837d789dd5bd2823f7940293c82f9d9c756 SHA512 2246a7df95faf8d89378cace8adb1e37bb739c6e7d319435238569d941c42639120c2300a9d87147bc2b25849c6e3fb758f88d4d91bd8cb68ab537cea3afdb31
 EBUILD hcloud-python-1.13.0.ebuild 992 BLAKE2B 55e2c8d323ec86318a0d77f2e9b3db2b778a728621af9cf5573ceae4dfa0aff47eb4c3dcb013071844959bf1b0c9fadc86e754e11b45a50354cea70de12dc68d SHA512 b22924bba14020d69609fcc82ccea8258257c424f4b936e72a6a1d1486c4a34cd7404b79329ab192f2db25afb008adfcd4f3bc85d9bda0dbce2f1aee892c8050
+EBUILD hcloud-python-1.14.1.ebuild 992 BLAKE2B 55e2c8d323ec86318a0d77f2e9b3db2b778a728621af9cf5573ceae4dfa0aff47eb4c3dcb013071844959bf1b0c9fadc86e754e11b45a50354cea70de12dc68d SHA512 b22924bba14020d69609fcc82ccea8258257c424f4b936e72a6a1d1486c4a34cd7404b79329ab192f2db25afb008adfcd4f3bc85d9bda0dbce2f1aee892c8050
 MISC metadata.xml 482 BLAKE2B b58d0b4580285588a5d2078699bcc2bc2fbfdb3c207266ad7f798cee761added5f819341dbddfa27066e7037128065004694e21f043a2590dc54e3e4c6e2c688 SHA512 c3370f871cfcb333f24f293bf1435ef007d4d1d6d38573744e8efeda8910d1bf08685081fb9ef0a869ec134456231a36ca43e398e279d47ada7e4ffb5c645534
diff --git a/dev-python/hcloud-python/hcloud-python-1.14.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.14.1.ebuild
new file mode 100644
index 000000000000..ca78be85c160
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.14.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples"
+
+RDEPEND="
+	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	epytest --ignore tests/integration
+}
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 46ee005178da..d36f4e412471 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,3 +1,3 @@
 DIST idna-3.2.tar.gz 243962 BLAKE2B c1c53533fd70a705822abf7debcb98d1cdc474df63eea22f0502585f9f2d143c4a35e575081951a8b98325e45ae5af46bba6632b04d40cb7181306e293377884 SHA512 2bc8e37abdc0570e5e13c9064f51630605806c3246a8d292511dad6f971610288212a2d881f9356ecb383f871e1477ccd60c4a5d6d7fd05254ff740d36543f35
-EBUILD idna-3.2.ebuild 629 BLAKE2B d35f572bc1077849fc663ffd68e7660067baf710b924dc84c92a1116c4d9190812bbc6479b1dea4b396e93abb05ee0a3618a2eaf9ee2ac95c04f245cfea1d022 SHA512 d74e2af4939e768f32da63b7b286c19fe827b717b8634070ebbb324e05034a036dbaa18ac08d7bfbdca8643873e5d483b2ca47734736872553f884c0a401736b
+EBUILD idna-3.2.ebuild 689 BLAKE2B 5f8b306b2d41db4181e2ba0c1020faf8ec723e09616fd5ce9612f4d62f72d1410c7861df6f7065bb3728c55921a9b3a8df6010c57d86d28c31ba40fab9a4e31e SHA512 9c2e0760bb7657ff8fbf397965db3fc27df828f17b4ba734a889758c22bb51c12a731b49a47fa58500b176ae2a6bee4d6cb39e9f8d375d506b58283da94c8144
 MISC metadata.xml 392 BLAKE2B 3dc0422f56bcbb74b91e6366e35e0393e420321140b9589777e261b3169e837caffa3c6703306cdfc3f3d7d4e77a84b132650b17df485e02bce906992c49fbd0 SHA512 ac8113778dc4e03045ab53beeefacb748df94329289d09a2e49a0df6328c24b864be241e24377ce23173f9f7662f7fc18ce7e4a99e4b6a935db68ffb9fa958b7
diff --git a/dev-python/idna/idna-3.2.ebuild b/dev-python/idna/idna-3.2.ebuild
index f5e0c5e0d6c6..7c9c0d865d0d 100644
--- a/dev-python/idna/idna-3.2.ebuild
+++ b/dev-python/idna/idna-3.2.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 34d4123ec0b3..4113450a64f9 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,7 @@
 DIST importlib_metadata-4.6.1.tar.gz 39801 BLAKE2B 89a792eee17f31a86c27820a0b3972cd8f6a06314763930ccdf0cfce31435f8074e6f8f27050d1618713ee6d517f0cd8dfba6a86b1e8917af2769ae22ac40cf5 SHA512 2a0bcef3d49de00a1013eac48f1ce020cb89ab895f5e4a1673b46a1ad8f84515148eff33608847331de8ee05d7e10040e128b2c887065d3ca16d0bd338c761c0
 DIST importlib_metadata-4.6.3.tar.gz 39852 BLAKE2B a6ab735a8471cddbdd1cefcbbabb29664a8dc96c4163a361422066081f00ffb627612a4b7522cd636de9cb030d0add61dcbb38d085dc759f810239017bb5f681 SHA512 b34b3384bfa1043a1b366505c43fb8a8f0a3a055637cd745009095026dc8a1424c1065fbff5a9170523a3b9b0a48951b615dc64b7bf096bbc2c40261fa200e60
+DIST importlib_metadata-4.6.4.tar.gz 39881 BLAKE2B b7ae57ee18506807a4a0c03d657408047548535e5b6be5f654ba70eb34a1f92701a063a39f4bbc4c67fee3afbda5bb76e87caf588c2915416113547edbdab57a SHA512 20aad4adbea8bc417a77cd67a6e22e690e95913ee34822d79e4bb0472f396ece2137ab4cabc455a8154251fe563ed7f56a68bdb7b08a91c8a32f735608cb4a7c
 EBUILD importlib_metadata-4.6.1.ebuild 1262 BLAKE2B a8401a6616ba91b845462f23b946e8e4e7df3dcce133b7095361c7b24607156f79e9c6703142a5260669ca58cb9ed1597bbfac7b981fa9c3487c35402b0ffd4c SHA512 84b882707654b4302dc1785f4525ca2b53bed5aafa294d03694dc40928574c8b69aab59ea404ed3f4e79578e027630325d04fe1222dbb1b346e230a68f8b3420
 EBUILD importlib_metadata-4.6.3.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
+EBUILD importlib_metadata-4.6.4.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.4.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.4.ebuild
new file mode 100644
index 000000000000..2c120eefe434
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.6.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+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/typing-extensions[${PYTHON_USEDEP}]' pypy3)
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' pypy3 python3_8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 1693a30a5273..5e507cc2a65b 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,4 +1,5 @@
-AUX jaraco-collections-3.0.0-pypy.patch 977 BLAKE2B 528835efbb2d7c6f60e9f49b35032649f81d5b3ae08a8dbaa6ff1e362619eb886570c14240f1660f2a8cd63f54ab4651d26a2e401c01557582fcdd9294a037fc SHA512 6bf4b43230ce7cfaa4971cf1d8bc243378284ef2381d910a9b6932f067c689ae46a3e9caec9ef696f72aaf2d0fa9f5226f79abeeba047c847926a2f588ae27f9
 DIST jaraco.collections-3.3.0.tar.gz 18563 BLAKE2B 80e8463324598cdd6025984c6ab304b108521a606de87fa7aeacbb2234aec5fce20319d7cd288caa5a46b1fefb7e7686a2d00e668e90c38b943082267e6b4ceb SHA512 23fea645226bcfbd5f034877aff7846960ad99d65d451bdbf5b8abb166356074d07780ea8e2e25d31fd03343929596dcd64a9ec949c1ff056c11862e043a8b7e
-EBUILD jaraco-collections-3.3.0.ebuild 852 BLAKE2B bf0e345bfc34871757f9f21520e685a04190afccd612d1a8771c37d03511d599e88f66fc4e1f9a4118a26e8f9686959cf32f10dc1c1cc3e72392209877d64384 SHA512 18dfedf56de1c67f0f649dace6ec41c158655a603e2fe7d480691fd3fbdfdbc9e2a2570e1c89bdd55121b09b4ff8d04f2ee3b3b82573ec45fa6a1d2fc722cc0d
+DIST jaraco.collections-3.4.0.tar.gz 14887 BLAKE2B 2c1e87b18dc3ca68fb5b849b30cc0284b8a8daed9b6b2b075a753f7ccf91feb487734a38bb7fc88d29020b0b1980346109551a8bba5d0b3a7f4a491c0dcb1615 SHA512 8e427f98dbcfad3f9042d1f080b2bf8012fdaaf084e230f9b46ff078623b047c2d9dab41ed0303df5dd070abce2a25289281113a97e8ab8d819048d30b8d314a
+EBUILD jaraco-collections-3.3.0.ebuild 782 BLAKE2B 1bcaf7ea216ab85bae6852411861f6f137992b944051e0d887b63c41ba034020475cc8fdf0d6dbeb1da7c4689c133487a8d70e5f844716dfc5b594335fcd7d3b SHA512 d233f09eb2cd552d9ae89509d9fc4531a5558e280df1f28787c85df2fbd1253981d5d5c4cbf50eb644840c54da289e839679c41611ecd517e653cdd848f88796
+EBUILD jaraco-collections-3.4.0.ebuild 787 BLAKE2B ca3b9c6e234678314eb84b56c7156ed30dc320235c3abd492eb6485800074dde6c3e6602949091b0cd557df181949d6bcb0c8f83fcf4a594dcd7b79514a07741 SHA512 5076b918dff98eaa514e13203766476cebee9c6debc4bb4006f19e17447a5bdfdbb5a8485093c91773ece94f61d11cc3d89d5463fd97cb0b6b7513b7c89b9b97
 MISC metadata.xml 683 BLAKE2B 39d22a937701983234b04b29b79785efcade578cfb3d94f694eeb1f5fe90e82831891aa689df78ca118e2c53d7be1ad61046a12656d430cceaaf4f72630ce827 SHA512 7493fc3e325c36c0cefeb6683a97994e5c8627d4e9bc1ec0b0fb2c595c1ff10756ecc2738fa62b991e6a7993b847d780fdaffdc609171bcf255a13b37b7ccce9
diff --git a/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch b/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch
deleted file mode 100644
index 63cee6cb4115..000000000000
--- a/dev-python/jaraco-collections/files/jaraco-collections-3.0.0-pypy.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/jaraco/collections.py b/jaraco/collections.py
-index 3ab9dc9..6a6e342 100644
---- a/jaraco/collections.py
-+++ b/jaraco/collections.py
-@@ -4,6 +4,7 @@ import collections.abc
- import itertools
- import copy
- import functools
-+import platform
- 
- from jaraco.classes.properties import NonDataProperty
- import jaraco.text
-@@ -592,9 +593,14 @@ class DictStack(list, collections.abc.Mapping):
-         return list(set(itertools.chain.from_iterable(c.keys() for c in self)))
- 
-     def __getitem__(self, key):
--        for scope in reversed(self):
--            if key in scope:
--                return scope[key]
-+        if 'PyPy' in platform.python_implementation():
-+            for scope in reversed(list(self)):
-+                if key in scope:
-+                    return scope[key]
-+        else:
-+            for scope in reversed(self):
-+                if key in scope:
-+                    return scope[key]
-         raise KeyError(key)
- 
-     push = list.append
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild
index a894279bf7a3..29c60505c72e 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="${PN/-/.}"
@@ -24,10 +24,6 @@ BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 "
 
-PATCHES=(
-	"${FILESDIR}/jaraco-collections-3.0.0-pypy.patch"
-)
-
 distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
 	'>=dev-python/rst-linker-1.9'
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.4.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.4.0.ebuild
new file mode 100644
index 000000000000..477206eaacea
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-3.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 4598fcab48d1..6a12e3910c3b 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -4,13 +4,16 @@ AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c7
 AUX matplotlib-3.3.4-test-extra.patch 481 BLAKE2B 1926876a15bd2d8b14c62404dddb0b119abde78baea3cee7dd751d0b0a21249ad1461fbba4d20823d7e754f074cbf48aaf2da317685dded99c792be9e17edb9d SHA512 7a7e0bdbd96a4f1f335eb3ee1840747045b09ba974d2614f234fa4fbc5c3e1e7c5fd154ec68a74640a916fed9e0b3d5ca01d1b22ba4f7bf3ba5f47039e67d00a
 AUX matplotlib-3.4.0-test.patch 10105 BLAKE2B 3a084180ec096a99d0b9a25458fd1b422d23599cb6fcbe0d7367df7e5c308675f92e95d008fb80e96125101f8f67c4b3a437209bc4bc032cb779130043827160 SHA512 f6196ded497e6c931f33a50cd82f4c7a5710dbc2dd1d74e3ba4467cf936176ef5a64fc2a9ff5281a0a114041c9751e352e522869ebb28e0e0bc50c4ebf1a8b5a
 AUX matplotlib-3.4.1-xelatex-test.patch 3200 BLAKE2B 0203bf1a3996ecf639d2dfee733f9fb1c664f35d501ca5049e5940b459f707cd4024b665106b62ab769805c4b976566c518a237637b766d97d2cb65abba8a266 SHA512 58c65834645974e56e6484788ed07d5bedaee3f72ff2023a36df9be3be03639eb588f769b7a727a5dc25a125d9df4d351e7fedc15699dd0576afd10718398fef
+AUX matplotlib-3.4.3-test-extra.patch 974 BLAKE2B 5b125219e92be435c26f466252206ca37dd22560c6ffda8311d4fe9f0b184b1f3f84c947cf9cd37f0abfbc5514ebf1999b9ceab6414dd0012bdc6948c51a83b1 SHA512 256657d7b25f4f71c7f01fe75423299f5715df45e7fcb41bc74c543383e5328a2482fdea287ce16212bfa9785fad182f3a91caa4f576687bd121bd6fc6c22dd2
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.3.4.tar.gz 37941665 BLAKE2B 77b86dc3ceec3695a0d749197bcec684893d237da1aaf8778d9dc2038da1ba56b757bbce94efcf215ac30f35420b77e0a0e75ebb75b6d2cde5146d8a35ee25e7 SHA512 aadfe3db4edde9940b9e15daf1b6c5f237d3a6f38610956ceee994f919d711fce818ea12be4db18aa2a8638c4e8f434d79541fecaa7233e233bf4c73792bc4c4
 DIST matplotlib-3.4.0.tar.gz 37142983 BLAKE2B 64b23d5b9e93e6b319674cea06d0ad425def952e50e7cb163ae91ae0d4460872bb329144271472b7dc2d0ab0a742c9c93ea735dca60ee4b4aa569cb4350cca0b SHA512 880c1e1027c819a34f5528b96d1b730cdd6541aa23931aef4185406ecec971ec2f4c8ca374eced56e654e016652472f7abcd0aae977dd4f327b8c511983a2a1d
 DIST matplotlib-3.4.1.tar.gz 37253296 BLAKE2B e1dfd1b0d8bb0d3ed13ac03a5b3112a237c4b7ef3c82694ad6779c810bbd94c165bde88d00fad270d5da6e269d778b33f276620b51e1f134fa2c5b9dcb0a4f28 SHA512 076510ddd152a395fabb76aa47566e9b75f3c8ba3c5246b39229b20fbfc209d4bbdfd441271b22e364f0974963309c02bdd0519fc2a7e8a406afc462f69246b6
 DIST matplotlib-3.4.2.tar.gz 37308683 BLAKE2B b769244b3d7a7da9125f6b634e9340676d849322491390d1c9a0cec3dfce59a8b5b5c0b567575ae78212129f7303b6b1fbbf30ce7c8a23c43c1304e83c9c5f5e SHA512 d4798dd2d6c857db0fe6d4ec85ebabc028b78627311bab17f7b9b30f6aa61d5243114b1cfe9d83293ad66ae47df83add5272f032954990dfc04054a792049f2a
+DIST matplotlib-3.4.3.tar.gz 37850796 BLAKE2B 15b40da8f6973ece4a91fffb5caf249cb8642263bfc2a784ec482bfaad250b6d3beffb9d2ba8a03e5fa10abab02b0e35728a8499ccb870aca06df57c5c1f91f4 SHA512 c2fe54e7517a1417aa8e55596e83edd090534c07f22882634d6ba0a07196441b5bbdd15958473805d8e8871b1b73380487aff3224294d472cd6122490c783145
 EBUILD matplotlib-3.3.4.ebuild 6929 BLAKE2B 22ff822577ff6cf4f692809429681a52f0f48591eaacf2858d04a34f7008473c803ef87f95ddae705e36c17a09dcaf61281410824e96a947d56e28cdd81ec4cb SHA512 a7af125117cf69af4a40debcbf3476342004100f3499f1028e7087e61168514693f086a6dfd6ace1616d8f27c343346d421a199073fff8a0a78d17062db40ed2
 EBUILD matplotlib-3.4.0.ebuild 6837 BLAKE2B 0ac7dc9aef75e2778102eeead917cff7e7627e1c158a9fcee0d1a247de2d0e5fc7b7b02cff543dbbeba236106f6915906391297bb34598c3ab6e349578caa960 SHA512 31f7cc26d605f3a3db310cf8b5d48a0bcb42e8aff0bf91ea6f94d072c049484be9bb3418aefeb6d02a14e241ff48fc95abf3dad7c87ae5a98d3842c3d0b548f4
 EBUILD matplotlib-3.4.1.ebuild 6845 BLAKE2B 91e4c9281b79eb1c0bba8142a8de315322198dec213755717d318b00ce90ee2746ea950d7bf3ddbcccb039d757801ad541922966574297d50843600c4bc28edd SHA512 19fc5c3e739c1d687c16339c361a36245fb48d84b31e274c15fde827458fb1723f7836a737d9750778bb1430e83ac328d9242868de817722143dba4cb7a49eaa
-EBUILD matplotlib-3.4.2.ebuild 6925 BLAKE2B de748898d28e72271988758203605d179ce684e8cf297fc3699395603491e3b59cd1cb871f479c90f6c52af55bdd9d65e3249d16fcc0b71fbc53c4795da996ab SHA512 253f7cd597f9c4e0a188a838ccd31c36d5096444188690b7e8b29218ff158cfd036237e3cb2ffd6ae1255011cd57a6b4c7265395939518d18686c047162f8080
+EBUILD matplotlib-3.4.2.ebuild 6931 BLAKE2B 0d0b1ff66719e46a7b18cb28cd2bd1b01381ba8c8c3e2a785e84ec02cd3f316a2e032162cd28af3dc7e7eb25c78fc10f15e957cc574ddde9ef8efe37f3e5ba82 SHA512 a7622d65a4c4fa2428e7c32636c324987d5521032104ef231c1d951a0e9d1f0c8aa7fd0ec2b327c818a5265309456799f458730d30cc8c8cbbd3afaf4764dd9b
+EBUILD matplotlib-3.4.3.ebuild 6930 BLAKE2B 15d91236e8b0ba301c0df973df6426e48baa7c2cdbb2d114dfc72870bd2dd3e54865613a9572f97cfd1e76a94fc495ddf0dff9427183789d30cc5c14cd7ef286 SHA512 c440c2a3d325335b2314f27267685fc05c725a8e8fbe49b7be8ab4b92509c8a5b3e10ac3a20b099fcb8c991c13393325daa668fc1e063240973725bacd4d9075
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch b/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
new file mode 100644
index 000000000000..3f76705745df
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
@@ -0,0 +1,25 @@
+From d73dd52edf7ec106cf2f6c0ffc79dcda31102ecd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 20 Jun 2021 15:07:56 +0200
+Subject: [PATCH] increase test_backend_pgf.py::test_xelatex[pdf] tol
+
+---
+ lib/matplotlib/tests/test_backend_pgf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
+index 55e375311..684f38fb7 100644
+--- a/lib/matplotlib/tests/test_backend_pgf.py
++++ b/lib/matplotlib/tests/test_backend_pgf.py
+@@ -80,7 +80,7 @@ def test_common_texification(plain_text, escaped_text):
+ # test compiling a figure to pdf with xelatex
+ @needs_xelatex
+ @pytest.mark.backend('pgf')
+-@image_comparison(['pgf_xelatex.pdf'], style='default')
++@image_comparison(['pgf_xelatex.pdf'], style='default', tol=0.8)
+ def test_xelatex():
+     rc_xelatex = {'font.family': 'serif',
+                   'pgf.rcfonts': False}
+-- 
+2.32.0
+
diff --git a/dev-python/matplotlib/matplotlib-3.4.2.ebuild b/dev-python/matplotlib/matplotlib-3.4.2.ebuild
index d2ba4a665139..03a2fb799d69 100644
--- a/dev-python/matplotlib/matplotlib-3.4.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.4.2.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 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/matplotlib/matplotlib-3.4.3.ebuild b/dev-python/matplotlib/matplotlib-3.4.3.ebuild
new file mode 100644
index 000000000000..363f617b719f
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.4.3.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{8,9})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.4.0-test.patch
+		"${FILESDIR}"/matplotlib-3.4.3-test-extra.patch
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+	)
+
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index d50d1faaf4e2..9c15f7b9f616 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -2,4 +2,4 @@ AUX mpi4py-3.0.3-py38futures.patch 4779 BLAKE2B 0e034da4e2237f15f1f6c559f520dc7f
 AUX mpi4py-3.0.3-py38setup.patch 783 BLAKE2B f92a508e2f8c0749135b79c92656662729434b12c4b1d90587bafc02870c934d2aea135b963660835818c0596d0c0635e02af78e2a2b855259d96d252bf1b19d SHA512 0b35ff4d6ebdb7fe0bb117114d68f9823094429bfdab37d8c8ae404d1357bedbe0c75e46ac4ffbbfdc5197adb24f934ecedbce8eb2b00757c00421e1dad912d9
 DIST mpi4py-3.0.3.tar.gz 1429389 BLAKE2B 1e8c44b857b417237832682d0b3b5c90d1f1046fd8137d2a63972419ff8ec0e1fd2ebba521e2d2d6ba9f773b7c607370b55d8d75c9afeaca172ac06dd838943c SHA512 041768f753c8188b2560fe92711861780f0d77eda3281433520c98bb1e9b4da6a89c364f2d1c4623868ffbbcfde34ef556198b1bef6fc1c4a9c19cd5e71b546c
 EBUILD mpi4py-3.0.3.ebuild 1435 BLAKE2B 52084ce087bc8f544992e34cb156cda3ff15276f59bcdc319184b6984a82f2f6bf251f571a2c87e6684bd4de18570cd77494830ffe0cd2a6014dc18921125d7b SHA512 03d46c049a583c9eba8a4e015c3b4ec622a414db40c31becfd7de592d97a5ba023957d34bc3163c22e92b6e190a98a442fdb1a335365a8937a72dd4d0c700572
-MISC metadata.xml 1118 BLAKE2B 0bc626a2106e628d7eb639e6ce90c4badb63ec2ea66b0322e7b83418791b7edc4bd443294fba3d31133812416eb4428b5dc47d074da3aeebf6867e8a0998d046 SHA512 7afb6d05007036bf5562d6d262165d8c2576bb49a86f9230f939d6a2ef929affa8461fa6421ffd8d97203a4425b397a8dd8556190364f29622e53a67674978c7
+MISC metadata.xml 1040 BLAKE2B ccd5e89630a531a141c4068a281a4ce92e65281c2c1cd0a3c23da01bfdfd91c636944f4935382f4508fc257992f9e0218a531261373825da58afce0830ba022b SHA512 94048319841a6075a701eff88b0341f5cbc289756b6c85fab2199527feb0139026367ca9b4f38e142c0a2d2da3868081bd4b08dcf24c5d001c2c1a75e6c98e0a
diff --git a/dev-python/mpi4py/metadata.xml b/dev-python/mpi4py/metadata.xml
index a7842f1c7b32..1ea9b3c203b7 100644
--- a/dev-python/mpi4py/metadata.xml
+++ b/dev-python/mpi4py/metadata.xml
@@ -1,10 +1,7 @@
 <?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>
+  <!-- maintainer-needed -->
   <longdescription lang="en">MPI for Python (mpi4py) provides bindings of the Message Passing
   Interface (MPI) standard for the Python programming language,
   allowing any Python program to exploit multiple processors.
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index d2078eb143a3..033a057a847b 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,5 @@
 DIST nbsphinx-0.8.6.tar.gz 146019 BLAKE2B 106c121e9306c1b79771d49697f125b7c9272bddd9859b308d272e69cccf38fa306330bac01e8744f1a5a1e6831f63b73b43b0a2260eacceee4d2ff6c4ae61ef SHA512 11ff82be0633b3a2af2238d9dfe4406900804caf494885a5b3ff22f651c8c43000dadf83546ffaa85873901ef9625c2e786e53e866c27141fd9e9d58927ebf14
+DIST nbsphinx-0.8.7.tar.gz 146388 BLAKE2B 28149728b95403236bfe601aa2190f2262069466e6a82e688640b3e085e8f03800199e1f6c5f1a321594a1a6bbf73a2906b0f4cdf2bcf4b5e781fe7bb4fa917e SHA512 01b8d3095fefc32301ed608916bdeeb469bb180709d1512178f8ca2e29f4404f48607c1fc1ec0700ee2aa745cbdef350edda0f06f2dd464d10c020dc38774778
 EBUILD nbsphinx-0.8.6.ebuild 624 BLAKE2B 0c6cc84c3b436f373f82c9dee376901e32b7aac3a1c0a84854d7959b94771163805d45013fdf54422a1a0275e0f7420429e0b98dfc25b6a3b771a367379bbf2f SHA512 f6794fe9a29d963e87e9d20d31a5e97de90c72cfc67a6eed813f96431e4aca07bf2d20f1679bea66544b2e19e822c67358a3711f03c08a37b7236b527fbc007a
+EBUILD nbsphinx-0.8.7.ebuild 625 BLAKE2B ca9406fd7242bcbb4a3c01eb8a7a29865a5dc502eab7cb1c216dfb7114071284c13429dc54f3dfbdbab3bbfcae10a9a57f02c04298d76d18e3842b772e76911d SHA512 891470e206232ebf406b796b23173b9e34d8dcf3ac730dd4195394b4cd7b0428fc01ce2cfa99597c59bb42fdebef98e0ec30fd5cdb3f79b5c8ebcb69dbacfd7d
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.7.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.7.ebuild
new file mode 100644
index 000000000000..a0e496440807
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.8.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 85c84ea5ada5..66a085c9cd1a 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -2,7 +2,9 @@ AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a9
 DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
 DIST notebook-6.4.1.tar.gz 14139457 BLAKE2B 4be00ba6cd2f66873657f8ad5f79b444bbfbb978eaac7ddb57ef5da39a81c2746e7658004179e44aa98fa5fc5954b022b2e3c0c15dac0cc6da21b95a16225bfd SHA512 aa73e90f8ad1888f469e4cb412b6f17742e3b68ce429b2feaafeaeebbbb9e0cc437f3f73f26204b8de8367620ecb492033786c00b04d641ce0bfb4df75460419
 DIST notebook-6.4.2.tar.gz 14133763 BLAKE2B 2c4f9677b014f484f7c975344f6e3aa29476b3b3bf2dd329ee527be653573f199c6d66078bc1f0787227414fb818df8df3d38e5f1bea9d3f2605f796a391cb37 SHA512 d9914c2924b7a0837295a7cfe2bdf551e1d71f35bab43bd6d12e798562c7e103f28cfdff6692e6ac5de394867071b8e1eae7a26bfd0a76b4a9304b7bea29f119
+DIST notebook-6.4.3.tar.gz 14344061 BLAKE2B a6d12df889015801a47061b40c320f659adda19cdf37832de1fd2b0257e7b1e22439aa4fd7663595c798b4b04c8c8e720a3799bcb20b93a0229ccf26622eee04 SHA512 14bb5c1a858c2d48f19f6a9907c4e3a053e77586a9ce78f3116752a02c39056bfa02fac5ef37404b742861a66751ca765b1d329a530b09752cf54fa464ab565b
 EBUILD notebook-6.4.0.ebuild 3235 BLAKE2B a83eca348e5db25252af465ca499e16512ca91175b4b051f18196e3e3f60a1a657125b9fd7d1ec2119c096afa9d71f2a42b5edd9710bf248609f8298e75c89bb SHA512 78b4c658232dcf15124860d5fc6d3f394f9c2c9bde8de3cf8a9e05badb73cce17b4f4373fa64f079b12c4dc6a8169b66b89c50a13c992c96cf5a3c275d786bdb
 EBUILD notebook-6.4.1.ebuild 3237 BLAKE2B 840150c7f2f86c75b492df97c4dbd325a1693ba7279847d16aedadd1a79cd80947de345d3ed5fe95d5b5b399d886afbaddc2c61824ea718af56c3e1fa05a35ec SHA512 74033b899159821856d305629dc72c8f430f3c11608937f73ef8d5d08e4d6731150c519e1d07e16f17752420697277da8f281cfbfb114b8d4a2a10249c10ce4d
 EBUILD notebook-6.4.2.ebuild 3237 BLAKE2B 840150c7f2f86c75b492df97c4dbd325a1693ba7279847d16aedadd1a79cd80947de345d3ed5fe95d5b5b399d886afbaddc2c61824ea718af56c3e1fa05a35ec SHA512 74033b899159821856d305629dc72c8f430f3c11608937f73ef8d5d08e4d6731150c519e1d07e16f17752420697277da8f281cfbfb114b8d4a2a10249c10ce4d
+EBUILD notebook-6.4.3.ebuild 3237 BLAKE2B 840150c7f2f86c75b492df97c4dbd325a1693ba7279847d16aedadd1a79cd80947de345d3ed5fe95d5b5b399d886afbaddc2c61824ea718af56c3e1fa05a35ec SHA512 74033b899159821856d305629dc72c8f430f3c11608937f73ef8d5d08e4d6731150c519e1d07e16f17752420697277da8f281cfbfb114b8d4a2a10249c10ce4d
 MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/notebook-6.4.3.ebuild b/dev-python/notebook/notebook-6.4.3.ebuild
new file mode 100644
index 000000000000..892d3ca7cd84
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# trash doesn't seem to work for us
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::APITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+		# TODO
+		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	)
+
+	# selenium tests require geckodriver
+	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 37241b9da7f4..7187a3656ca2 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -4,6 +4,7 @@ DIST pip-21.1.3.tar.gz 8772944 BLAKE2B 4c50fcb7c05e05d11b137d08547d9d55f19687442
 DIST pip-21.2.1.tar.gz 8781474 BLAKE2B 6a6a4972de31cea2f9ee2d70df00acec65efe344fa13e56ecf9b2f55125baa2effb30bf25c7649f5f30b2ecf9b5ebb7d32dc0f2dfa101444510c8573bd0c60be SHA512 2fff39703eb387ded66552ee62c2b3e4d18da6e8a904399919a5c51f65ddf1695ad410408fe5370877a1ce9992e7c07e091a1852dfb136ce5580e31fc1c03b81
 DIST pip-21.2.2.tar.gz 8785943 BLAKE2B 3e99a4e6e01b6239ff5a45097bbae8ba3459a16d0e78f8da4fc1be0ef5986962d30ea8e376705cd7b88198e324e700d04ee25fc6d1d9faa9bb6a76ae89efd38f SHA512 81ec1819481fa2378404c580a4c60fc48b03ae9bd5c945a3def4af331c530efb19949ab45dcb4be5835673b65299e0245c28c6653f9f60eaf86be472fd31faa1
 DIST pip-21.2.3.tar.gz 8786685 BLAKE2B 2629db94e973b40c2b3b75199355b0a23d40681d3a346789ee538c5349eb9dd2d9561448ff546d9b73c2dd8573fca6853327560cce63654150a948a2cf0a657f SHA512 9df888c871040d3812a2bf358013e3af976ede1e6aebf6747527be470674bb55ca1312d54021a7913630c04b09981cf481202c8405faf08b1b37e29272adf547
+DIST pip-21.2.4.tar.gz 8786693 BLAKE2B 02d4cdd3d9feda2d4daaf7552bf86e068d2f040ef9836a128c8dfc36697594d6a7d830cc58dc4f2d42c22fec0230f3055ab8b5b204bfd1fb0b9429e2dd44f537 SHA512 3c018601bca60d865032962deaf0ba4943fc6c3f3d8d69dab65f987737daf7fa91492c8250ab36988d1fa5f22b20608ada88ac1ffde914a7d72485bf5164b45f
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
@@ -11,4 +12,5 @@ EBUILD pip-21.1.3.ebuild 4253 BLAKE2B 145e72c1fc1cf5eec5d656819f82d6807ff7123cbe
 EBUILD pip-21.2.1.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
 EBUILD pip-21.2.2.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
 EBUILD pip-21.2.3.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
+EBUILD pip-21.2.4.ebuild 4261 BLAKE2B 28f46295d72b67ff83ab1510b98a7de196dac7b305f01e7dbc996aed701426cdf695f54f3354fd208d5beb67e3e94a5fb569a6c8caff2909c8c858e7c7fe6e65 SHA512 7c4b7d128aabb4804f1c02aa6deb81f4d41a6b1dce3b325c86e810fe700ef224936a146fecb4e524fe695d80f38904f9d0a6ddaa4023469d3a9c9256744f913d
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-21.2.4.ebuild b/dev-python/pip/pip-21.2.4.ebuild
new file mode 100644
index 000000000000..b33ff901b690
--- /dev/null
+++ b/dev-python/pip/pip-21.2.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+# setuptools & wheel .whl files are required for testing,
+# the exact version is not very important.
+SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
+WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
+# upstream still requires virtualenv-16 for testing, we are now fetching
+# it directly to avoid blockers with virtualenv-20
+VENV_PV=16.7.11
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
+		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.tar.gz
+	)
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test vanilla"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
+			tests/data/common_wheels/ || die
+	fi
+}
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local deselect=(
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_list.py::test_multiple_exclude_and_normalization
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
+		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
+		# Internet
+		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
+	)
+
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/lib/test_lib.py::test_correct_pip_version
+		# uses vendored packaging that uses deprecated distutils
+		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
+	)
+
+	distutils_install_for_testing
+	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+	epytest ${deselect[@]/#/--deselect } -m "not network"
+}
+
+python_install_all() {
+	# Prevent dbus auto-launch
+	# https://bugs.gentoo.org/692178
+	export DBUS_SESSION_BUS_ADDRESS="disabled:"
+
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 4dcc345b1e0f..2165e9c42705 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,4 +1,3 @@
-AUX plumbum-1.7.0-test.patch 1434 BLAKE2B 1b857261671912f2f708dae0b3aad50cd0d406697b451e31c314d8da931a279c8cfe2ccc80459b93b8f4c32ec7bb6c858c81014e6081719812eb76f8f64f79a3 SHA512 bec0051177757f09dcd53f9b6ed95ef83892c28a6e72e18acfda2e01c64660975d3fd3e82542a574f036cb48582325a8ad628ac6dc9d19d8e2780ba50c617015
 DIST plumbum-1.7.0.tar.gz 318890 BLAKE2B 19ae8a37dff38ac3d263d9400e44ac174c46ff8cef92cf45b9ea31d6d344543fba66de3fd0fcd15acc205af5939f11be6c56e6cd9ca39a666f92f18dcd29b9f7 SHA512 0a12891278c12bb98b8bbb825448375240ee347eb3ca166b9cbb4da3e083979d947a7bf0a843fd9a0b7c9a13d09f24e988ee877f29420a3f29f40e387eec8826
-EBUILD plumbum-1.7.0-r1.ebuild 1398 BLAKE2B 52e1bb4732eaba2b638c983580ff2309473584021ed68dccc12671f084e63c8b593292a8de5d75e033b7bd368add46f9b737880b6d3572c9126e7de5aa06fa72 SHA512 2af14ce9b771ca57afa8f2c79d6b0cb7a7ddafd7058616ea2075cf1d754ce9be0e80341225a7947416831ad6ba69f62d2825ce33969f7e6a36df83dbe5e7f8a0
+EBUILD plumbum-1.7.0-r1.ebuild 1339 BLAKE2B 5d257b5e20813428799747fab22f7778e319db1f377db8ca7dea92dc640a5ba52503e9d98941b15bb3ddbcbad1e0349145a4e0832817234d13d43eb7dd4786d9 SHA512 565c0ef4252bc782a074fec930256519bdea3e088a64c3b4afb6326e35bdebeae724a0287b5568461a0d1cbf008f7148a6a4508c2f54117da7eadf5f43c46635
 MISC metadata.xml 753 BLAKE2B c3723646f700efe4448d60c83c7b636db5b618076e6baba2201ab84f7f55953626df54c6d9b7ee368420ee4e94605b5e0129bb4e40bd412c7737a987c8aa0cd2 SHA512 5d1ce42aef769e6681ba77cf4f8f493697f9ec20cd648ce68ace94be9d6b022144e558f222a9950966b8d0e3e2c0297438e174ea02e3ce329c038e58c9573490
diff --git a/dev-python/plumbum/files/plumbum-1.7.0-test.patch b/dev-python/plumbum/files/plumbum-1.7.0-test.patch
deleted file mode 100644
index a79c5f67d18a..000000000000
--- a/dev-python/plumbum/files/plumbum-1.7.0-test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -r -U2 plumbum-1.7.0.orig/setup.cfg plumbum-1.7.0/setup.cfg
---- plumbum-1.7.0.orig/setup.cfg	2021-02-09 02:46:57.071159800 +0700
-+++ plumbum-1.7.0/setup.cfg	2021-03-15 15:51:13.873287602 +0700
-@@ -66,5 +66,4 @@
- 
- [tool:pytest]
--addopts = -v -ra --cov-config=setup.cfg
- norecursedirs = examples experiments
- timeout = 300
-diff -r -U2 plumbum-1.7.0.orig/tests/test_env.py plumbum-1.7.0/tests/test_env.py
---- plumbum-1.7.0.orig/tests/test_env.py	2021-02-09 02:46:46.000000000 +0700
-+++ plumbum-1.7.0/tests/test_env.py	2021-03-15 15:50:18.943289430 +0700
-@@ -14,4 +14,5 @@
- @skip_on_windows
- class TestEnv:
-+    @pytest.mark.skip("Something wrong here")
-     def test_change_env(self):
-         with local.env(silly=12):
-@@ -23,4 +24,5 @@
-             assert len(local.env) == len(actual)
- 
-+    @pytest.mark.skip("Something wrong here")
-     def test_dictlike(self):
-         keys = {x.split("=")[0] for x in printenv().splitlines() if "=" in x}
-diff -r -U2 plumbum-1.7.0.orig/tests/test_local.py plumbum-1.7.0/tests/test_local.py
---- plumbum-1.7.0.orig/tests/test_local.py	2021-02-09 02:46:46.000000000 +0700
-+++ plumbum-1.7.0/tests/test_local.py	2021-03-15 15:50:18.943289430 +0700
-@@ -168,5 +168,5 @@
-             assert parts == ("/", "some", "long", "path", "to", "file.txt")
- 
--    @pytest.mark.usefixtures("testdir")
-+    @pytest.mark.skip("Something wrong here")
-     def test_iterdir(self):
-         cwd = local.path(".")
diff --git a/dev-python/plumbum/plumbum-1.7.0-r1.ebuild b/dev-python/plumbum/plumbum-1.7.0-r1.ebuild
index 1efb1bb5f04e..09603ad72375 100644
--- a/dev-python/plumbum/plumbum-1.7.0-r1.ebuild
+++ b/dev-python/plumbum/plumbum-1.7.0-r1.ebuild
@@ -2,33 +2,46 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 optfeature
 
 DESCRIPTION="A library for shell script-like programs in python"
 HOMEPAGE="https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum"
-SRC_URI="https://files.pythonhosted.org/packages/ed/ba/431d7f420cd93c4b8ccb15ed8f1c6c76c81965634fd70345af0b19c2b7bc/${P}.tar.gz"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}] )"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-PATCHES=( "${FILESDIR}"/${PN}-1.7.0-test.patch )
+
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
 distutils_enable_tests pytest
 
 src_prepare() {
+	sed -e '/addopts/d' -i setup.cfg || die
 	distutils-r1_src_prepare
+}
 
-	# Need sshd running
-	rm tests/test_remote.py || die "rm test_remote.py failed"
-	rm tests/test_utils.py || die "rm test_utils.py failed"
-	rm tests/_test_paramiko.py || die "rm _test_paramiko.py failed"
-	# Windows specific
-	rm tests/test_putty.py || die "rm test_putty.py failed"
-	# Needs sudo without password
-	rm tests/test_sudo.py || die "rm test_sudo.py failed"
+python_test() {
+	local deselect=(
+		# Need sshd running
+		tests/test_remote.py
+		tests/test_utils.py
+		# Windows specific
+		tests/test_putty.py
+		# Needs sudo without password
+		tests/test_sudo.py
+		# Wrong assumptions about env handling
+		tests/test_env.py::TestEnv::test_change_env
+		tests/test_env.py::TestEnv::test_dictlike
+		tests/test_local.py::TestLocalPath::test_iterdir
+	)
+	epytest ${deselect[@]/#/--deselect }
 }
 
 pkg_postinst() {
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 0cc992d02b26..12ed3260367e 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,4 +1,4 @@
 AUX 3.6-picklefile-IOError.patch 681 BLAKE2B 2aacef3639c9ec920d6cfc5e56ead129234d54019757a4c816c48c563789e119e6148ed409e5432ccdd763b62ad83c1359b63faf8432326ef8ebf4c93fa564c3 SHA512 6dce69df1cc538ff9787cb70617437ac36972b68a998922123bd4f0529dd6f155befe4104741e704e7e8a1ed8822f2e99580867bbc894fc57896aad4130c317b
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
-EBUILD ply-3.11-r1.ebuild 1060 BLAKE2B 234f8485d7a8efd098cf3cd0fe8eeaa135a0e9a1afa341bfede23bea78452425362a97111f915791c145d7bad68baafaf1eea6f9f447e78844d6ff0077d0527c SHA512 4d358f3b8cea3040d4c56fb7a3cffc011b38ce57e623a41959636d6c2a0d566e8c132eabe70b68eb485c9a8edfb643bcdc35996b545eebf3ad440f1f2415c4ef
+EBUILD ply-3.11-r1.ebuild 1120 BLAKE2B d2d36d1902a969635a8b33f832ae8f2de3f55a711660968c089566bd023a6d60d3dd8f8175e9784fee3a2a283786a2ec32c9655f86355e6c43a5ece6f8316e2a SHA512 35d6e784b0c9a72d8f8f5faeafe5b3c90b9897e1d382d6788144eb27c7b9e6139b6d0fb0a3e7f9f89de87f516208f9b66780935989007171f62ed7030a6507bc
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.11-r1.ebuild b/dev-python/ply/ply-3.11-r1.ebuild
index b56c401ad20f..b098ab7709f2 100644
--- a/dev-python/ply/ply-3.11-r1.ebuild
+++ b/dev-python/ply/ply-3.11-r1.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 572f57e03027..004ab0efad3c 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,3 +1,5 @@
 DIST podcastparser-0.6.6.tar.gz 23482 BLAKE2B 3bdfefe0eafb7d89dfc0063b0fd61c1f5634e381ec6cba634cd9b054dc51476cd0c37267fc40db317ee3d192ea52b4da18e8efc387ad81c6edac25caf7c94147 SHA512 aee6cb72157242afe9f4d9bd201b9538051cce1fc6a153a03206ad041fbff7c99b69659ee4a9c8cbf5583c1a027a9d171943882cb3a48e4ff7f84602cccf2d74
+DIST podcastparser-0.6.7.tar.gz 27671 BLAKE2B 03d55fb17622c24084346b0872ff501192e4232df35104ce6af0e90c9ba58528073ad6367d52985524cab01e1dc9de2f47bb66a267bae43208d74b61d4881380 SHA512 e020e4a729f8ed021aee1a91fde9eb70255cd3f98ef2edae98824789448065c75cfe9e0b35e9872bbbfd7a38ae4f9daf01a9945c4a50a4f6a61b498f5544b86d
 EBUILD podcastparser-0.6.6.ebuild 430 BLAKE2B ce82fff8a33adee3fb7ba3c7efd2d274c92f048a93456d728544b6e6c9c2e8eab9fdc7736d816eed340a5dc5fdf9006f9002683086369d4c8c44137f9a099c16 SHA512 77a236c2c473d61a37eee5b603b9839c5086e10f176c05a3f369b8a160cea93d70db4b8ee417b9e0e57086ad023909a7e89dd7933afb27d2ddd5e301d75ebbd6
-MISC metadata.xml 353 BLAKE2B a2ebdf26da03414c4455789492c584264528657151b713e9a9eef51255fde3c17ba0c264b30e704b92909bc38c0758dd8b5d3f4f5613f55787a8cc13375693b0 SHA512 6871cf1b2dc37a2ee871f928ba0630aa54a2e73826d7b67243839dc31457f38da7d8bae4cb63039a916b58fe76fe5cb2329dc872602c53b210c63b3943296d25
+EBUILD podcastparser-0.6.7.ebuild 435 BLAKE2B ec970d2ba92c04283d8162dd1563d92f5d2d96fa6d146a0ec6e98559929a3679d9dba0025c28b1ee208a8d090febacac785348d59b6324b01ab7bfcb441f3953 SHA512 b137ca89ec9cfb64965148c242b4dd47c40e1c0eefad9b8c46cd01239df4e2aa8a701e06b22ae384b9ed0ba66a387b5e6e22455bcd5564f5bd15cc455a580fd4
+MISC metadata.xml 454 BLAKE2B 356ff20bfb5260cae8fea1a0469152e6903373097a2650e573772a9cfcfa9810a895b59fd0d2c17cedab6fffe1acbb2e6bc8ae23096232a49b2a28fc52d30bb5 SHA512 3563614ecc97ff212ffa5c1395fd8c0b85121e5a630e6285bf3310163123672cdcefc168ef6bbb991d663235ac7c53eaf75ab64a39b468fc24a5ed8b27c61ee0
diff --git a/dev-python/podcastparser/metadata.xml b/dev-python/podcastparser/metadata.xml
index 76bd6abc1ae2..1716fc8794e2 100644
--- a/dev-python/podcastparser/metadata.xml
+++ b/dev-python/podcastparser/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">podcastparser</remote-id>
diff --git a/dev-python/podcastparser/podcastparser-0.6.7.ebuild b/dev-python/podcastparser/podcastparser-0.6.7.ebuild
new file mode 100644
index 000000000000..969853ef4692
--- /dev/null
+++ b/dev-python/podcastparser/podcastparser-0.6.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Podcast parser for the gpodder client"
+HOMEPAGE="https://github.com/gpodder/podcastparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 65b065a5f5f1..1bd606b3d313 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,3 +1,3 @@
 DIST pycparser-2.20.tar.gz 161330 BLAKE2B 9a114e4b73e6c3c495bd78c393957146ec425eb5b15d72266cbf424f15e8d2e2e6402ef36d60a9dff41b393aab80fe1356befd25549517f398e129836a76b037 SHA512 ff0853c9f981b43b4f2e879350715c07b02cf9dab223d4980d8fe0a3138c98041b5f848a9355ae4f1cb45e7f137c03a88843008e18d77af9250e0d9c55f5ca1b
-EBUILD pycparser-2.20-r1.ebuild 1661 BLAKE2B 4e2ab75c7ecd32c9d15690bec392c558043ef6ab327e61f7457b589a2822e69630998f79551cb85994c272b65b39251efe8c47c8e565df83826d77cdc2c52f53 SHA512 a6e2d595a0fbacb656787960c9edf501ef7981c69b9424c93e55a5ce3250687c4cd1c651651930afddfcb5254207a07ed80ab4329fb34097bab32168e9df9f9b
+EBUILD pycparser-2.20-r1.ebuild 1721 BLAKE2B c58d45c46b908a76f5fda2efdbd74d3d94af70c67a51721f1fd27bb3d021783aa0fd1a4585b847da7f49a3b4ad002347f9179de57fb0fea88e5ad6a83c97c611 SHA512 09ac290d1f5f9bbd4e95545194a81594321a759f3f2e055b1991ead847dd095ae863a2b449f2f7dd5f4db70d48464442eb82e57231d4b46d7cfb16af93c0a278
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.20-r1.ebuild b/dev-python/pycparser/pycparser-2.20-r1.ebuild
index f84c2dda5a84..2f543afcaf04 100644
--- a/dev-python/pycparser/pycparser-2.20-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.20-r1.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
diff --git a/dev-python/pycson/Manifest b/dev-python/pycson/Manifest
index fa9261560e28..523f361ea65b 100644
--- a/dev-python/pycson/Manifest
+++ b/dev-python/pycson/Manifest
@@ -1,3 +1,3 @@
 DIST pycson-0.8.tar.gz 10448 BLAKE2B 55e2ec4a447761d6764e9f25cdff534d3dcdf2a0e3bfd9255f02b1a5cd9834e4f4323ba47a1659ea973f995c34519622e36c691bef763ba83c8caf87fbc49f58 SHA512 873f1b0d825ad318ca5c62fccbdd12a8738c8b9ff58b4fe27ea611aa47575e24218b5010f6d6b12f5ebda835c2778dd15472ca5c73b634b3004aa08496f45328
-EBUILD pycson-0.8-r1.ebuild 487 BLAKE2B 7d646f966fe0f734a5fe182f9dcc9dcf4d91560236235a0de49b53a8aa619f79a2926b048e28bcb660b097eb6ed7ec8ec7454bac240030669d9b0f9f85dc9e5a SHA512 55be3ae2a09123d410ed084ce4d55abc9a05ce7bc10e227e51cbe9701f0519985bb063dd7a01eea836c80dd7989d19c1c795d953f66d9b6c412fcd6066c0a7d7
+EBUILD pycson-0.8-r1.ebuild 494 BLAKE2B cee67a396ce4e9beeeafe7e802574a79e88e5bae3a52cab49ae4e9e9294df527d18ecefa5d1ca77876607d33eac9dbd1dc2d4c0045803884dddb1404da33cfb0 SHA512 dd4e33eab54954a22e6a52cfcfb7c78b4b2c9041d70e35f069af4d03aa321cfe7700166c63b5b32dde7c3c38010e515ba4bf2f8ed2c4d89f699f411699c946c4
 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
index aa79a8793be9..330c7ca33866 100644
--- a/dev-python/pycson/pycson-0.8-r1.ebuild
+++ b/dev-python/pycson/pycson-0.8-r1.ebuild
@@ -9,6 +9,6 @@ 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"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/speg"
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index cc8befc3a66a..1341129c2c4f 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,3 +1,3 @@
 DIST pydantic-1.8.2.tar.gz 301802 BLAKE2B f02fca273c356dd0ab177de73d21da7749e1a9ea1ead92f4e82b44285b97e8b8431961b2c30d230cbec817698791e4b0cdf8498615b7a0639fa739b09f1b58e8 SHA512 0a28c64b97678b932092e546da877a4a6d104fc7d3b7cb043b3494f0b7c6900cdc1ab8a83bdbd1879956a81da1b28ca27578b1a003bdca3e08f0f107e5690e06
-EBUILD pydantic-1.8.2.ebuild 917 BLAKE2B e1db90e2bc6e8842876b77ab98b0c85dfdd3af411d1aa4e06300489942497e567f773782c7617aaa0adf73292d9abf66acce514a3fb9bb1338b596891b34e28d SHA512 d3baa0113efd4eaafc5734b9258ac1901cc26f3572246386c094ed7fe323547bec2f9c21326963b9ae37b96b1af15f70045166db02389403e7b6bb2a37e0320b
+EBUILD pydantic-1.8.2.ebuild 1013 BLAKE2B 54ae89c0eb96fb0b4691f5cbcc5cf7d9825a27ebe839f2e5555f54345c48b3cfe0b814d7d69b88d64a4dfc8dc95e20b0d6ba0ad10102fea040ee66e78cccf255 SHA512 821f5466d0dd21d98dbb9bd32ae96e3aacb3b390ecb3f6b541c9a1e0f1953ebd784e2a2516473fa9fd7f3238d29cacf06a9038f451a0068955a2c397492354d6
 MISC metadata.xml 491 BLAKE2B 1c17cf9901705ce6aa44e87902e2d52dbebf6c465ce3210b005ce0a2a69df04f91f90d3f8bfb3f44c1ce804bdb02bfd959920564b5e496ea58089fa77b4ccb22 SHA512 f7fd4fa24b1df7ecb7260f74569413af570c75df6e2c52fa59a8e01d030e4c0bbef120e53f6c3a6b0ad8100d8797c86dd8c1586f86f02c3a740362f6f0b96479
diff --git a/dev-python/pydantic/pydantic-1.8.2.ebuild b/dev-python/pydantic/pydantic-1.8.2.ebuild
index 26b8dccc514f..40c0a3ad124d 100644
--- a/dev-python/pydantic/pydantic-1.8.2.ebuild
+++ b/dev-python/pydantic/pydantic-1.8.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Data parsing and validation using Python type hints"
@@ -36,6 +35,11 @@ src_prepare() {
 }
 
 python_test() {
-	# TODO
-	epytest --deselect tests/test_hypothesis_plugin.py
+	local ignore=(
+		# mypy results depend on version
+		tests/mypy/test_mypy.py
+		# TODO
+		tests/test_hypothesis_plugin.py
+	)
+	epytest ${ignore[@]/#/--ignore }
 }
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index e0d50a7a1790..c8bf0630dfa7 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,7 +1,5 @@
-DIST pyproject2setuppy-17.tar.gz 12191 BLAKE2B 5be19c9e70abf37d776649237581b1cb281331585c6ffa312f63e50bd2fd8104972861b38958272d5eced086b2a60ed370437807d1eeb382e4ad0cde5f03b0db SHA512 0291f9ad1c3059a4ccd366d8f1078ffd57de89cc128e996126f62a92ac4dded9c7da25be1325ca9f660062ba3a65fd01d62d4ffb22084cec7f4aba79e552ae2f
 DIST pyproject2setuppy-18.tar.gz 12566 BLAKE2B 424aac4c89f498cca61b18bc1e8da3dd72324014d04b2a1e0b7d9aad48b445ddf95117902f6f2d80f9c0e1f3ac808d22dc62b31a2bc41f59820765e49de56a48 SHA512 f29f262ea59cccb698e82de630c8de40fae5a758e71b741c5c5e26639813bc45de13d1479b92a92aaee24edc71ea6f66b0484bba765c4d66eb10e0487bdef080
 DIST pyproject2setuppy-19.tar.gz 12531 BLAKE2B c5364f9f31a9cd23252664e69d252ebff579e965585db338587557d7bbf78ff346e6dc9d6cd20abee332ef7675f3246f175c4a1694bfefc434ffe1563c1158e4 SHA512 1f18f39779e4078d9e3fabebfa8cb279cab80b97ce9aa4dfe5a84019b16bf6bb973dfeb0feb360f36fd93f8106d847602e21589859ca3d7837a78ce1572ea6ea
-EBUILD pyproject2setuppy-17.ebuild 781 BLAKE2B 7777a59955f823ae46991f592da9815467690ea129b0c68449e217700f8e5af25de53407c486245367ecb104a1e8ba570237881de37f9e569a7090ebd5e78386 SHA512 35d001fa3ba56ca4ce3748741dcc1c0761385f1416bef7f8d246d62ded57b94b38c5b2c12343d1635198d9dd1114286952f26e93e3a0bf947487750a84cc8f94
-EBUILD pyproject2setuppy-18.ebuild 789 BLAKE2B fe0e00600f65bd19118748c645d47c6bdc820037a301c847ea5070e7d6d73e469130fd9fbabc01facf39bc93dfe3edc7ebcc5c2c9511bda969eed68d03d228e5 SHA512 2e839ed0a1bd1e69ef9d505c0e2ff0236e093d76bb1018908f08207cb9830bb018c2d1ed8f511e6ac78f9525b533c1a86708b74f2e69bb0dcf3f2277a41a9293
+EBUILD pyproject2setuppy-18.ebuild 781 BLAKE2B 7777a59955f823ae46991f592da9815467690ea129b0c68449e217700f8e5af25de53407c486245367ecb104a1e8ba570237881de37f9e569a7090ebd5e78386 SHA512 35d001fa3ba56ca4ce3748741dcc1c0761385f1416bef7f8d246d62ded57b94b38c5b2c12343d1635198d9dd1114286952f26e93e3a0bf947487750a84cc8f94
 EBUILD pyproject2setuppy-19.ebuild 789 BLAKE2B e9e2f1054075cd7f5d2bcc2f58f589816817ddacf4e73be175fb3f7491cf51a59e8b0d18f9fa872347a902b01e39ea4cb7f8f03911f993e1309402183be8dc9c SHA512 1ce6b5186288ef992365ecde9cddeb48ba98585979f2360186f323cd048b59a9c9ff91c9ade4e9c41efdc2bcee1b3cc6aff4173988a31f6bf51b17db4c828faa
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-17.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-17.ebuild
deleted file mode 100644
index 3c9e175ff5df..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-17.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild
index bc478cc41369..3c9e175ff5df 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index d27fa6a1e0ce..5492522f44a8 100644
--- a/dev-python/pytest-datadir/Manifest
+++ b/dev-python/pytest-datadir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datadir-1.3.1.tar.gz 15230 BLAKE2B 72c5daaeb93315be55ae052d39a22eee4e64a1aaafa344ae64b527eebd137dc4667cee2f60af887551f00814d7ea4e5788097d0f59f7769335545c5083aef356 SHA512 2ab035ea4e6c4eaaead746a5fd3988feed31a314f73e18270faf4ae606521aa045f3d6c5e1301adcb87f8fd5b1ba5f3f1784f212ad778707ba46ad638d594f8c
-EBUILD pytest-datadir-1.3.1.ebuild 620 BLAKE2B 517bc1aca15d5bbb74de8467e50df39d6209b6f9d386f060f43927f4158fac71b98c2da1ee8a00ffc4d43a77859d7c563ce361fc50f23c2ab8a4143a4662a01d SHA512 a65019a2210170337f87c428c78c08887895bc10bd8731ed05b3c2728171a70e8612c9a3d3ccfe218a2f66efed2cb5afd10dbd1eca75b7bcce779157ac9906f0
+EBUILD pytest-datadir-1.3.1.ebuild 626 BLAKE2B 2ed2fa36a4b71e875d49560e340cb05d5c9e7f37edd1e9158d30858566188360ee4a5e4e630fa329bf7b6bac9609d40f0402a747330fcd8bcc10c4c9c0dca73e SHA512 fab17c677e993452b90d94898eefb45b9784447f316866cd53dc3051c776e0b7c657c8a788df7473edae9b4557bf6e8654b2a6a27d27f15a7493ec4720e398e9
 MISC metadata.xml 359 BLAKE2B 41902d1f5543ce1c93f41cfa086f273b440e0f69e59601ab48ec57ef4e5371a45e2a9b3d913b406a46b16eb073b30cff8dc30c09ff66a16b9010dcb5982460b8 SHA512 b0cd9e7e16cafb7051d23fa47f7eb0e6ebffc7cd2334c539dabaa252d5d1bcd3e4db51afab71fcb3e03e933384735bd49d378cb4fe2f8558a8d3da91bc429cb5
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
index ed1a4f2902a9..e76d3587cd8a 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~riscv x86"
+KEYWORDS="amd64 ~arm ~hppa ~riscv x86"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index b09cfe43c3ba..eedb37d353cf 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-httpx-0.12.0.tar.gz 21319 BLAKE2B 59c3678937a7756f13971e3f1f8d312b227f56339b4234ac8e5544f4370622bcff401f76f68c2ee042fdc64deae6a7a9dd05ca8a54b60b14bfb74b2d2d724de4 SHA512 b5866ab0123755020fad679d27d4d113132b2a79da85c52a334904d19aea90ddc71088a6e0f27110498da2731be664c525f3cab256d447a37d9a507f9a508b43
+DIST pytest-httpx-0.12.1.tar.gz 21422 BLAKE2B 6336a79d3aedbba7ec32fdafc6ed6fd70a24354adcdd3803af73522f9eb2d5bb1ac51364c107d3ca663f2c627a29fa9d3b0c12ba1bcba94259932a36c7695ed4 SHA512 959906c366b3cfc4d3df46773888f1da0c65ca4a9d31de302c859a61a71f10df5712b058bf89132756028eda15c35241aa245bc708d69560a0d3a80f9fa1e814
 EBUILD pytest-httpx-0.12.0.ebuild 653 BLAKE2B 49026b4a4108d22081b0cf24ae5921ce32b54c948b804b1c1ab6daf790f030f727738313862390b9c5b7a9f9761fb34b95a5ab8f6fbb70f0aea563a4aa2a1902 SHA512 fb68de7d314fcaf3e256854a6a882fac594e29ab4b331f25024da8d0092551279bf15a273089ee4174b7a7d29d8b8e8a96f58c21bf7fc919940bb0732671e5ee
+EBUILD pytest-httpx-0.12.1.ebuild 652 BLAKE2B a2624ce903778e87e6342263190c7ad41bf44b6fc85a293adb8f2be7b263bba58e277b00465fdd84eeac248a91525416560ad40f537d5642e6522e038c166867 SHA512 b8bf77a8d969b2dfc3681f080702add98e44a60bf4273484f8cb51b37cc77db3d2ebc381f179ad6366b667907ebcab7a2cfcc965a21961f3424c34878ad37712
 MISC metadata.xml 467 BLAKE2B d13bfcccc41321e84d9e912be5e6106c376d7dd5a8bc596e69e570713fb2d0dee3627e29dc9c35c6638322c7edd328a6f60e6af8dc967fad302508dcfded32be SHA512 a6b6cc298ccbbc4b11c0e91a4402f634ee0f69e5ee53e09648f842771b8d6f3fdebe5114b3f55623b75e6539a794b6b94956a6eaf4e7f91e28eb6d4bcbb5f770
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.12.1.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.12.1.ebuild
new file mode 100644
index 000000000000..ce7fceeea820
--- /dev/null
+++ b/dev-python/pytest-httpx/pytest-httpx-0.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+DESCRIPTION="Send responses to HTTPX using pytest"
+HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
+SRC_URI="https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/httpx-0.18*[${PYTHON_USEDEP}]
+	=dev-python/pytest-6*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index 772f85c90496..21d9482bb098 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,4 +1,4 @@
 AUX remove-tests.patch 417 BLAKE2B e3a0e4b3fdb42b395fa336461f84feea4dac252399ff266231121a48e659fbfad671d318e9a3212f77939f7e609b3df71363abf8f9f2450e087479869731720a SHA512 3b399e3e85cf12bc5ee2db3d53594b2eee5ba8809bfaa950738730194c2dab16c8b776100b009bdbb520020b0ae276c8b13291139dcb1d48e0887bec72c80679
 DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
-EBUILD python-augeas-1.1.0.ebuild 597 BLAKE2B e38ffb64fcadf0beedd8c7f9c8fe52ad2f327abc2c93657f7283742245e28606a60ca1d1585804bf161af8838b0d2b392901f87f7bddb7fa0b99903e2f816a62 SHA512 8c2685d95b4a45612a3fc1420f6debb05f77bbb4a4d8aa248412f3b5608dee2896a81b09eb015948a2cd9cc2ca9992fc97d7351b997b0228769fbf3ddc7d2910
+EBUILD python-augeas-1.1.0.ebuild 593 BLAKE2B a281c1c4a107ddacbd8d96f1d954a0979a3e5e27f6c358f978d6388fe5ad66787b56e304aea783458c8edbd2b6304190a466a0fea1155d779264bb56906cdf23 SHA512 2699f316a8cba901bc5acb03e3270602a8624c2339b0da81abbb0a9c1a2e8f54788d28775b2a1d9073d83a8c5810f76483a6cc9a077ed29a0b2ffb7699ca1d1c
 MISC metadata.xml 422 BLAKE2B 659e3578e5176a84d6ca554d44deefda0a3006a850dd5ae331b18d879191c7b62bdc136f71132c5c39cacf2665edd23e43a05f3a76b7bbd8b795b1c1bb3bdd02 SHA512 15bc6f8333ec035dcefa54171b0f5c2bb7c228182b75449d0a2b10bffbf97c5f4d8af77c97bd88c157326973df0b956abfa42ffd98cf971f61507aa894834cdf
diff --git a/dev-python/python-augeas/python-augeas-1.1.0.ebuild b/dev-python/python-augeas/python-augeas-1.1.0.ebuild
index 7c0be63023ef..0d043ed20916 100644
--- a/dev-python/python-augeas/python-augeas-1.1.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.1.0.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=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index b72004a716ce..63b2b6a47baa 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -3,7 +3,7 @@ DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038
 DIST python-dotenv-0.18.0.tar.gz 32242 BLAKE2B 6cbef7ea7278a3114b3eaea2ede0c68e2c6dcc3868f655dbcad9596ea6e1ec0b9f5d183a73fda32e53d348ae23c11ca3f9d2e8eadd974eea4dd13903b9f9c845 SHA512 4b120ee45602ce703ee360fb5af07a8854bcb1ecd9084057e00324b152cf230fa6f065b374b6eebbfb7069b32762624ea61dd5d2fa6ac62cb7e3a2bb6ddfc1ed
 DIST python-dotenv-0.19.0.tar.gz 32016 BLAKE2B c9f499abf99b3af8aafe7285347e08e61e770b1a5ca9d9b0cdf9dc306367c3f0492dae814835b637c9fd3c25d81006f78cbcf8d2de18bf7dc917e1bcdb0cb544 SHA512 6207f30e79ce13ccacc00ab1a95a1613317c2cc6bd735060ddca558b498c9d5c1c46ba76d97cdbb282c0f2695aed9346159ecbe08aa8a7c4f143a65708182806
 EBUILD python-dotenv-0.17.1.ebuild 699 BLAKE2B 30991868d0fe6e918e73ac6a627cb310221caf566dc6675086674fae634e0206c883ced4f34e89c8abc19518461ee41ffe880e9a18220f9a7e00a6c1c4171639 SHA512 4bbbfa7542acee21adf7f946904dcd56026186aa8737a5877b15c0d2af47efae1228b1956696fae57ca83c2b6a1fe2d35030ebe58c04164cde781bd824686c61
-EBUILD python-dotenv-0.18.0-r1.ebuild 849 BLAKE2B 2bc460d75a0c4ec77be0206bc5aad3f067a6111b4de689a7fcbcd292e9f8e1d64ff8de7c04de5bfa1cbb055fd6ab4a78233ddda5aac74e8f1ff3ed78b000218f SHA512 77b731f7bb0f8d8247a8100c1ccb1251abb996ff486e5d70a835deea36b5a2ae9fcd719588e1732b332a757724aede48792151ab850e4aadad25bd56c6f1067a
+EBUILD python-dotenv-0.18.0-r1.ebuild 848 BLAKE2B 77c7fbfcb9b82afbef7cf1ea43e3fcd80e372040b118cb3e2b0fbbd3f1f03ab8c54b7ab664bd112c1951f2e7d6797e69a67911136210ce47e5596b0d7b14f00e SHA512 81a8b363f32d2438711212b38fed7cf17e16f598385e80eebd2cb956662f5e5aa709d797f9522a91c6cbef1c6ecb1f213e6c2bff645c7e5241fb9285c0b74e84
 EBUILD python-dotenv-0.18.0.ebuild 667 BLAKE2B afa1384333768d7c865ee8c1410e7b2d54899c185fda2940d4dd05a184c78ef334be98db6c05cf093bfdcaf64293d1b4ae2123e036a78124d2f27d4a69013ac8 SHA512 5409f429cbb14e907cd20df27fffd4fc1b8c9ad7ac3a26fcc5ff6c99160baf5486f89a443ea96c0d062547ef4a8b49c92f86ae015a273b2e15cca581b7ae41de
 EBUILD python-dotenv-0.19.0.ebuild 851 BLAKE2B cbfe88cbff68fd16e0a03afc3ebcafb0b1f5a85c6e89580f3a64b70bde24a60853f63f6b623552595734a22d61dd2cb38d4bee3a354e7eb5adbe681670d0dba1 SHA512 eb62d1072b1253c1569972b864b5e9864f03bf6a10226260a08496b5134cb9b2fd8a94aaabd3e7f05668d9ebf3a11d8f722395569a40d11f06e3c99948368c11
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
index 9c19ce5b8174..14d39f102d8c 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index 9a3474b5ac2a..903f0b228b24 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,4 +1,4 @@
 DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49
-EBUILD python_orocos_kdl-1.5.0.ebuild 1399 BLAKE2B f9179d56590c3b0d70f4b120a7da4a708ac14bf8598b5eef1d46cc0cecce8eed7e2f50ade56d6462b98f4b4781ee1ee38dc5073603adfdc3beadc918f8c14278 SHA512 0ca959bd0a395465ef85d3dfc3948b22e6cc142818a35b2a03e7b7d7c59ca8f8ff5ff951cade3a85d363700a8e43fd6921d4779d7373199d7e9a9deea3e197d1
-EBUILD python_orocos_kdl-9999.ebuild 1399 BLAKE2B f9179d56590c3b0d70f4b120a7da4a708ac14bf8598b5eef1d46cc0cecce8eed7e2f50ade56d6462b98f4b4781ee1ee38dc5073603adfdc3beadc918f8c14278 SHA512 0ca959bd0a395465ef85d3dfc3948b22e6cc142818a35b2a03e7b7d7c59ca8f8ff5ff951cade3a85d363700a8e43fd6921d4779d7373199d7e9a9deea3e197d1
+EBUILD python_orocos_kdl-1.5.0.ebuild 1513 BLAKE2B 65134936ded2bfc06912b2fa15aa7eb9eb9eaab717f01ae29431f7ebedb08e74a856d9b734ce84266ea2921cd01dd87c60840f1f48e63db73b4ebe4b64d0896b SHA512 285b544d07eff109415b9c92b5dcfce5e4f5df3f920d6bec6903969b7942dbeab2a51cbef5fa3a4b19c415850bcb5ba51c1b0c82a73115dcd94db3915103e7dc
+EBUILD python_orocos_kdl-9999.ebuild 1513 BLAKE2B 65134936ded2bfc06912b2fa15aa7eb9eb9eaab717f01ae29431f7ebedb08e74a856d9b734ce84266ea2921cd01dd87c60840f1f48e63db73b4ebe4b64d0896b SHA512 285b544d07eff109415b9c92b5dcfce5e4f5df3f920d6bec6903969b7942dbeab2a51cbef5fa3a4b19c415850bcb5ba51c1b0c82a73115dcd94db3915103e7dc
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
index a3114345ba43..cb5f4ef382d9 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
@@ -10,6 +10,10 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
 fi
 
+# pybind11 strips targets at build otherwise...
+# https://bugs.gentoo.org/806857
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
 inherit ${SCM} python-r1 cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index a3114345ba43..cb5f4ef382d9 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -10,6 +10,10 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
 fi
 
+# pybind11 strips targets at build otherwise...
+# https://bugs.gentoo.org/806857
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
 inherit ${SCM} python-r1 cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/pyzotero/Manifest b/dev-python/pyzotero/Manifest
index 91611d9fa7ef..a65346ddeba2 100644
--- a/dev-python/pyzotero/Manifest
+++ b/dev-python/pyzotero/Manifest
@@ -1,3 +1,3 @@
-DIST pyzotero-1.4.24.tar.gz 521403 BLAKE2B 225c881f85be6b04d54975b40d4254588214ee84974103dfe2cd64db01f586e93379e21ca537f1356c798125e149b15b326832abe172f029e8841d879650df84 SHA512 f2a1ac00c331efbfe32e00d8281d36cdf8112f68a5c3851cb34625090bfe8dec81d1afec86e4af9ae477df6855eb42ced75e942b18589564f9d04351117f0d05
-EBUILD pyzotero-1.4.24-r1.ebuild 936 BLAKE2B 229a4a5cec0ca6224da052f1a8998e821f4bae0c573241383c5e07fc5394aa85607808d353f8699d035efe72556a8d927583eba4e0aba75fc18623e2aa46be28 SHA512 b0d771afa946fa858d89e2e55c2f68c8179cfd598bc87dc871387029bb2bc4dc22e47642d0e846ddb449b78023062449ebb99300747831b0f8d9f5b266b64279
+DIST pyzotero-1.4.25.tar.gz 521569 BLAKE2B ce4e3587667078d295c0d2b7d0695aba0b9da22d40caa3aff405a6ed88b3061693d0d9d0db5bfdde074a3003b088705ed5c9443f3fa0f156d803114b25288b2b SHA512 d00d30da57d7f988b9e301d496a26bd983933567ffeb87d6d494dd7c93290315ad7fda8e791c4be382bedfda51ab5928ed37230f6649f60ce731f6b2f8ddfd39
+EBUILD pyzotero-1.4.25.ebuild 936 BLAKE2B ce906d059bf84d6a54a973c9df4e4f1a6bce7355cb391a9afa4afc3ed91788784085bb40ac3327201dd10fc829550d9941d43cd18d3dd487cb12a92d5f21d8bc SHA512 7d503a5a2439adbb3b256e0b94985be642966e590d6fde5c0a6acb1dfc88f1a4fe35e1c6a1729c48df99e4919ec7d1d19c31e512ac9d7b998653f9908fc3a387
 MISC metadata.xml 511 BLAKE2B 363254beff5da581cc2abe491330e1eff22d98aacb6f6c9de9146a185dea24e2958c1559428bb2cd4c7102a5cfd3eb639522c71bff823d03874ca8b4e213aefd SHA512 6f5187dabb878bbf49ab113a31692b0a9b11b517f6e8391da487775444d4fa19b281085f35928ee04c2bcfede4b2f78a15a7ef8860b97df1f8a0cc3208a46750
diff --git a/dev-python/pyzotero/pyzotero-1.4.24-r1.ebuild b/dev-python/pyzotero/pyzotero-1.4.25.ebuild
index 81f1a3291db9..03077463c22c 100644
--- a/dev-python/pyzotero/pyzotero-1.4.24-r1.ebuild
+++ b/dev-python/pyzotero/pyzotero-1.4.25.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..9} )
-
 inherit distutils-r1
 
 DESCRIPTION="A Python client for the Zotero API"
@@ -34,7 +33,7 @@ distutils_enable_tests pytest
 
 python_prepare_all() {
 	# do not install tests
-	sed -i "s/find_packages(),/find_packages(exclude=('test*')),/g" setup.py || die
+	sed -i "s/find_packages(),/find_packages(exclude=('test*',)),/g" setup.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 7c2b4f5120f6..1eb4394ae48d 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,7 +1,9 @@
 DIST requests-cache-0.6.4.gh.tar.gz 50322 BLAKE2B c9a6cae957604bdfa6057621e028fad83476e5d918bbf9c58e73f09f8615398946f3cf6e3737c9ff916cba68d82ed66a674557fb733c74b874b0f68e2430d9a0 SHA512 31e2217e54892d8ec5fc9fcf60f650960621b1f97029c90deca925b9a1be9eb5a3ddb6ae68e581c805f20136f93eefa70d51e7e9f086ecbae76f8e550bbe3f1a
 DIST requests-cache-0.7.1.gh.tar.gz 959455 BLAKE2B ce41514f21dc0708e437f70b92eb9d84f47433d04a11476cd5afefd050089e2d138213fa0b2f6bac200bd6d59db996187481ef3544d289a5117f3fe7160027b5 SHA512 cd83134ce9500c20c63fa92546cca41772ba3582a669914cd0885ec5aadf6ae4a6c4fc6a83dce73d2d5b24a80db2fde65cdb0a89b4b5703ddeac1d710404a05d
 DIST requests-cache-0.7.2.gh.tar.gz 962215 BLAKE2B 0f66548b4c37c14347021a4675d0165b9f9648dc9842f1d94c9507c096f6ef359f7109f88ac369de2de263673542f42d6e4a7402449354aee900970331f87cea SHA512 1712f3568ec4c8c41988c9d2ca07e72b1a66efceb596d814219b5eb9bb0c05448ee33b4634ec39fb03634032a6bfaaf877b297be7f92f540788dba40b4c202df
+DIST requests-cache-0.7.3.gh.tar.gz 1182825 BLAKE2B bc2b936f3b13388c23c344119a0ae2dc8efae3ba243e3a176ac27a7affb9b1c691e99ee88dfa61823a5c517ea898f144c7a9450867ea611c8518a0ecb3d77287 SHA512 fca494438001d14b0edce2cf93f51f65a0bf363d31bf1c70d1a4b2f214fe7bfc6f6f6fc97d21357fcfb9ab38c83d76cabe9c0ff4703171679ce509bd9f55753f
 EBUILD requests-cache-0.6.4.ebuild 1141 BLAKE2B 5d2037be26cba0679666805ce783f1d9aa8452b1d8da78e443e47d3990fb212dde552d44e228ab21834fac51cf0f39e6db8dca1c2f075ce809614e4b91fdf0db SHA512 3fd54f8b358d1cdf7f5f2a4d46baa4432111b2c8f641b91b77fc141c300d3bd0467ec0600a85be138c0bbec55a4e33b891f5d8acbb9ab5fc5ca6a2b28d76c4a4
 EBUILD requests-cache-0.7.1.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
 EBUILD requests-cache-0.7.2.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
+EBUILD requests-cache-0.7.3.ebuild 1382 BLAKE2B 89469e089c23754dfd8c85657e38ca490344ee5d3c96cba114258bb458597f62d46c986e71bbb5298398e7e1a83047188895e939fc2fe3105d5c1bb26b5a2947 SHA512 0b7255dd53efeefdb270b90de36d14133ab599ef2d5122d57133c47f44447b99dda5b6f37520f142306efa094bc3f0b8a040e84b1fcb78e9d8336ebfe7001d97
 MISC metadata.xml 469 BLAKE2B 7a0fbb271ec0f40665d6fbce539cb49a818f5f3876642c7d9d721566fac8fa81b0f39f4a2ce6b2b0884b6c2ea79a1bbf8c95d2f86c75372725dbc53757f0154b SHA512 6485eecd67956b0ad5eaaad22c5e68e9bc9acaf0330aca6c3c0a378b5153ecc7a086fac08e9932d03ea4ff6448c63958fc8faeabefd4c68140f44b0fda0f31f5
diff --git a/dev-python/requests-cache/requests-cache-0.7.3.ebuild b/dev-python/requests-cache/requests-cache-0.7.3.ebuild
new file mode 100644
index 000000000000..b3e59acf4577
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.7.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cattrs[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local ignore=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+	)
+	local deselect=(
+		# Requires Internet access
+		tests/integration/test_compat.py::test_version_upgrade
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest ${deselect[@]/#/--deselect } ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index feb8551022d8..22bab6d90206 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,3 +1,5 @@
 DIST requests-file-1.4.3.tar.gz 5252 BLAKE2B 18b533a7619f46c1d01d0cabca2137592ff614c2a33ccbe227d4f3ea2e4854b7ecc7973d56b15c72d980d03df7cee38fe4216eae35f5803bbbdb7845f8e3e5ec SHA512 b92294a11c9cc13beb5df598b636d999e0fcd46d05b775bbb69667f066d24ccf55b5af2135aec8d69c0096ca64e13bab3c3da64bee00f0c12edd05f43430d80c
+DIST requests-file-1.5.1.tar.gz 5668 BLAKE2B 4060ab3728e32d87252d1bb25e310937dad0a6e790a9633f8932d45c1d791343ea6813509d15a24c9787736ef6b9992d236b06a504efce6c3d5fcfc04176ae87 SHA512 e671bba8de63d3fa5665f928734f1a152d95ac9973c99f3a09d2dcbb9c9c16334c54a4f0824a5ebe63e262a4cc5d4990f08244ff0b84af11fa475dd416b1e2bc
 EBUILD requests-file-1.4.3.ebuild 504 BLAKE2B be19d49a1e83e9bdf88ee353501517bf203445eb626a8596e92044a5f2f80342cf73758dd90ebf2a997bf0248ab22a333ebbe8eddf12a2348db7fcc3a69dddc5 SHA512 517cd9da9fecb560f2e17823e41332441dcee631d9ad70d44d12ed5f9ede68a85dc7938224ed3291e58168a51a89a6f99a1180e44fb13a4ce3d3ca744535d38e
-MISC metadata.xml 323 BLAKE2B 2c538f8e61493f84b981185d91a9271ea5cbc8efcad644144ea2a7d990840b76913819fbadcb08e5bc5ec5500f93fc0bb0073013949d932453131f7c4f1cc401 SHA512 f88f18e2c93d2143a43fb52aac49f5744e41f701ed378880db0a931f5b2b87a2dfddfd346a77e3cba25b7b6a0c91ec3d224ab2446234e92d972b4fcfe75759a9
+EBUILD requests-file-1.5.1-r1.ebuild 494 BLAKE2B 1a4f6aa67cac8def91cd6d3d7c3fbdae5b8ee9798e59144a36fdf8d54cd6005a078535b8035e0031a663eefa3563ed13997711c2159c51a0a671444bf83ffd2b SHA512 4dc2d68b850cf51cc7631d35d40c3d7cafba254e4a2a723d226788d3c06bd7260c84166671bf6a5a6e338333c3c01c462fd856000dc0b86e368f7d2f1f7bdfc0
+MISC metadata.xml 451 BLAKE2B 0f5a2d6746b647ae24ba96c5034e1f69248ac5d7135447cc7aef2c6a11f240f8c98ac8ba0cc996cca010a4bfe595f84204bf69913682396cf74c9def1c53477d SHA512 5779f8cd0dbf20dc2a6dd280af4348251c7b872b05f8526260cef0294ee43ad8ea2fb15fd02e7ddabb090ee4cdbb43b9e713052a8b7e350eb63838d90fec3581
diff --git a/dev-python/requests-file/metadata.xml b/dev-python/requests-file/metadata.xml
index fa0421a3d388..2bb72dfecbdd 100644
--- a/dev-python/requests-file/metadata.xml
+++ b/dev-python/requests-file/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">requests-file</remote-id>
+		<remote-id type="github">dashea/requests-file</remote-id>
+		<bugs-to>https://github.com/dashea/requests-file/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..d06b05258f23
--- /dev/null
+++ b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="File transport adapter for Requests"
+HOMEPAGE="https://pypi.org/project/requests-file/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 0b0edcbedb7c..a30f885b8274 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -2,5 +2,5 @@ AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1533 BLAKE2B abac6a547f05fe3a7ba0f1c515c1fd753d5f095318fd66cd506c4a89771b6e38660126b87e748f99c724de60ab82cdae4491b7805323d76d6b9a8dca032f42be SHA512 253b995b4430f10bad13453ad5bf0f40c55cd7d63b018d877b0255553998275139f3a5a5fccfcdda29e9c7c1532545bf32aca7649837affaf984a936f87637d9
+EBUILD requests-2.26.0.ebuild 1593 BLAKE2B 5bbada6550ec3b6ba5240a95cb1832e1b5ddb1b8ce7cb68be64ff9a414d5cbd26003ad37971ceaaca946dfff2e036086293029c5b6b152855785567f0c7521ed SHA512 9b81f5ea758ad4d5c7d168137c17091c41b636de159d49b2748e67de89554451ee8f286581fd17e7d1885d8b8029ac12d27816948f9d264f23a40caeddb6d43d
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index b7f083336e7e..97902378064a 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index d1c936f67763..bfd7d7204df1 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,5 +1,7 @@
 AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
 AUX scikit-build-0.11.1-py310.patch 915 BLAKE2B 8ae5eb217482f0dfbcf966bbee65e9e2e2d7e74bff1970b6417789ca5c93881958640213ffe6c496a4a7f6578101fb51976528474cb3c8147302ec9221d9d1be SHA512 98bac74f6715320666be75455515efe35b208bc26209323453589cfb0c83ece5acefcaa5d17f625dd9ebb5970c06a3ba69334d140525d6b944066e50efdce22e
 DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
+DIST scikit-build-0.12.0.tar.gz 138053 BLAKE2B 5007bd070cee14056cbc9cc24a022a39c920ce7fa794a79dcdb707f185529e1ed2442a201593f6df8d2dd9b4ab7a9a1ed209b0bc08f3feae748edd06894f8661 SHA512 76be92d8ff96dc230e38dc36a58021399dd8c57b6883dc032fbcd8f01ce42c879c6d557e7a46d48aa9b8bc724270f409f3760824d5810654b53a1aca25ec1cf9
 EBUILD scikit-build-0.11.1.ebuild 1417 BLAKE2B 0877d71bb33439613b60fa747490cfac5898644d042d79966eeee192bc7133e0de6ad85c4e38405748d3f4c600c3d0d91356c4f4aeb23e494dfd09086c3e496d SHA512 24ceae6bef1bb7197571433d3adaf89feb021ed8c5a3ffb3994657d4c43a77e1fb38e76c09cf0d3785f1abc19cb9c7e02f1d6bb70dea5bba2d2cb56376f6d0b4
+EBUILD scikit-build-0.12.0.ebuild 1443 BLAKE2B 0e14fc8da9f3d9c98bc7ba81a91ab659975c3ea8cc36c7df69a5d2fa552655962d11026adffa92060a6788c0a4e5890eb12f57ed81b2cd53e2a798bd2430ab66 SHA512 9ee21ba07a5018b7e5a352cf5bc7b883ac344bca2f3c5fe032d0ceebcbac7864df109a0c4139bc3610710703f8254c1cba980a44d4a0a04a587d744dcf3f21be
 MISC metadata.xml 407 BLAKE2B 91cafd558c8797a07a57e8581fe68b3353d6f70a00dbfda9ce1615fc5302f9cce23a806fc31f4359f670546a39a97ddd7958d0fd77ab6d18841f3888bdbda0c2 SHA512 2a06667260d774bf4e49553c709110b14e798cbe4641352c745c5af6e400bf027d1064997b5347e4ffadc27310dfe0bd02a58a891defd6d7cd96f1b2ed3909e0
diff --git a/dev-python/scikit-build/scikit-build-0.12.0.ebuild b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
new file mode 100644
index 000000000000..18279621e56a
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.12.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="https://github.com/scikit-build/scikit-build"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]"
+
+DEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not packaged
+	sed -i -e '/cmakedomain/d' docs/conf.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# sandbox violations
+		tests/test_hello_cpp.py::test_hello_develop
+		tests/test_issue274_support_default_package_dir.py
+		tests/test_issue274_support_one_package_without_package_dir.py
+		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 9034ed369d67..b76b1bcf7984 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,4 +1,4 @@
 DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792
 DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b SHA512 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2
-EBUILD setuptools-57.4.0-r2.ebuild 2738 BLAKE2B 783bf37f4e2f91a795b096ae725b3e454a84510a3f1dc070e10e141163029d7719ae8226a4a75036f2706b9a19b204ebbef507c02e864ac9ac8ad664187de915 SHA512 7b5addaebd03bd9bff7afd80d640f8a3a2757610d3e8c8a93a5dd0b7e609c544edb4326b14ac30d091ccc256a91218439cb033d4d4fb762ff9bdda0fff073478
+EBUILD setuptools-57.4.0-r2.ebuild 2798 BLAKE2B c15aec674a9406bbab7ffdce858aa25b869bdddd4e6b24a2b9d84ce051ec6b9823b629b22f08a35146a340009bd50646a8cded7e6ec46dd57c63fb1452dd81b0 SHA512 643512670a0133300b33407aeaaa9771c45e2ae92459177e26cfff51ac61532764b8f675f8fc870844cb0d712a67b057dae3b6795aa6d22d48815fb59554f065
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild b/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
index f93956f1f767..9eee2b0f368e 100644
--- a/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
+++ b/dev-python/setuptools/setuptools-57.4.0-r2.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 # Set to 'manual' to avoid triggering install QA check
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index f5e797d933b5..383918b2fc75 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
-EBUILD setuptools_scm-6.0.1-r1.ebuild 1067 BLAKE2B 0665dfce5bb244b6baedf1514aacff35414e754b171b5c66a28bbda754e528413ec31e3e08317be32cd6babbfff921609d1b90aea20503b521853407a17d1161 SHA512 668b85064465587e84f3b684f8ccb5ca0e54a99fc784a6bc7630c6bf17824a3d0ad870118dd7aad426d628df6fcdfc4a8ebaaa1821973081a2661fb61b071b01
+EBUILD setuptools_scm-6.0.1-r1.ebuild 1127 BLAKE2B 886f94979ac7cf4a2b00b43c84f07678a9e4d9f843594548feea98b14a3409fdf8ef7e3c3475e0766455ac8eba2f14f9d03120010fb26a64ee7f644f6aafa113 SHA512 28b1b9e84181120331a6288893423c36cf00febb5ab439bc3927e5be702d372e89a23ec8dc22e3a78ca547a1fba581c12431dcf3baf5c3d828b0ae565b0b7446
 MISC metadata.xml 400 BLAKE2B c588c18ca5fef828f93a70bb799701725aeadea660b06cf1b61fc96c65e6dd25784901a36778d6f972e1aa9d6075a238fdfcdf8ec8a44b86f0e2852608c52186 SHA512 75b27d43cc0fc4dc74179f9b64c562ec80113354a59e6a8a440535e62d5119d20614c7c0e905c42966da839e149b4c7b79e894643a069dbaa45102b6ace5f07d
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
index c1bd0098b538..c333450a2173 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 4020d847f341..fdce2e9775d3 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,5 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-1.14.2.tar.gz 63779 BLAKE2B adc9004334a53f3704e22c318df6b4f60fd9ca2d31f5a9601f84abfaf0fe2ded06938b165e10b1a977ed38fcad7d0fa08799f2f552fc2c6b9b4c2a6476477115 SHA512 b7917504ae85606e1986b681274077777ad3011639bfe933d4133c3ed16f930842e03b572caa396ca4d58f41fd5594bef776cc16c4b0fbd1242e57c6aad19e62
-EBUILD sh-1.14.2.ebuild 605 BLAKE2B 4041fa9627104d037ded2a42866c02474caf6cbf69d8cd8a12f53309667d569b2678192aa1e491493d27395595a70ca6ff3472dbece06c4e4ef03a04c3508a02 SHA512 b3db3f248ebba97f23f5b64476688d1c497a7927d25a9204114bfb61ee8669dd23ab0000c3f5152b926f30b57b7eb238113d4fe9be18dd5e47a06e2c00ef0af4
+EBUILD sh-1.14.2.ebuild 604 BLAKE2B d94c3cbf21d4957524a87239cd507fd4de72f01882c10eb84fa2485a2de44e71d8e15a5d09fdc475ac73100828aff21b7bff29c91389dd4baf4555cb7f8ab009 SHA512 ac2997313e4cc9c87914b8bd7624b4a3fcc4c5e796c0ebcce3228c6cf94637c7bbba772e0d077e02f7b493c40741c3120fe698c06281d1963e3aeae7f2ea76d1
 MISC metadata.xml 700 BLAKE2B b28a6dcf657471c09605d90f1dd4ebe20d793939d3fe4efbec1365d8ad9deb93b93fb7d2686c77e05f03421f5914d44694f8828d54cb72d48f15f50c35b92aba SHA512 64fa8aad2743f7ebdb43475c3528a214ec2d2fc27a9147ec33fda61c97d5a08efb8d9d0786a34d16a0a5da34005654c75475dee62c46db9932b73ac4747c18cd
diff --git a/dev-python/sh/sh-1.14.2.ebuild b/dev-python/sh/sh-1.14.2.ebuild
index ccb7226d54e3..b9dd002412bd 100644
--- a/dev-python/sh/sh-1.14.2.ebuild
+++ b/dev-python/sh/sh-1.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 47e71644cc27..5de2c1c577f8 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -3,7 +3,6 @@ DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb13
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
 DIST sip-6.2.0.dev2107131757.tar.gz 1180225 BLAKE2B 456111e610d872c4b7a875f99e151a82ba3ed1ff11f7d93b19558c52f37e710e448387256d0f620a497d260d97c583c53cbcc5a42affd6e7c05e4f557ae97732 SHA512 260d86d676a56440ac78099de9998697114ed5deb1ed15299aaea68b49b8ea829dfb92f990762875abff0a0c653e4998f1a91437895ba8d38cdac5cf4f2c5761
 EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 89ea240194120bff7b9b3d9b2026f2343fde3bbd8063bb2070ca12c624db79e4d2582a9024cc011705a8f3dd78468ba3849dfd9f806706a20cd1d3c3c0f21b79 SHA512 9cfcd1c771a10205695e66316168e3b29cf4b2fe48212b6918152b988571ce944ee86c6b55f3d9531e7a624a1c7554beff403d76addc6645e4f92e73fb904439
-EBUILD sip-4.19.25.ebuild 2266 BLAKE2B 0c407d5662f9b4a52c6609f26f2af147c9f545408d85f4b0ff3607858057f5c8d8e2fdf9b43638037289b1dc7378c77667894b046a37e62d2268e7af635b5ef9 SHA512 ed0d96b98948b38564c61e95d25546306891652fcc2cacfb47fa9d6e535595a4146a82458943cbbc5ed02f58283ebc9ef338c39bd806e3e79114a3e34633bf51
 EBUILD sip-5.5.0-r2.ebuild 866 BLAKE2B 7a712bf5925feeb8758b32a5fe4871172163d2c423a22d4eeed2802901b9a1a3a6ae5e4a46092f5132cb695a2ea10d8c759be08866689794d9460b53313c71ca SHA512 9f3b813efcb8c02d2e9998b1f547bf6238b59e6e9342b5d441a1eebe1ac36b7ac1988ce876081da7ddc432cc8a6a4819f96257e5188a519a2296733d094f4659
 EBUILD sip-6.2.0_pre2107131757.ebuild 899 BLAKE2B f004737c0f47e793bfff550e16b63103ac4290d90421d384b6d1157ef72631edc25ab06fe4910124810e138724d0ef4b2fc81bd29a78062f6fe351a134510dca SHA512 8c12603272fb963edb8afb8145718c0880ca1b43ddef577df1073b31f15e474bf22fa577238d696015e527e3ca5c465fa0d6e4bebe78629713418116a21ce3e3
 MISC metadata.xml 638 BLAKE2B fc7e45529b0822365db27d281febae466f128ddf88223eea8fd2dedc2c4107e0a91a2784bdac69e7ecda930a76e25c5ad80cf3c6d8ef326737cc47e12a571ec3 SHA512 a603d5a00a8315fcf19b860a45660c76c3f4b47199983d2a0ac73ef1d1617afc7c56f67e2ff1c60bfe3fe644aad57ddf47e55ea2fc400fd9851c3a010fcb4cee
diff --git a/dev-python/sip/sip-4.19.25.ebuild b/dev-python/sip/sip-4.19.25.ebuild
deleted file mode 100644
index e9338c4d957f..000000000000
--- a/dev-python/sip/sip-4.19.25.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		local incdir=$(python_get_includedir)
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sysroot="${ESYSROOT}/usr"
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="${incdir#${SYSROOT}}"
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/speg/Manifest b/dev-python/speg/Manifest
index 3005d407dc4f..8e7f2b408cc8 100644
--- a/dev-python/speg/Manifest
+++ b/dev-python/speg/Manifest
@@ -1,3 +1,3 @@
 DIST speg-0.3.tar.gz 2592 BLAKE2B 1b82d6e122783fbc58f2c711a67e9b8b721d69c08de5ac2815d1ae459ce337552d10bb747cd1e31363f48f4a50bbc967b650d7e6048668d28d4133b5875aed14 SHA512 9faed6af0eb1a6ff0a7dc2e2f5b885a58a5430938b463420ad52277fe2900ae98531057ebbcc21d8cd259d4779bfb0c919125043503635721afe574b4f1f99ce
-EBUILD speg-0.3-r2.ebuild 458 BLAKE2B 52270e2241a3659e876b4e7d3bc3e4fc1f5d1e71e6f28817b5f001780959700db7f58ffb01ba97a48bcd8d811cd4ac963b5f0b80d886f2b2f6cf80ef9b558b73 SHA512 f2570fe986e7bc5d05e299dade878435e0aa2634e415da2a2e236860d58fae36f3093fd5632f66fcd9db8efb09653f79207a1997be8a74f5fd5051e5bf174d81
+EBUILD speg-0.3-r2.ebuild 465 BLAKE2B adbdec2eebc3b605c63c79b2d71e1503363ffae73a93c46d499899f8cf3861749aedf808249d85fd23e6c6ceb4d5423bedc0c27cccc07ed139183c9e87140ff7 SHA512 144207c110dbcaaf45b93986fe74d5d1cf670a62012bdb13ebec5951791f1571c2be0ae81f320dbefe2f76d2ae8db411fc3a578ed8dae92b75dd93293d2327f6
 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
index 8ae01aa99bc6..b571923cfe15 100644
--- a/dev-python/speg/speg-0.3-r2.ebuild
+++ b/dev-python/speg/speg-0.3-r2.ebuild
@@ -9,6 +9,6 @@ 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"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index f304c31b0d2c..1e0cf308851d 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-prompt-1.4.0.tar.gz 9072 BLAKE2B c3ee936bb05eb39fcabd85260ef65b66c9a3fbf64d1b1e188ba889a3777d32fd90c6857d88191f5d9521b25ae46bc6ffc1777c18ace7e0aa0d96f266548ae7be SHA512 e79deb7164fe76f5f4a82855030d5eadd1966d87c0785d2a7a743205301ae0809398823e2a3558c3759774b3ee38c974638daf0b58ce565ef5b298f593ffd18d
+DIST sphinx-prompt-1.5.0.tar.gz 21537 BLAKE2B a5bc69797ea526bc3d66b52e98b80cbb9958add084ea6a4d70a85cc06c69271bbe9e658eb517b78dd758178b6f3b93d92ea87e9432e5c28a61307706a3c34ee8 SHA512 b3d023388eb024303e9264e621ad379367916f8e3567192fde90b3f0d96c94c53d783c2e14970ad3d85895053b3aab9ece6d9573d3bab1dc894e0e04757f3a40
 EBUILD sphinx-prompt-1.4.0.ebuild 553 BLAKE2B bef49d7bd4e8b63d8f6a0983ddd862c8369c09694245d5fdc111f7460bbed32d7825bb45394d96abaac937d6a0b5656af891e05980816182a3ba0e06b6b0fd1f SHA512 4c2876dead9c2f8c648ea6e3fdebe6a10e763039dac37dfba3464e2228f63a645f243bc374219e93ac0003eeb69ac58c3f03b99e0c72e75cca90d50891c3911d
+EBUILD sphinx-prompt-1.5.0.ebuild 591 BLAKE2B 998aaa1bb23e2f005b59f88aedffdd9bb64d07de376bd7c7807b60b7f71f71005c0b4c4ad34b9f89ec037753a6dc250c749f71024de63a0b0eb27fe66f757b46 SHA512 2d0a9af03bdc41ce9701540393b32cda745ab8d35947278ac4895eb6c73ec4d8368900ad716e46eea6139d4670056d03cfb1af080c80cdc83a8c4360536d15c4
 MISC metadata.xml 415 BLAKE2B 00d16da1c9b70e7dcb3da0bd1e6056944c9c011d99dde0f1e1a5a804ee79b8c9fc5e186f7f9d684401a7c360ec4ef2d367216717c18ea0464da944c0edf54fd9 SHA512 9002d60f91e3621e24a472a8c5bd512ab0b8364a82556b2be8b50d2c332aff3b8ea6f633aacf7d7d09101f2b354621291ffc35ef28103106c08df9558a74dceb
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
new file mode 100644
index 000000000000..ece6135668ec
--- /dev/null
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx directive to add unselectable prompt"
+HOMEPAGE="https://github.com/sbrunner/sphinx-prompt/"
+SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 212b7e8fa068..97046703e5a1 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,3 +1,5 @@
 DIST terminado-0.10.1.tar.gz 13911 BLAKE2B e939bab2a23b75d803ba2260548a48a0f1c9925f6a2fe69ff7b549255539898e35f76e94526f8f470126d4d50466f8a85a14bbd3c38d2999d4e90ec4be3e0222 SHA512 fb6a6e27cec8e644565ecab3a7c43fd288c6ff9e18e68dda6d306532fa5e39274574f3dabdbf629cf00096256fef9a0419c98a3d9b7b038e04dd6ca1af16af46
+DIST terminado-0.11.0.tar.gz 14423 BLAKE2B 0fd782bd2b75bb74990b4638af3855d4c63bc53c1be5b1614ab7669e0504ad40b608bfcc4d8c77a4aa36bc3f2a0304a534b791161320de11c1687b4f568ce9c4 SHA512 038619e3e2114200afdc940c4937e20ac0aaee5df152fd2f1fc92f50c5f51bd0e351d3fb8d3979fe8ce5d5a12a27b9f896cf9ff0578a82772fe464b73d6a8d98
 EBUILD terminado-0.10.1.ebuild 809 BLAKE2B 8f3f0a83261f53e307f501ed29bf6ba2d55e039d400a24bfb7708c64d9857fbdb5af801b7b93f9113672d8a992c0883dd424935e55de727568794f1fb0fb5754 SHA512 55a12ae5625804379275ce5237523d6929f5a5f053c07b209f95fa2e39fd32053dbb5190635b87d3f36788947099290c106a5445134ef8d492395f0cc14174c2
+EBUILD terminado-0.11.0.ebuild 811 BLAKE2B cb2533f5a1d0502a4f01d87eb5eff2d7cd34f709e71963ba723ce8eed92714755a9b87d0ba68ed53eed221faa0094bffee560244e2e2acfc8f2e9b93fef88362 SHA512 840fee8f688d133b127955796c1661f28d47622309e6248648c857ad881ce617db755a055941ae3e8d972a4af5df838cc420a9731b48a05819bfad6446929443
 MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/terminado-0.11.0.ebuild b/dev-python/terminado/terminado-0.11.0.ebuild
new file mode 100644
index 000000000000..eb50a120e233
--- /dev/null
+++ b/dev-python/terminado/terminado-0.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index b45037d297c8..99f10620cfd7 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,5 +1,3 @@
-DIST texttable-1.6.3.tar.gz 11574 BLAKE2B aebb306acb89f62963e9473ab6e22291a1ec93993a0106ddd2943f656737cb0960a10e680a69b6577ebb8ac0af3c6ecdfd8c58647a6ce37d9a6531e41f61f480 SHA512 89a26ef7d9947ec4edfc5791c91f2ac327c79bbc5aa0e0f89c0a63dbd80bc420027af073da935254faa143b9e8bef85a7bb352791b45b0cd60c7bcf569869f2d
 DIST texttable-1.6.4.tar.gz 11611 BLAKE2B a97a9beefc9547fe7487af5b6411effd7391e303a13161d7e1c9304a1b580cf47bb10c8649dfea5c6f8ba05bc6c3fd7595662e8b74b282696d9ee3a110746212 SHA512 300b02f5b682f1c09a3eb5abfd4ee9c724354505a3f9e8f68207fd7d244402f234437807d68b6b526c3d4ade9e527e66c921bcd47a5e86d680698d559da3fe1a
-EBUILD texttable-1.6.3.ebuild 659 BLAKE2B 3c62d947889229f01c5bdb5eff363221f9f63facdde893ba9cf57885dfbbd3a0ba88a702cd32a56ff75cd98f25df6d209554d2ce1220b6a3f6960500c955d474 SHA512 857dc931ae7432e85715bf31f71a711f585fa9a0aa9daca8dfc826ddb5b7806d006b1cdc6c74045cc1336dc83607fe61d97fb0165deaad6bcd6a2aa31289e1c8
-EBUILD texttable-1.6.4.ebuild 662 BLAKE2B 6ccbd82aed053f4ce17d43c639af43dcb6a39623ae37ab5fd9521e5a72d216477470836b5d1bd17d2408da0ca5f14e9943107d83baa095ced8a1f18abaa6b153 SHA512 cf333b294b3774eb1b813c0170bc27001bf9f0f30aa5a78373c0c30f691fc6f7bca915ce4aaa1bc8be8785b45a650006e7bca11251b86c032080cd1acfdf9d66
+EBUILD texttable-1.6.4.ebuild 659 BLAKE2B 3c62d947889229f01c5bdb5eff363221f9f63facdde893ba9cf57885dfbbd3a0ba88a702cd32a56ff75cd98f25df6d209554d2ce1220b6a3f6960500c955d474 SHA512 857dc931ae7432e85715bf31f71a711f585fa9a0aa9daca8dfc826ddb5b7806d006b1cdc6c74045cc1336dc83607fe61d97fb0165deaad6bcd6a2aa31289e1c8
 MISC metadata.xml 415 BLAKE2B 11ff7752eaaef7044c1fdb52bef9a06af78430db5a83c4f502eed9b93417bfb6ed0d93ab5ced5fd979e1dfbec35b37f76018aa6bc8c11c64fb8e31af947b175f SHA512 b0eda5e903c15a6de61d24b01a1b97b6002bd40e51291fa74c2be1b1a54b44641354863b7c83a60c02609582fea55dc38e0cf8b3ce126a26c7d437aca77cc0ec
diff --git a/dev-python/texttable/texttable-1.6.3.ebuild b/dev-python/texttable/texttable-1.6.3.ebuild
deleted file mode 100644
index ec0eced974cc..000000000000
--- a/dev-python/texttable/texttable-1.6.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Module for creating simple ASCII tables"
-HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
-SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv tests.py || die
-}
-
-pkg_postinst() {
-	optfeature "better wrapping of CJK text" dev-python/cjkwrap
-}
diff --git a/dev-python/texttable/texttable-1.6.4.ebuild b/dev-python/texttable/texttable-1.6.4.ebuild
index 31621be8f4f9..ec0eced974cc 100644
--- a/dev-python/texttable/texttable-1.6.4.ebuild
+++ b/dev-python/texttable/texttable-1.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 395e584c9382..7e2a89169b11 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,3 +1,7 @@
+DIST tikzplotlib-0.9.11.gh.tar.gz 97761 BLAKE2B 95454a9181b219e99970d06a0e40d518284ff62c7b06d9cbf5b3125b11a711e67f9df1676dc1bd73a9ec632fa01786890e3eef030f8a52ffe809835e3890359c SHA512 05fa8285f4912f2593a00ec5961f4ca94964c2ff8271158c6c1e0447f1f2b54088a76192bcda4f893adc2ad78b9240742962eee1e56043777b0df145808f42ba
+DIST tikzplotlib-0.9.12.gh.tar.gz 97773 BLAKE2B 85d85445e313a41ede8c2d61d8db0d92a8f4fbb0722f716845f0fff3204e603e8b21998a588137eb67bdbc4d8f31bc5bfc82e29fc803b3c54c416191b6e5310b SHA512 4754707727eda29796a49809473b840c07b2cb7de606089d79aeb05daa6ded95a3f110deffb13ca2640e44d91c43b53520d6f29b175e200862492cb986b6c574
 DIST tikzplotlib-0.9.9.tar.gz 591659 BLAKE2B c8ed8069387aedc154ea1541c7e4f97cd43a74c384be4810029acf2dd1de348d732c004850b3248ba6a892451afec56fc4de0c6b05c3f4edc7b72b741e46b558 SHA512 3b6bc8b23693b1817b7f8969352bfe45f81762f86d30b9329c3c57fb1897ee5965f5759e357bbe68d21b84ac3e53e5ce80ffafccfac22d9a4a36ce104d5a2966
+EBUILD tikzplotlib-0.9.11.ebuild 1082 BLAKE2B 5efb22bd6a05ef85456cbcc639b3f49850d64fec4bb5102027a07fb99ebf179e6b93ff6fe72ac1ff8951e0d09ba4f7cd327480380da1e09ef1b520917d644b1c SHA512 46f28ad8596c02820f0103aa20be699f8599d8c957e9597e6199fd11865ded29f5ccc77f9cc7bb6542259de83f12fb31102998e53f45a24009045ab6c01a3424
+EBUILD tikzplotlib-0.9.12.ebuild 1082 BLAKE2B 5efb22bd6a05ef85456cbcc639b3f49850d64fec4bb5102027a07fb99ebf179e6b93ff6fe72ac1ff8951e0d09ba4f7cd327480380da1e09ef1b520917d644b1c SHA512 46f28ad8596c02820f0103aa20be699f8599d8c957e9597e6199fd11865ded29f5ccc77f9cc7bb6542259de83f12fb31102998e53f45a24009045ab6c01a3424
 EBUILD tikzplotlib-0.9.9.ebuild 922 BLAKE2B b4815d76979b0b54774c1907b447482c512e5aa56c3d92eac67b204580fcb157ed1b2d63039c6e67c578d31cd75cc300208e99c233c910214177d25830577928 SHA512 87cb7ac58c25c67c1337e0122aedd405aa29a0515cc55c9a6b833e11b0d00e21a6397a9e9f6bdbf427c4b2c2921925305b9de21bf6c35e52b3978de243fc4110
 MISC metadata.xml 971 BLAKE2B 9bce78f1e6c08facc5705eaebeb99170e50d62a3e35d55aeaf746cc9a3b81f12fd67761f8582505e5916e62301f2962776f656e1242f17646efc3ccc08010dc9 SHA512 1490aea00c7e5fa17fe52f59366308740c4c247d5da77f4a64ea3118ec69517ee8f94b977d2048a7f3824b737c28dff7d5d51214c99557bac4cd11e12de5ced2
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.11.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.11.ebuild
new file mode 100644
index 000000000000..be7409c6cc0e
--- /dev/null
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
+HOMEPAGE="https://github.com/nschloe/tikzplotlib"
+SRC_URI="
+	https://github.com/nschloe/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/texlive[extra]
+	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/exdown[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/mock
+
+python_test() {
+	local -x MPLBACKEND=Agg
+	local deselect=(
+		tests/test_barchart_errorbars.py::test
+		tests/test_colorbars.py::test
+		tests/test_fillstyle.py::test
+	)
+
+	virtx epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.12.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.12.ebuild
new file mode 100644
index 000000000000..be7409c6cc0e
--- /dev/null
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.12.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
+HOMEPAGE="https://github.com/nschloe/tikzplotlib"
+SRC_URI="
+	https://github.com/nschloe/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/texlive[extra]
+	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/exdown[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/mock
+
+python_test() {
+	local -x MPLBACKEND=Agg
+	local deselect=(
+		tests/test_barchart_errorbars.py::test
+		tests/test_colorbars.py::test
+		tests/test_fillstyle.py::test
+	)
+
+	virtx epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 3cf259656f94..27c18a75f5f1 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,3 +1,6 @@
+AUX tldextract-3.1.0-skip-pylint.patch 539 BLAKE2B 94b0055259e6220d0aa2fec49af146b596377c493f950b27e4f2f578f153ca659e5dfdb2549932e0cf8a2ffbef844df773b279b715d86b5b6582b9464c849229 SHA512 961578dcd641c651a7ed52de99cc448d53178f03222bfda8f849a26f46c8b95c0e2351981f10bff6fc6adad2e16510fe30c879af117a7246398164ca7ed95945
 DIST tldextract-2.2.1.tar.gz 54538 BLAKE2B 0abfb1982d0b9e9cd767bc64db289da8bf2f58b599eaea7e703adf36934dae0d052170fa9a8205b8ac0b441d8f1ac75648ccc108515586b0bcacf2ecb43fef52 SHA512 db4f14e514c0e68f85f28226343d7ec91ceea2843ee01c9a2950f0972f365bf343640e07cfb118aff52bab975719be71d179fc6b3bd4da7eb62a47b62747cc0b
+DIST tldextract-3.1.0.tar.gz 101874 BLAKE2B 105f34699de2118126dc0f9d68f25999f99211aa8529c2640dd21d303cfb18cd5388819986881e235b8111a21b74d99c6424ad469a66a0ac45c25a0e7c31a21f SHA512 c6c67598b7dd2c8e85008c5061693182eb075e16390b001eb696fd12a0f5666d0a327667a0fd61e4f270003a8cfc97a8fbf7b53a246bab6f9e9ad95943dac9d8
 EBUILD tldextract-2.2.1.ebuild 624 BLAKE2B 0a93652157e06ed51fa4862c4674dbe15b5ca349f50a1f3105d58add7fe00324794cf6004b2b50da90aa5ec211c47e180f151ed47d0e71a809245e940969949a SHA512 314957d9b89deb7a7e8618c81e5654259ab0f520170a44abe316f2ba629959b86b3eeb592374b97235817d391a86b33b9d5934715bcd96aaff95be240616c939
-MISC metadata.xml 320 BLAKE2B d07a2bfb884d852c37aec5335a9465d44ba14b84787b82f0e51a99297413326ca37e63bb68c8f8f5b6fb855fa8acdf23bb3aaa0ecae38f61242b63ace0e4d8ab SHA512 7a6b5b4ab88e8870cfb86db995b43be99096792b08d4fd341d6febe911f28d790ad1dac049b0d09334b900325dbe85116810ae8a658b2d615320f2d3c7a858c8
+EBUILD tldextract-3.1.0.ebuild 774 BLAKE2B 48609ced22d35cd769259b7fe94aa4b74b9434344ea4c15e79458c5d1c86ffdc58312749c4b16944f0c261e47b5c576b13432f4ea1e25cd0a60edf04275175a6 SHA512 9ff357865092d3655f6734ee328f37b3c4f8ae3bdc5e46285b83ffb8355aa49df3c32ed90b25d1c78645b51b37f87f7dd0a413a555f58baf3a93c6a5397f357f
+MISC metadata.xml 458 BLAKE2B ae00f6534d0ee2c34c95c4520dd777bb65f2d4df4b4d578ad0c4b0795928aa94b136a896b25ed4cd2a5bd3ac26b9dc7b3ff33381c829766b0bd4b8ccdeceff1e SHA512 0e5b1a288506e49dbcc0bcede55f6c4b5b8dfe8d1cfa161c273e0440b9f8e1230d7eee975784fe9e2d8f363a6f62cad6893bc7c63b3e27e9756963707a427536
diff --git a/dev-python/tldextract/files/tldextract-3.1.0-skip-pylint.patch b/dev-python/tldextract/files/tldextract-3.1.0-skip-pylint.patch
new file mode 100644
index 000000000000..c80541d79ce3
--- /dev/null
+++ b/dev-python/tldextract/files/tldextract-3.1.0-skip-pylint.patch
@@ -0,0 +1,18 @@
+From f189ebb3ecf60b9764852021988112df5c9e25c7 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Thu, 12 Aug 2021 13:34:52 +0200
+Subject: [PATCH] tests: do not run pylint by default
+
+There is already a separate tox environment to run pylint tests.
+---
+ pytest.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pytest.ini b/pytest.ini
+index 6d94ff5..df3eb51 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -1,2 +1,2 @@
+ [pytest]
+-addopts = --doctest-modules --pylint
++addopts = --doctest-modules
diff --git a/dev-python/tldextract/metadata.xml b/dev-python/tldextract/metadata.xml
index 8c884e55b789..4b8f95e2c002 100644
--- a/dev-python/tldextract/metadata.xml
+++ b/dev-python/tldextract/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">tldextract</remote-id>
+		<remote-id type="github">john-kurkowski/tldextract</remote-id>
+		<bugs-to>https://github.com/john-kurkowski/tldextract/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/tldextract/tldextract-3.1.0.ebuild b/dev-python/tldextract/tldextract-3.1.0.ebuild
new file mode 100644
index 000000000000..8ec2fc7da164
--- /dev/null
+++ b/dev-python/tldextract/tldextract-3.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
+HOMEPAGE="https://pypi.org/project/tldextract/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-file[${PYTHON_USEDEP}]
+"
+BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/john-kurkowski/tldextract/pull/230
+	"${FILESDIR}/${P}-skip-pylint.patch"
+)
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 2d010445cd2c..843a62609fdf 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,4 +1,4 @@
 DIST toml-0.10.2-1.tar.gz 23325 BLAKE2B dedab7d08dadca963e62d64e9108e254dd73b78761985faa892792823027befc6473ae02c35c275a216b4544d1af8776afa78e39c63c95eb856e2bccf1de49c4 SHA512 5c706a3ae336e6b29bdce9752b91c677f7610cbcc1af4169cc24779e248031406cd19ac367725b2aa7903e4b1db71fa59255238c0270b2c146fd5d7e12d9a5da
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
-EBUILD toml-0.10.2.ebuild 994 BLAKE2B 53aa858dc8c0014c97e45fcd5ab2583ff521b2089ba5b0cc755cfea55ca3c9be75318897bdceddd6d5ccd511dc7f39a78e0db4fb2b63754170ad911075099034 SHA512 b4fbf39c3455bb9974690794cd486488ef4bbc8871e496d617bf7131070d8aa91a16c5184047f42c82415897198d3774487dd8afba628c5a5b40b524784a0e71
+EBUILD toml-0.10.2.ebuild 1054 BLAKE2B b0895624d692ada601c8c61e4c53f2c6ccd4f57057443f9c257da9270c8b9daeb069ce08bc670fabccb0ac4f7ef02f8b07d4d8d409ac6168418d2fa9c716d163 SHA512 35ddd5aa991b746097e65763a3109f24982365488b22f50945dd6799516c0a822c5f26015ba926410a948c48b962fc3d4ba9cdb996144daf6ba215f656efb057
 MISC metadata.xml 380 BLAKE2B ec4806e600de8ff5dc0ce341d90563166feae233c7911cf6c396ffe3b1e80b30fa1ac0b1a8c7b99a3e690cabadd8ae098882f53ca415377e54f08d37028e0b4a SHA512 09865620b098af31212c38a6aec4e5efd3e1725ed3963dcf7382aa815f0b607c4c4c4887d43ac678feda5165c9a3eef879c877b7853d133635023f7fc8f0b3bf
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
index eadbab86f493..474d3942c3f2 100644
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ b/dev-python/toml/toml-0.10.2.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index d024051b59bf..685096247057 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -3,5 +3,5 @@ DIST tox-3.24.0.tar.gz 304960 BLAKE2B 5f6256d27d75651929f2d4d511f6137f20c71ab44c
 DIST tox-3.24.1.tar.gz 305886 BLAKE2B fcedf8054a19a79045b2edead599fb11b7942986fa4bbc184140603e3bc6700eada452e661f4a576d029804ab2a9282df0cf9198eee9b483c2c6c68b086ee156 SHA512 e4bfb3dab15887ce6432a91b88a7387179cbf2a5ab5fa608b3f1f7349be4122d76ce01d396ae9b1515c211f2905d110a8414e254cc72bcf8a74542db98ea52de
 EBUILD tox-3.23.1.ebuild 2143 BLAKE2B fa09dc3153a5270f787129456d0b5e392867aefe171e6419d0653e8d695ae21594f1dbe4e035e58b4b82b5b7307b001c2642bd07c7e87e35edf0ae7745e3ca5b SHA512 7fa17af47c1f9290fbfcce71dd3907ed4d11a636699acd3c2c0fb7b346ea96525616f26c15ad18cdda158469f9c20f0214f4cf921b1a2a7a2f9b6aebd61a017d
 EBUILD tox-3.24.0.ebuild 2135 BLAKE2B f78d5fe7f3a27431a673c4175b93454d60d315c15b7ad0d7175b68827358319c5325b2de26a304f6a26a98885d69ed7db600f6388f68d7adae95c0ad4ac692fe SHA512 ebf3832e9b2b5c9814a53b134f95f8b0c6fda3b1ac3bb234577c2b22e39839c120ce978df29a9c43d2ec4313fb2d2207c23ce15aa73e885888319a7278bdb2ca
-EBUILD tox-3.24.1.ebuild 2135 BLAKE2B 211ba555220f655051a8cb9cecf1003daa26fa2760c2d393a3ec1099f13a5a0cbb913ba42faf76c3be9490b13f35b25c81442463f69dab7cb4da6681675291ab SHA512 933864001f395a128792c32efc2fb797e04dace82d74c0edb1ca8eddf5e0e63c447b1de8784d06d128a2b7ec5ff26c7bf5d01a5f61fd2fb5afe6fe20575e11cf
+EBUILD tox-3.24.1.ebuild 2141 BLAKE2B d27b4a9b6e0d4e0bb963365c26e2cfd9e90a1bdcac628335240c3360a589c07d9d79cd3cf98900484ef21fb6cef467d81f3bd0ede54ab37a852394ac2d8fbec5 SHA512 4607531b81a352bd6d6e6d7f7711eca0d8a14161e4e704adba48d175b2f86e3d508f57798bec24c7dc8dbf1354821bf96df831699d395fc4760add99e65e9f6c
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.24.1.ebuild b/dev-python/tox/tox-3.24.1.ebuild
index fb84528454f2..1e0885d735ef 100644
--- a/dev-python/tox/tox-3.24.1.ebuild
+++ b/dev-python/tox/tox-3.24.1.ebuild
@@ -12,7 +12,7 @@ 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 710dec89e6b7..1fd7fca32ff0 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,5 @@
 DIST trustme-0.8.0.tar.gz 29046 BLAKE2B 5f2dd542974466dd8e61fa0ba5cd78e824afd243dd3b27ca21aec4ba4905daaa0c46db8f4edb30dcb483acf44758d7ad8de4db9c3e07a05d4d3d084565722def SHA512 93b1007319f7d625410eddf92910607c8190533f9bb02a71ecc4c424e44ecea70749f6bceb917297241e179b0d50ce1ed330c208cf3de77d4d3a619f5436af9d
+DIST trustme-0.9.0.tar.gz 30081 BLAKE2B 5623fba91f07027032f48ee355b5c4f853518bc6a5c1e93b4ea387ff25838302efa42476db8eb64e364980805aa1c3be97f827260efc31ffb536c53fe30ba988 SHA512 f0d983a4c52374f178c0bf96f758fdb5f132e7f7c4bac187c84fbc8dc82dc36d6c801c340bf8871e872178f7b2ac66d6159b5462d073beec9a13a086f64b58b7
 EBUILD trustme-0.8.0.ebuild 816 BLAKE2B b98441c0bf208482ad89506e5f47df5b171f816b539f2b40c004c4aab9a13e68933fe3f3dadb43adda96cdaf5cc680f52f4f21d06667c9b70d928592708f9203 SHA512 91a209bd08a2d1fb97e4bd1d40de82dd5258e793e85ab7e49e4967a0e784f2da23e3991fda497ea10faa661b364a31be43d3f112b92173fed1394d32937b3ffc
+EBUILD trustme-0.9.0.ebuild 824 BLAKE2B e848a2d9571756d20ee7ea2843d954055c097ac39199a2a6c2905186260af66b99f54badd29e1a0b43a454345eaa0b222ffa33ec54c7bfe858c32db1bfec2ea4 SHA512 eaf46b382dc1faa54b24e1752831c1c60f4e9fbf8647422a016aa7ce2b36672d1d8e98cd42d1b69df605e098566d4a60d8c34fc5d2e74e9ccd9fc47aa3b1e814
 MISC metadata.xml 443 BLAKE2B 8f591132e3a9478741063502a0da9709ba07974432fd9b008c59aee122f234b11b44c29b78b7f69600d7b385701c4c909b98472a7eb3d1a6cf5908acb436727f SHA512 38a7f228253d556064d94478e0e10ccf526368cff06f7201b82911f404e5e6d83a54b2658f6f241b8a8d1d600899dda9588023cb38fda828d94c6983add0f7f2
diff --git a/dev-python/trustme/trustme-0.9.0.ebuild b/dev-python/trustme/trustme-0.9.0.ebuild
new file mode 100644
index 000000000000..3f23c392ed2b
--- /dev/null
+++ b/dev-python/trustme/trustme-0.9.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
+HOMEPAGE="https://github.com/python-trio/trustme"
+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 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index bc23a530e950..5f39a8ffe334 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,3 +1,5 @@
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
+DIST tzlocal-3.0.gh.tar.gz 18924 BLAKE2B 340739015ce0fae245ddcb2d3f6250886261a81a49c9db7960515e178090183d3a826ee494763503023c033d3d9c19771aad865d4c1150350a118250aab23362 SHA512 9060eb325783d183bfaf7038476031a2ea22fd4ba50f6b5caf3d8eda15d9c90e557c64a0218c7e3c3df51f385378fe8a17f10871abb038012e1d05a9547918c3
 EBUILD tzlocal-2.1.ebuild 554 BLAKE2B 8a7935d0888c64d2c6b7661ccf9a2ed78c0f7af62be67c2ef451de439becbeabcb0dd955557ec712b995753af1ed0f6076eb17b1081c7a295b3baa55175602b8 SHA512 443197d87eef2a206aac7ff9e5ce4aff7f588a4522efc8560f1b411e08458fc303784e1da08a9d410ca5fa9ed1ca37077f4416d9e1cdb9e3c1c4154cfe128ea9
+EBUILD tzlocal-3.0.ebuild 562 BLAKE2B 1b003e7114ed25a4f56c25d70be28098a4698d41bb6bea289fd6a0227889149f45372c677b9f8f4e40fabcbd4d3f3bff927ddee4fb3b9aa663c698bfad7f1be8 SHA512 a9591b63d1fa3c95113299343a331b21ab80d7bb77ecd4790c5c01c81a0222e1e9d57bc7950e6b85429303058bb7eeb4bd136cb2c6c577d286eb4001a85957e4
 MISC metadata.xml 402 BLAKE2B ffb6b7524232f23d77799fb244ee455c98bf36b2284d2493e79b9fe6e41327fd9e2134e9e036678466226f895c481d81dd351db3294da3ccd7a7a0a0360daf62 SHA512 c29fedcb3c915065ee5fabb28b9bbf8cf9ec4653f9d3ac076706f3cfb9519f376756d752ce51ec15e4421842228693c4c24b3a15241ec8feee283172a3c00963
diff --git a/dev-python/tzlocal/tzlocal-3.0.ebuild b/dev-python/tzlocal/tzlocal-3.0.ebuild
new file mode 100644
index 000000000000..cf573a7eddaa
--- /dev/null
+++ b/dev-python/tzlocal/tzlocal-3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="tzinfo object for the local timezone"
+HOMEPAGE="https://github.com/regebro/tzlocal"
+SRC_URI="https://github.com/regebro/tzlocal/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' python3_8 pypy3)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index e76697687380..49c1584a4b13 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,3 @@
 DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
-EBUILD urllib3-1.26.6.ebuild 1962 BLAKE2B 1fe2eae1dd3608a8b9f8a6ef3582f92a78a98ac8ba0378561825708f72c2341c8900ab6aa38b88a74fa8b6f0d9421dbee903a93d8b4ee1036f69d0bedebac4a2 SHA512 b265eeadf3bb12270e604cbd65b570c836b081c8b7e67a19aeba8b29b9b62bd93a2cec945bb770b422e354f97675766ed3451630cdc9c5ad6d44523c603d02f8
+EBUILD urllib3-1.26.6.ebuild 2022 BLAKE2B 38e8f4475be139ddf6f9d111c39aaf1c900a8d95a5066ca9694d03dcc80fd44e80a517d22417e75131558b99e144d96cfed4ce48b4b79367527ae919133fe5c0 SHA512 b34d56c725bb5fc23e7970b9312ec8055a3676c0ebf0e7cb2c17fa462a9e97a68baaa634951eebd212f9c2741ea8e8a11b7cdc60cdf3753f8db6fe45ecb00a33
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.6.ebuild b/dev-python/urllib3/urllib3-1.26.6.ebuild
index c71c6adc940b..4ea114ec7e7e 100644
--- a/dev-python/urllib3/urllib3-1.26.6.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.6.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index f50c7630b63a..c9df6897c008 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -2,6 +2,6 @@ AUX uvicorn-0.13.4-fix-wsproto-1.0.patch 1122 BLAKE2B 4190a5e61af991e77271aef8be
 DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
-EBUILD uvicorn-0.14.0-r1.ebuild 1280 BLAKE2B 63482aa3db046fa48f4b3d175aee5ad07f2094a93fab84172cc5c8709dbf365fbdf3262b63a8e1e0d5edae1b8f1f810482a4aedd937e4e9fa71ef004fe532836 SHA512 9df124e0b0ad41e8d37217e0ef522ac950ad971ac9501d5365e3d5158ee427c64730e005208eaae0c07a219aa19c1f3710cd820e03fd4c82885f616cd7479c51
+EBUILD uvicorn-0.14.0-r1.ebuild 1279 BLAKE2B c3026a0b112712e0972cf9eb290def64078ee2be825b218a29ccb4a6f2f01b2f69db616095466de2e0cfb841493593bda0a93615ee966b855eadd847fc79fa3d SHA512 7c2ac66b4e4f981aad92cafbf52b88f41334a0dfcc18acd84b7daefbdd727e600b47f708d2b938dca1c309e54b3ec3eec4bdf1db5966b32638adf147296d786b
 EBUILD uvicorn-0.14.0.ebuild 1426 BLAKE2B 7051151bdae8ad61fe11b8b209f2895cc37b0d0998dfdc110210cbcc5774082e8a5d0b21e6265d7b9a9c2437784e3c499750b48c5b0271691e5a1092c6083037 SHA512 982224e58b7cd8cf7a9596b921b226bebb6d8463b7c844b691be1c284598586d8ffaf70f911644e85f5518d2a21aa1c54eaa6741e5d9227b05b8b3d42709353e
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
index 70d867f283a3..7d5b9e51c765 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index ea7bfe25e9f5..8d848ec3a19e 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,7 +1,9 @@
 AUX uvloop-0.15.3-uint64-thread-id.patch 1548 BLAKE2B 2d1af0cd42f1911e2296db843bace2c3281e9defff1b174a7ca3c2bf651af2b9149b4066e9e252b216a33751591e0e15afec035142c35dac2bce7683c52a48e7 SHA512 0ae9fd1210d80f8efdf1d29b84450c60578848467b49616e9c5e71476779972e94ccebe13d99e74cef99ea59cf50617a8152a1768a0c14b812036310b403a55c
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
 DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
+DIST uvloop-0.16.0.tar.gz 2129067 BLAKE2B 8a5a5c760b1036428483d2cf1f509784aa61cb69388720775c9555bdb0ce19341cb58fc051ab6f92066a3478acf729513dafafd79f31115b064bf1d3660479de SHA512 dd6dcec38f7f94dc0cf0123302fd6fe404428196b452a80a8258a207654e3f67e210233be3d649668c22b48390232d0347706b1d87fb50016287142c742b806d
 EBUILD uvloop-0.15.2.ebuild 1186 BLAKE2B fd0f48927d952bc9708aa93a987a64b5d0eaca3af5394c4874a2fd31212c0d89114da7cc2c92374999a60b8d822e3b22375dfe60832170e02d29e2b891fbfc7f SHA512 682e85299f491a92eed9c5c06baea83778e748c94e2d99240db0c07866829655f5b351aaebe83fa93fede258f42709b6c411df5f5f2d999988af7dbbc631088d
 EBUILD uvloop-0.15.3-r1.ebuild 1406 BLAKE2B ba8d047185aa66f1048ff6fb5f31247e964f48ee39786ce3962177b4b503b12563342020501312e90011b88e265fc4681474a3153548afe225dd9b572284d204 SHA512 6fb3967147daa33b6c9aa00cfd7c37faa2aaac9fdc1554d2be1b21b5c71aada4c2df83723079f3ee4a69eabfadb0491ccd4702f60dc6c6bb8ae8a3daf116d47a
 EBUILD uvloop-0.15.3.ebuild 1194 BLAKE2B 6af2b9ff94aa9213dc90d430e2f814795e0737770d4d8d05e2283219bf1837437cc1dd180a677b6acc3796b2b30cfe5b31835ff892b1f3cdcc5be88aa6f8c645 SHA512 cb50ec260320f110e0a393bebbe0bbfe63f5f815aba8b0c58bc3f7cfa30ee52e5b93460ae9fb1d3579e474c9a7881a269a6f57eabf18de707e5b97b7f6976878
+EBUILD uvloop-0.16.0.ebuild 1415 BLAKE2B ee8572ccd738b73253be93d0b440fb8d2c99a502fbd6c66a5ffa15e9fcd44d469fffc90742bbee4702dbf47a056d457d3f29cd8944e73e47734c2f7d12668035 SHA512 d67943ef019f211c6974aa63ea8cb29cb5b211bc3264c769031477f1484ae7676da85a89e6e0746e1c08b6e027a7cd0f6ef622d692b9ccb5a39f391b09fdedce
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/uvloop-0.16.0.ebuild b/dev-python/uvloop/uvloop-0.16.0.ebuild
new file mode 100644
index 000000000000..ba76221f9f05
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.16.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+	"${FILESDIR}"/uvloop-0.15.3-uint64-thread-id.patch
+)
+
+python_prepare_all() {
+	cat <<-EOF >> setup.cfg || die
+		[build_ext]
+		use_system_libuv=1
+	EOF
+
+	# flake8 only
+	rm tests/test_sourcecode.py || die
+	# TODO: broken by cythonize
+	rm tests/test_cython.py || die
+	# force cythonization
+	rm uvloop/loop.c || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 4da1b9d77f1f..a78387ada495 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,8 +2,10 @@ DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c544
 DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c0371c54a3e6c622c816d8c30141951c85b4f461fa03f71912a767b8d6a40733ab253062466e38a4a2e18b3169812e6a1 SHA512 7eff570f407a4986336d5a34bdcab1621d953aa6900d41962a85a5a44d7b68d378cda4a1bc1ddbfbc468580e051a98c37be17b0a52babbb00166718a987a591c
 DIST virtualenv-20.7.0.tar.gz 8714219 BLAKE2B 81b5ee144614a7c854e03599270d03454f991520e8381b98ef01b64e91bb7520a3949e5af9710ceb6292be6b7b7e3738ed7a08324b5ada37f8f4941b408fb425 SHA512 af0f993045013814d9397419fc9d789a1ad64dc53818cbeceb5146e418a8535f76b74ed36b4b164d6974660be77de91cda244eb70b810c8c9fb522ba1088813a
 DIST virtualenv-20.7.1.tar.gz 8714303 BLAKE2B 9ba0714fa842a4d4dc07f8a47536ad95f049c7d4149be7d859af55e6f26aef5d61c80399a8e03de183b7e170ac47eab6bee263c5d3df79eac6a00c63cb368873 SHA512 4d0127ef38655c6370c874a99dc3a92f2d1e50428496878e64aaf52a944f54fb6fc8397c1b4943c40c7cd5c19ee93cccfab735f38d3dcc202372e1081f0ea23f
+DIST virtualenv-20.7.2.tar.gz 8715517 BLAKE2B 306de1bb6e4aa1c888c28161abb33f7016da47a82bba7181687b99127998e82a67e24961610bcbea8a3cad8e7f218e7c76d62de26a74e2bbdf163ab76021bc41 SHA512 6ae91a0cd5cd4da000d0175762515b1b9af80e273d56293d9d57b3faf63ff72001c8d1b3326c1f9dfcea8a4a157c1f62332a2a02b84e25ac4bd3850b0d39aebc
 EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
 EBUILD virtualenv-20.6.0.ebuild 4276 BLAKE2B 6533c59050af3916bdf02e38671cb6fa6558bacb9ca47af9a9282594fb5d97d3c8eb405db4c6f41a180203ba54dd77066f7bab75deebc8a101d078b22e8dd5c2 SHA512 f49d6360516804b898fa90bfd4a0592c58ed224e1abea528730f041e7f3cc15d68bf2628323feb5c05f724fdb1c085dd940ffdaedceae7010551f6ebc00d08d0
 EBUILD virtualenv-20.7.0.ebuild 4254 BLAKE2B 001e09ffdad208c5386993419b56dd0f0c35504d6591896a306b39e70f01ecbc0f47ef800f8b50bb502ee10eeb03d952d7c65cd6ec94823450c7b8d83c2b4fca SHA512 501bb46fb0e7ee7fabba977a25a4ab8b4168e18e5655226900320543e15dd95f84d0932bafd6a5230f3e7424e66c560ba853cc515cb2995dea7dea020595abad
 EBUILD virtualenv-20.7.1.ebuild 4254 BLAKE2B 001e09ffdad208c5386993419b56dd0f0c35504d6591896a306b39e70f01ecbc0f47ef800f8b50bb502ee10eeb03d952d7c65cd6ec94823450c7b8d83c2b4fca SHA512 501bb46fb0e7ee7fabba977a25a4ab8b4168e18e5655226900320543e15dd95f84d0932bafd6a5230f3e7424e66c560ba853cc515cb2995dea7dea020595abad
+EBUILD virtualenv-20.7.2.ebuild 4254 BLAKE2B 001e09ffdad208c5386993419b56dd0f0c35504d6591896a306b39e70f01ecbc0f47ef800f8b50bb502ee10eeb03d952d7c65cd6ec94823450c7b8d83c2b4fca SHA512 501bb46fb0e7ee7fabba977a25a4ab8b4168e18e5655226900320543e15dd95f84d0932bafd6a5230f3e7424e66c560ba853cc515cb2995dea7dea020595abad
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.7.2.ebuild b/dev-python/virtualenv/virtualenv-20.7.2.ebuild
new file mode 100644
index 000000000000..1c6b72d16019
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.7.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 8b5e69b1828c..ab109dfa7e1d 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,9 @@
 DIST websocket-client-1.1.0.tar.gz 58890 BLAKE2B b7557f0847ee4ec31279d98661f2370f32eff35de5ea6207abe4afa6ef7314258da275d823487773722ac717888ca629284ef92870b5880fb385f7fb677506d6 SHA512 6f4b963455bdb6a0e0defff92a6b898ee4bdf605c18fef7e25e18e2c72a2ae360d760c2069a0ed330e5dc0f3347f16a9129c405d5c98cd2d56014f8636e7d5b5
 DIST websocket-client-1.1.1.tar.gz 59092 BLAKE2B c71e16e427584434781fe407f3185ccfc9fed3e638ef7374752584e35623f56c082ab7a4e7ae01038025e0435b24b567bb9a2abe4da50800f421930c982e4b39 SHA512 f4ed98180910068415ed3b66b70091491d6b11098c32abd9bfc0f8e0d4cb5a25df096c9437fb59c66bacff66440f9422b3f67bf43af746019d74b17d7bcba474
+DIST websocket-client-1.2.0.tar.gz 45789 BLAKE2B 9e6309d8abeff80002a48abf2d0cc25a94b350d0bfbb82796876b932ea173e2c34a325a686f1c89bc3c55da9afe17fa884a194a6294a20d20e01f5f6f6536e54 SHA512 a253462aa5b22ee07e47827f29b660d72a6b0986f785c07266acb4f6d226394dacea6557e330f76cd3ce9f2753557ed10b2767b90877b731f52ed27a6de5ab70
+DIST websocket-client-1.2.1.tar.gz 45921 BLAKE2B 3717daac2aafcc13cfa71cd5678aeef7e6dd1933b072c40aa26bb315b2e2c84dea5734299fb954179b22a659fa271734ba78724e5f9d92be7a35efe1f611dd8b SHA512 fdbeb7ac2add27478a17b388ac62e9378094a368f29749d8b63c274ee41836506369dddd083956f42f1f2d74948392b3ddd59b801c98f9e028c126bdb54c636b
 EBUILD websocket-client-1.1.0.ebuild 761 BLAKE2B 09a7a7ec1110f0d9b5c43504139c555f2777d2f3a12071daf6900ea9210d18d620506b7795f2e11ae353e32b0453557cb8bf901d2aef36027c000958c9b85495 SHA512 1607c7cac20dc8e8b8b6be41bf74d74acaf607c51ddef355b85e5565c5094355d69ecec545207ad248387a75b756de933fc2b0cff4b9df687c9e33a2fb233268
 EBUILD websocket-client-1.1.1.ebuild 639 BLAKE2B 04289450b50888e60941274005cac6ad16f5c09738f0cb48138ed4cd011d54fda4d995f5136cf7d99804a73a2894f1e93c53ce988c96bbcb9b022f6f36286265 SHA512 e27ec163137610e1ba1123227fc5e38c0d68f9ef3912dae0cc233e53bb0933b3ef3c9f3b92a5b3b3bbfea11898debdfc9aac74f2a65998c0e21432eedb1c3846
+EBUILD websocket-client-1.2.0.ebuild 678 BLAKE2B 55404024c36ec92fc409a4a5f1437135ce0e40866f12f5c470a30aa39f67ca9df7fca89b63d5756a9837b79f28467f1926254608f8bd1fe20d7934638942010e SHA512 b63ac7c5d2f1384d8b0bb92c668604b402c77b6af04e7e0f224e8f420224c1e1adab10228935541d999ac3718d932eb7b8dc9f7e0b5346e927e5d402e98d9edb
+EBUILD websocket-client-1.2.1.ebuild 678 BLAKE2B 55404024c36ec92fc409a4a5f1437135ce0e40866f12f5c470a30aa39f67ca9df7fca89b63d5756a9837b79f28467f1926254608f8bd1fe20d7934638942010e SHA512 b63ac7c5d2f1384d8b0bb92c668604b402c77b6af04e7e0f224e8f420224c1e1adab10228935541d999ac3718d932eb7b8dc9f7e0b5346e927e5d402e98d9edb
 MISC metadata.xml 497 BLAKE2B 1a68fcd42a257afae80db03043a732a321079f146c252a89d1c5399bc5800a5475fd36f31cef381544c9592e39a86c14eb5334ab1800a5191b0f7ec9e0806f19 SHA512 ce4184c2e87f87cd787cacf1c7b566df2fbf7dda97a6b6639e02c003ede6ac5b90494eb9b3b509c303a56fc4e829acc05ec9d3d01846e85b233a561d1cdbd5b4
diff --git a/dev-python/websocket-client/websocket-client-1.2.0.ebuild b/dev-python/websocket-client/websocket-client-1.2.0.ebuild
new file mode 100644
index 000000000000..a0de1e2f73a9
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/python-socks[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+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/websocket-client/websocket-client-1.2.1.ebuild b/dev-python/websocket-client/websocket-client-1.2.1.ebuild
new file mode 100644
index 000000000000..a0de1e2f73a9
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/python-socks[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+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/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 22011625ad5f..208c6d01f566 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,7 +1,9 @@
 DIST XlsxWriter-RELEASE_1.4.4.tar.gz 34138048 BLAKE2B 159c305171eba27c66d3d9b9b1fd0e664f4acc572079c4daa6ac50c72e1e1e6016a93815b7de27af10b6e6653b02efb0291073284dabf9a6f15495c1f61ef059 SHA512 2a459e7eb924ef7475b7fed8f5689d4c2b2669a65d5f3e251a51c5e55cc8c4a545eb1d83534168b19c802740366fe2c4ef14c6c5850213fd690f01e42bbe4ca3
 DIST XlsxWriter-RELEASE_1.4.5.tar.gz 34383001 BLAKE2B 9a00ef80aec818e3b1c80000bdf0fe9dbb5b99ac04a5508ca23c6d76c56e31c94db0b5a38ef6d8345c6a5dc83175e4c79381877415f982fc7ec66d42efe8c80e SHA512 e3b969ef27ef24ce371c0a789a8cac6da4e8245ec349ca23ba9e04d5c2adf0a141f51596bd15117fc400efb9354a6730c4668f51218f0a08b312d25519a492e8
 DIST XlsxWriter-RELEASE_2.0.0.tar.gz 34246203 BLAKE2B 46f649851c2fe849d65d9a9b86954c92771aa6e7334bf97b7313f45a00d35b3a879d2a2dc715e1d2d68be90e54aa63f9e73755134242e079ef57c14ff7681f10 SHA512 e857118fd996d81b6d6d4e3eb26e353aa81230f728ed684fa025a3d4401988b3bc34714fddcaac804605fd1405fc98870e7260e1b81843a0ad2d18271ccfecc9
+DIST XlsxWriter-RELEASE_3.0.1.tar.gz 34350396 BLAKE2B 441d9969df932ebe636474ca10eb260cea160b71b8bc46a78964ffcb752acdaeccd69703ca80a2af4c5284c5555f49c62cfefeb5fb8cdb9f0c305be44848815d SHA512 425e86acd8e54e89393931e5c698c244721ad16fe4bcb13aa9038ad7ba279803f8cf5c3b35170b274a0386ada03ba94ac385d039b3b8aa97c86f0abff4a20e58
 EBUILD xlsxwriter-1.4.4.ebuild 559 BLAKE2B 3d7491f69d436d2c6e7b20e2e12037963f22671f2f5e145ddec0be77681591f84399e96ca347e60ce8ac05cf6c9c1df5ea560baa774802ee1e6035dcdf1e2148 SHA512 e4b7ec988617bf0beba56e3d112840f0dc02790cffbe31a7d70a8b860692a1f573b3c38ee758ff2e8bfe5ffcb20bce04d4902bc99d588001cee8c0325448997a
 EBUILD xlsxwriter-1.4.5.ebuild 567 BLAKE2B e38d23b0abf9d50dfcc04d88c8256b4bc104bee731c67925ee0ea64715aaaa7d6002f80e09243d40c89546ba2b33f01a3330eebd2ae5a8e9a51e8b696e41c66e SHA512 7f133d7a066aad07adc8e8629db8d2f968c627907f3af498a862884c20682dc2b4e94e0de1d529e8683b1de18554bd0e2106060d3760215072ce8ae034789695
 EBUILD xlsxwriter-2.0.0.ebuild 567 BLAKE2B e38d23b0abf9d50dfcc04d88c8256b4bc104bee731c67925ee0ea64715aaaa7d6002f80e09243d40c89546ba2b33f01a3330eebd2ae5a8e9a51e8b696e41c66e SHA512 7f133d7a066aad07adc8e8629db8d2f968c627907f3af498a862884c20682dc2b4e94e0de1d529e8683b1de18554bd0e2106060d3760215072ce8ae034789695
+EBUILD xlsxwriter-3.0.1.ebuild 567 BLAKE2B e38d23b0abf9d50dfcc04d88c8256b4bc104bee731c67925ee0ea64715aaaa7d6002f80e09243d40c89546ba2b33f01a3330eebd2ae5a8e9a51e8b696e41c66e SHA512 7f133d7a066aad07adc8e8629db8d2f968c627907f3af498a862884c20682dc2b4e94e0de1d529e8683b1de18554bd0e2106060d3760215072ce8ae034789695
 MISC metadata.xml 410 BLAKE2B d1fab95b5fac3e69c5303298385f65062b28934f22fe8db02db02753b5cae36137a3e02e1d38e3762933dc9297045e1efaee8d17c714ca7b22459f342f23f928 SHA512 4f3d74f5afdec59b8575446b444f1af36f71137c980f7790e952860afa98b2d128ddf8477b135715de2852b940926108dafbff3cb60f2f1a8825a02c415810e9
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.1.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.1.ebuild
new file mode 100644
index 000000000000..318bdbb268dd
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/zeep/Manifest b/dev-python/zeep/Manifest
index d2da59b918b6..25cd904b1184 100644
--- a/dev-python/zeep/Manifest
+++ b/dev-python/zeep/Manifest
@@ -1,3 +1,3 @@
 DIST zeep-3.4.0.tar.gz 163748 BLAKE2B 52709b22bf3dbe228630fcaca33dbfb1f9bb2fd6fab9a2f3ad1cfdf92f84aa2a5b1b71dbd5d41eca3bc12a9ac022d27191929533578441ff020e574fe2b95cd8 SHA512 31adea141ffaabb122a2127bcbba2742ed15d4cef91907c8db4aefd8550b2259502a4122825cbfa62559fd5babd3d0c6ce2bf82dd3b79cd9026d8ca008897349
 EBUILD zeep-3.4.0.ebuild 1099 BLAKE2B 884db031c70ab32b3902bec8753798d1a551034b5bb701458b2730f87cf64b74e1775014410956f5bff86ebb84de002bfaf9f62a397436132baee1fc5e7d6fdf SHA512 3d7279e26c697ad0437ecf41b452e250767f0d6edb3f837de8ac7ad3e461401f55972296b14fd0628ecf637ef9c920777e6f1d4ea13c54c54d8ce53000045d6c
-MISC metadata.xml 396 BLAKE2B 10f585e56bf4aeb23688f18fdbda91ae5b61c8128863b289b9d65310cf2cf43c8c6c9b42384cde871ac5b7915d35e7cb4684f13aff1bdfe2acc028a6a45cd705 SHA512 5dbaae697cfaef9d3e0eac672806064ce70c7f5ba13b08bc1530c7517de6d5210f25e315a99dcfad49d7dc711f8fcd6bcb53165cd14105209df3f3d002e8f1c8
+MISC metadata.xml 534 BLAKE2B ffcd58fbcdd13f6499f9d0862f6c3237ffb618212b5ba17824e8268bb0affaa09033f3001732fc38225696b08aeefcfc465506fa6b600f261b3087a935f6aac2 SHA512 244ba515b52b090acb7f00065e0f87c6d64fa8ec7a5478a345e494219f84e8a372728a877f7fccd3d0d5512978d2f3de39d8f0417e3b9cfa2f1dca2a499434e3
diff --git a/dev-python/zeep/metadata.xml b/dev-python/zeep/metadata.xml
index 94ae180241fd..84a2d90bd700 100644
--- a/dev-python/zeep/metadata.xml
+++ b/dev-python/zeep/metadata.xml
@@ -10,5 +10,7 @@
 	</use>
 	<upstream>
 		<remote-id type="pypi">zeep</remote-id>
+		<remote-id type="github">mvantellingen/python-zeep</remote-id>
+		<bugs-to>https://github.com/mvantellingen/python-zeep/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 9ba940cb4ff7..75ae788887a2 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -4,10 +4,12 @@ DIST python-zeroconf-0.33.3.gh.tar.gz 121202 BLAKE2B f457a65d26b58e4dac6c83b66be
 DIST python-zeroconf-0.33.4.gh.tar.gz 121380 BLAKE2B a1a8ac266aaded65337aa9d5c26d8a52b6329500a1a18354148590fdb47988f200b0658a41e18b78694cd9f95f1322cce0ff289a795bf9459ab6d383d5ee13f9 SHA512 fa6dd453ea22beb113c53941ce750e214da3211b6fc14d8b0cb575b927cff14759c49fec4e9ada4a2fd4ebc0bb3b0b355a2454ca0e128a3213fc8be41f096af7
 DIST python-zeroconf-0.34.2.gh.tar.gz 125452 BLAKE2B 704ab1400a01eae93b1f706c2ccd4554b7ffbbcfcaebfc28bacf6e28354894185a7ed5cffddb3b96ff05dc3521d2507160a5f43c11a600c5b5043882d15c39e6 SHA512 958d01316ef307d08d68abe975f45d77e84cede8334f8ad023080b7d46f965f890b1c74de640807681d3aaa647e01902de01309e3520fba8ba18cb4b6af1f4ba
 DIST python-zeroconf-0.34.3.gh.tar.gz 125454 BLAKE2B d80c25fa8bb79b6c5a3d491efc0e891b08e808d9c2619d917a19d9d76ebdf13d32ddb684a3f68abd7ae6dce3597de30027557033a5ccacfe8dcc5bf624b45f25 SHA512 d9f1ab126dd68fdef2e2983a11efe7d3703bbacd7b74b9a82a781361b0282bf20d8c16bcf96beda7112958eab54e0b819f709d840a9e5f0f2da8c9003e9943fe
+DIST python-zeroconf-0.35.0.gh.tar.gz 126620 BLAKE2B 1c2a7e78c32305be0c35fcef513e26c1834dee71b7714479c70c44a09378fb96a15f39fb4d9de4a8bde607cc4ef67798b5e6cb09e613f1a86cd9934123ab2ca9 SHA512 440871dd5fa861950187bf0c4593b2212d91477d4adbd41a43fd3adec820543628d684dfc042e38e4b69cd94e8b23d10298e660da32f8c221faf16e03135b925
 EBUILD zeroconf-0.32.1.ebuild 1163 BLAKE2B 128ee4afa146f073b96fa6b4fa6e961319cc38997f0bada936b05d325c175ecc2063cca7e247a40292c41be35b22a7ff4f69813694655c96c8a3f35e8b065a89 SHA512 cff5c5f655f74230da9a2ab05d0cb2e767e78627ffd65e1f310f2aef54319f9216cfbb5d0fcb12707255a24b1e6c05272ce35e3771b1dd6c986f083fd16101fd
 EBUILD zeroconf-0.33.2.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 EBUILD zeroconf-0.33.3.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 EBUILD zeroconf-0.33.4.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 EBUILD zeroconf-0.34.2.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 EBUILD zeroconf-0.34.3.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
+EBUILD zeroconf-0.35.0.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.35.0.ebuild b/dev-python/zeroconf/zeroconf-0.35.0.ebuild
new file mode 100644
index 000000000000..0e1b2943b16e
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.35.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+	)
+
+	epytest ${excludes[@]/#/--deselect }
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-08-14 10:30:13 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-08-14 10:30:13 +0100
commit	616579b5d773c50af31ee56f00105d96ce641ca2 (patch)
tree	2ad4d3ba1429bd93a36ab99a2f5ec3490412115e /dev-python
parent	068424b26532f3551a81421a9be67ed206e5c11a (diff)